<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[175583] trunk</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://trac.webkit.org/projects/webkit/changeset/175583">175583</a></dd>
<dt>Author</dt> <dd>cdumez@apple.com</dd>
<dt>Date</dt> <dd>2014-11-04 15:00:48 -0800 (Tue, 04 Nov 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Add ptr() method to Ref class
https://bugs.webkit.org/show_bug.cgi?id=138361
Reviewed by Darin Adler.
Source/WebCore:
Use the new Ref::ptr() method.
No new tests, no behavior change.
* accessibility/AccessibilityMenuList.cpp:
(WebCore::AccessibilityMenuList::didUpdateActiveOption):
* bindings/js/JSHTMLAllCollectionCustom.cpp:
(WebCore::getNamedItems):
* bindings/js/JSHTMLFormControlsCollectionCustom.cpp:
(WebCore::getNamedItems):
* css/CSSStyleRule.h:
* css/CSSStyleSheet.cpp:
(WebCore::CSSStyleSheet::insertRule):
* css/CSSValueList.h:
(WebCore::CSSValueList::item):
(WebCore::CSSValueList::itemWithoutBoundsCheck):
* css/InspectorCSSOMWrappers.cpp:
(WebCore::InspectorCSSOMWrappers::collect):
* dom/ChildListMutationScope.cpp:
(WebCore::ChildListMutationAccumulator::~ChildListMutationAccumulator):
(WebCore::ChildListMutationAccumulator::childAdded):
* dom/ChildNodeList.cpp:
(WebCore::ChildNodeList::namedItem):
* dom/ContainerNode.cpp:
(WebCore::ContainerNode::removeChild):
* dom/CurrentScriptIncrementer.h:
(WebCore::CurrentScriptIncrementer::CurrentScriptIncrementer):
(WebCore::CurrentScriptIncrementer::~CurrentScriptIncrementer):
* dom/MutationRecord.cpp:
* dom/NodeRareData.h:
(WebCore::NodeListsNodeData::ensureChildNodeList):
(WebCore::NodeListsNodeData::ensureEmptyChildNodeList):
(WebCore::NodeListsNodeData::addCacheWithQualifiedName):
* dom/Range.cpp:
(WebCore::Range::setDocument):
* dom/ScriptElement.cpp:
(WebCore::ScriptElement::requestScript):
(WebCore::ScriptElement::executeScript):
* dom/StaticNodeList.cpp:
(WebCore::StaticNodeList::item):
(WebCore::StaticElementList::item):
* editing/CompositeEditCommand.cpp:
(WebCore::CompositeEditCommand::moveRemainingSiblingsToNewParent):
* editing/DictationCommand.cpp:
(WebCore::DictationCommand::insertText):
* editing/DictationCommand.h:
* editing/Editor.cpp:
(WebCore::Editor::insertTextWithoutSendingTextEvent):
* editing/ReplaceNodeWithSpanCommand.cpp:
(WebCore::swapInNodePreservingAttributesAndChildren):
* editing/SimplifyMarkupCommand.cpp:
(WebCore::SimplifyMarkupCommand::doApply):
* editing/markup.cpp:
(WebCore::hasOneChild):
(WebCore::hasOneTextChild):
(WebCore::replaceChildrenWithFragment):
(WebCore::replaceChildrenWithText):
* html/HTMLFormControlElement.cpp:
(WebCore::HTMLFormControlElement::checkValidity):
* html/HTMLFormElement.cpp:
(WebCore::HTMLFormElement::getNamedElements):
* html/HTMLLinkElement.cpp:
(WebCore::HTMLLinkElement::shouldLoadLink):
* inspector/InspectorStyleSheet.cpp:
(WebCore::InspectorStyleSheet::buildObjectForSelectorList):
(WebCore::InspectorStyleSheet::buildObjectForRule):
(WebCore::InspectorStyleSheet::revalidateStyle):
* loader/FrameLoader.cpp:
(WebCore::FrameLoader::continueLoadAfterNewWindowPolicy):
* page/FocusController.cpp:
(WebCore::FocusController::setFocusedElement):
* page/PageSerializer.cpp:
(WebCore::PageSerializer::retrieveResourcesForRule):
* page/PageSerializer.h:
* page/animation/AnimationController.cpp:
(WebCore::AnimationController::updateAnimations):
* platform/graphics/ca/TileCoverageMap.cpp:
(WebCore::TileCoverageMap::platformCALayerPaintContents):
* rendering/ClipPathOperation.h:
* rendering/RenderBlock.cpp:
(WebCore::styleForFirstLetter):
(WebCore::RenderBlock::updateFirstLetterStyle):
(WebCore::RenderBlock::createFirstLetterRenderer):
* rendering/RenderBlockFlow.cpp:
(WebCore::RenderBlockFlow::updateColumnProgressionFromStyle):
* rendering/RenderBlockFlow.h:
* rendering/RenderBox.cpp:
(WebCore::RenderBox::styleDidChange):
* rendering/RenderElement.cpp:
(WebCore::RenderElement::setStyle):
(WebCore::RenderElement::styleDidChange):
* rendering/RenderNamedFlowFragment.cpp:
(WebCore::RenderNamedFlowFragment::restoreRegionObjectsOriginalStyle):
* rendering/RenderTextControl.cpp:
(WebCore::RenderTextControl::adjustInnerTextStyle):
* rendering/RenderTextControl.h:
* rendering/RenderTextControlMultiLine.cpp:
(WebCore::RenderTextControlMultiLine::createInnerTextStyle):
* rendering/RenderTextControlSingleLine.cpp:
(WebCore::RenderTextControlSingleLine::createInnerTextStyle):
* rendering/style/DataRef.h:
(WebCore::DataRef::get):
(WebCore::DataRef::access):
(WebCore::DataRef::operator==):
(WebCore::DataRef::operator!=):
* rendering/style/RenderStyle.cpp:
(WebCore::RenderStyle::changeRequiresLayout):
(WebCore::RenderStyle::changeRequiresPositionedLayoutOnly):
(WebCore::RenderStyle::changeRequiresLayerRepaint):
(WebCore::RenderStyle::changeRequiresRepaint):
(WebCore::RenderStyle::changeRequiresRepaintIfTextOrBorderOrOutline):
(WebCore::RenderStyle::changeRequiresRecompositeLayer):
(WebCore::RenderStyle::diff):
(WebCore::RenderStyle::diffRequiresLayerRepaint):
* rendering/style/RenderStyle.h:
* rendering/style/StyleGeneratedImage.cpp:
(WebCore::StyleGeneratedImage::cssValue):
* rendering/style/StyleGeneratedImage.h:
* style/StyleResolveForDocument.cpp:
(WebCore::Style::resolveForDocument):
* style/StyleResolveTree.cpp:
(WebCore::Style::determineChange):
(WebCore::Style::resolveLocal):
(WebCore::Style::resolveTree):
* style/StyleResolveTree.h:
Source/WebKit/mac:
Use the new Ref::ptr() method.
* WebView/WebFrame.mm:
(-[WebFrame _setTypingStyle:withUndoAction:]):
* WebView/WebHTMLView.mm:
(-[WebHTMLView _applyStyleToSelection:withUndoAction:]):
(-[WebHTMLView _changeCSSColorUsingSelector:inRange:]):
* WebView/WebView.mm:
(-[WebView applyStyle:]):
Source/WebKit2:
Use the new Ref::ptr() method.
* UIProcess/WebContext.cpp:
(WebKit::WebContext::createWebPage):
* UIProcess/WebPageProxy.cpp:
(WebKit::WebPageProxy::setPreferences):
* UIProcess/WebProcessProxy.cpp:
(WebKit::WebProcessProxy::didNavigateWithNavigationData):
(WebKit::WebProcessProxy::didPerformClientRedirect):
(WebKit::WebProcessProxy::didPerformServerRedirect):
(WebKit::WebProcessProxy::didUpdateHistoryTitle):
Source/WTF:
It is a very common pattern in our code base to get a pointer from a
Ref object. Previously, we have to call Ref.get() and take its address
which is not very nice. This patch adds a ptr() method to Ref class
to simplify the code a bit.
* wtf/PassRef.h:
(WTF::PassRef<T>::ptr):
* wtf/Ref.h:
(WTF::Ref::ptr):
(WTF::GetPtrHelper<Ref<T>>::getPtr):
Tools:
Use the new Ref::ptr() method.
* TestWebKitAPI/Tests/WTF/Ref.cpp:
(TestWebKitAPI::TEST):</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWTFChangeLog">trunk/Source/WTF/ChangeLog</a></li>
<li><a href="#trunkSourceWTFwtfPassRefh">trunk/Source/WTF/wtf/PassRef.h</a></li>
<li><a href="#trunkSourceWTFwtfRefh">trunk/Source/WTF/wtf/Ref.h</a></li>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreaccessibilityAccessibilityMenuListcpp">trunk/Source/WebCore/accessibility/AccessibilityMenuList.cpp</a></li>
<li><a href="#trunkSourceWebCorebindingsjsJSHTMLAllCollectionCustomcpp">trunk/Source/WebCore/bindings/js/JSHTMLAllCollectionCustom.cpp</a></li>
<li><a href="#trunkSourceWebCorebindingsjsJSHTMLFormControlsCollectionCustomcpp">trunk/Source/WebCore/bindings/js/JSHTMLFormControlsCollectionCustom.cpp</a></li>
<li><a href="#trunkSourceWebCorecssCSSStyleRuleh">trunk/Source/WebCore/css/CSSStyleRule.h</a></li>
<li><a href="#trunkSourceWebCorecssCSSStyleSheetcpp">trunk/Source/WebCore/css/CSSStyleSheet.cpp</a></li>
<li><a href="#trunkSourceWebCorecssCSSValueListh">trunk/Source/WebCore/css/CSSValueList.h</a></li>
<li><a href="#trunkSourceWebCorecssInspectorCSSOMWrapperscpp">trunk/Source/WebCore/css/InspectorCSSOMWrappers.cpp</a></li>
<li><a href="#trunkSourceWebCoredomChildListMutationScopecpp">trunk/Source/WebCore/dom/ChildListMutationScope.cpp</a></li>
<li><a href="#trunkSourceWebCoredomChildNodeListcpp">trunk/Source/WebCore/dom/ChildNodeList.cpp</a></li>
<li><a href="#trunkSourceWebCoredomContainerNodecpp">trunk/Source/WebCore/dom/ContainerNode.cpp</a></li>
<li><a href="#trunkSourceWebCoredomCurrentScriptIncrementerh">trunk/Source/WebCore/dom/CurrentScriptIncrementer.h</a></li>
<li><a href="#trunkSourceWebCoredomMutationRecordcpp">trunk/Source/WebCore/dom/MutationRecord.cpp</a></li>
<li><a href="#trunkSourceWebCoredomNodeRareDatah">trunk/Source/WebCore/dom/NodeRareData.h</a></li>
<li><a href="#trunkSourceWebCoredomRangecpp">trunk/Source/WebCore/dom/Range.cpp</a></li>
<li><a href="#trunkSourceWebCoredomScriptElementcpp">trunk/Source/WebCore/dom/ScriptElement.cpp</a></li>
<li><a href="#trunkSourceWebCoredomStaticNodeListcpp">trunk/Source/WebCore/dom/StaticNodeList.cpp</a></li>
<li><a href="#trunkSourceWebCoreeditingCompositeEditCommandcpp">trunk/Source/WebCore/editing/CompositeEditCommand.cpp</a></li>
<li><a href="#trunkSourceWebCoreeditingDictationCommandcpp">trunk/Source/WebCore/editing/DictationCommand.cpp</a></li>
<li><a href="#trunkSourceWebCoreeditingDictationCommandh">trunk/Source/WebCore/editing/DictationCommand.h</a></li>
<li><a href="#trunkSourceWebCoreeditingEditorcpp">trunk/Source/WebCore/editing/Editor.cpp</a></li>
<li><a href="#trunkSourceWebCoreeditingReplaceNodeWithSpanCommandcpp">trunk/Source/WebCore/editing/ReplaceNodeWithSpanCommand.cpp</a></li>
<li><a href="#trunkSourceWebCoreeditingSimplifyMarkupCommandcpp">trunk/Source/WebCore/editing/SimplifyMarkupCommand.cpp</a></li>
<li><a href="#trunkSourceWebCoreeditingmarkupcpp">trunk/Source/WebCore/editing/markup.cpp</a></li>
<li><a href="#trunkSourceWebCorehtmlHTMLFormControlElementcpp">trunk/Source/WebCore/html/HTMLFormControlElement.cpp</a></li>
<li><a href="#trunkSourceWebCorehtmlHTMLFormElementcpp">trunk/Source/WebCore/html/HTMLFormElement.cpp</a></li>
<li><a href="#trunkSourceWebCorehtmlHTMLLinkElementcpp">trunk/Source/WebCore/html/HTMLLinkElement.cpp</a></li>
<li><a href="#trunkSourceWebCoreinspectorInspectorStyleSheetcpp">trunk/Source/WebCore/inspector/InspectorStyleSheet.cpp</a></li>
<li><a href="#trunkSourceWebCoreloaderFrameLoadercpp">trunk/Source/WebCore/loader/FrameLoader.cpp</a></li>
<li><a href="#trunkSourceWebCorepageFocusControllercpp">trunk/Source/WebCore/page/FocusController.cpp</a></li>
<li><a href="#trunkSourceWebCorepagePageSerializercpp">trunk/Source/WebCore/page/PageSerializer.cpp</a></li>
<li><a href="#trunkSourceWebCorepagePageSerializerh">trunk/Source/WebCore/page/PageSerializer.h</a></li>
<li><a href="#trunkSourceWebCorepageanimationAnimationControllercpp">trunk/Source/WebCore/page/animation/AnimationController.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicscaTileCoverageMapcpp">trunk/Source/WebCore/platform/graphics/ca/TileCoverageMap.cpp</a></li>
<li><a href="#trunkSourceWebCorerenderingClipPathOperationh">trunk/Source/WebCore/rendering/ClipPathOperation.h</a></li>
<li><a href="#trunkSourceWebCorerenderingRenderBlockcpp">trunk/Source/WebCore/rendering/RenderBlock.cpp</a></li>
<li><a href="#trunkSourceWebCorerenderingRenderBlockFlowcpp">trunk/Source/WebCore/rendering/RenderBlockFlow.cpp</a></li>
<li><a href="#trunkSourceWebCorerenderingRenderBlockFlowh">trunk/Source/WebCore/rendering/RenderBlockFlow.h</a></li>
<li><a href="#trunkSourceWebCorerenderingRenderBoxcpp">trunk/Source/WebCore/rendering/RenderBox.cpp</a></li>
<li><a href="#trunkSourceWebCorerenderingRenderElementcpp">trunk/Source/WebCore/rendering/RenderElement.cpp</a></li>
<li><a href="#trunkSourceWebCorerenderingRenderNamedFlowFragmentcpp">trunk/Source/WebCore/rendering/RenderNamedFlowFragment.cpp</a></li>
<li><a href="#trunkSourceWebCorerenderingRenderTextControlcpp">trunk/Source/WebCore/rendering/RenderTextControl.cpp</a></li>
<li><a href="#trunkSourceWebCorerenderingRenderTextControlh">trunk/Source/WebCore/rendering/RenderTextControl.h</a></li>
<li><a href="#trunkSourceWebCorerenderingRenderTextControlMultiLinecpp">trunk/Source/WebCore/rendering/RenderTextControlMultiLine.cpp</a></li>
<li><a href="#trunkSourceWebCorerenderingRenderTextControlSingleLinecpp">trunk/Source/WebCore/rendering/RenderTextControlSingleLine.cpp</a></li>
<li><a href="#trunkSourceWebCorerenderingstyleDataRefh">trunk/Source/WebCore/rendering/style/DataRef.h</a></li>
<li><a href="#trunkSourceWebCorerenderingstyleRenderStylecpp">trunk/Source/WebCore/rendering/style/RenderStyle.cpp</a></li>
<li><a href="#trunkSourceWebCorerenderingstyleRenderStyleh">trunk/Source/WebCore/rendering/style/RenderStyle.h</a></li>
<li><a href="#trunkSourceWebCorerenderingstyleStyleGeneratedImagecpp">trunk/Source/WebCore/rendering/style/StyleGeneratedImage.cpp</a></li>
<li><a href="#trunkSourceWebCorerenderingstyleStyleGeneratedImageh">trunk/Source/WebCore/rendering/style/StyleGeneratedImage.h</a></li>
<li><a href="#trunkSourceWebCorestyleStyleResolveForDocumentcpp">trunk/Source/WebCore/style/StyleResolveForDocument.cpp</a></li>
<li><a href="#trunkSourceWebCorestyleStyleResolveTreecpp">trunk/Source/WebCore/style/StyleResolveTree.cpp</a></li>
<li><a href="#trunkSourceWebCorestyleStyleResolveTreeh">trunk/Source/WebCore/style/StyleResolveTree.h</a></li>
<li><a href="#trunkSourceWebKitmacChangeLog">trunk/Source/WebKit/mac/ChangeLog</a></li>
<li><a href="#trunkSourceWebKitmacWebViewWebFramemm">trunk/Source/WebKit/mac/WebView/WebFrame.mm</a></li>
<li><a href="#trunkSourceWebKitmacWebViewWebHTMLViewmm">trunk/Source/WebKit/mac/WebView/WebHTMLView.mm</a></li>
<li><a href="#trunkSourceWebKitmacWebViewWebViewmm">trunk/Source/WebKit/mac/WebView/WebView.mm</a></li>
<li><a href="#trunkSourceWebKit2ChangeLog">trunk/Source/WebKit2/ChangeLog</a></li>
<li><a href="#trunkSourceWebKit2UIProcessWebContextcpp">trunk/Source/WebKit2/UIProcess/WebContext.cpp</a></li>
<li><a href="#trunkSourceWebKit2UIProcessWebPageProxycpp">trunk/Source/WebKit2/UIProcess/WebPageProxy.cpp</a></li>
<li><a href="#trunkSourceWebKit2UIProcessWebProcessProxycpp">trunk/Source/WebKit2/UIProcess/WebProcessProxy.cpp</a></li>
<li><a href="#trunkToolsChangeLog">trunk/Tools/ChangeLog</a></li>
<li><a href="#trunkToolsTestWebKitAPITestsWTFRefcpp">trunk/Tools/TestWebKitAPI/Tests/WTF/Ref.cpp</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWTFChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WTF/ChangeLog (175582 => 175583)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WTF/ChangeLog 2014-11-04 22:38:56 UTC (rev 175582)
+++ trunk/Source/WTF/ChangeLog 2014-11-04 23:00:48 UTC (rev 175583)
</span><span class="lines">@@ -1,3 +1,21 @@
</span><ins>+2014-11-04 Chris Dumez <cdumez@apple.com>
+
+ Add ptr() method to Ref class
+ https://bugs.webkit.org/show_bug.cgi?id=138361
+
+ Reviewed by Darin Adler.
+
+ It is a very common pattern in our code base to get a pointer from a
+ Ref object. Previously, we have to call Ref.get() and take its address
+ which is not very nice. This patch adds a ptr() method to Ref class
+ to simplify the code a bit.
+
+ * wtf/PassRef.h:
+ (WTF::PassRef<T>::ptr):
+ * wtf/Ref.h:
+ (WTF::Ref::ptr):
+ (WTF::GetPtrHelper<Ref<T>>::getPtr):
+
</ins><span class="cx"> 2014-11-04 Dániel Bátyai <dbatyai.u-szeged@partner.samsung.com>
</span><span class="cx">
</span><span class="cx"> ATTR_USED incorrectly applying to Clang
</span></span></pre></div>
<a id="trunkSourceWTFwtfPassRefh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WTF/wtf/PassRef.h (175582 => 175583)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WTF/wtf/PassRef.h 2014-11-04 22:38:56 UTC (rev 175582)
+++ trunk/Source/WTF/wtf/PassRef.h 2014-11-04 23:00:48 UTC (rev 175583)
</span><span class="lines">@@ -45,6 +45,9 @@
</span><span class="cx"> const T& get() const;
</span><span class="cx"> T& get();
</span><span class="cx">
</span><ins>+ const T* ptr() const;
+ T* ptr();
+
</ins><span class="cx"> void dropRef();
</span><span class="cx"> T& leakRef() WARN_UNUSED_RETURN;
</span><span class="cx">
</span><span class="lines">@@ -125,6 +128,18 @@
</span><span class="cx"> return m_reference;
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+template<typename T> const T* PassRef<T>::ptr() const
+{
+ ASSERT(!m_gaveUpReference);
+ return &m_reference;
+}
+
+template<typename T> T* PassRef<T>::ptr()
+{
+ ASSERT(!m_gaveUpReference);
+ return &m_reference;
+}
+
</ins><span class="cx"> template<typename T> inline T& PassRef<T>::leakRef()
</span><span class="cx"> {
</span><span class="cx"> #ifndef NDEBUG
</span></span></pre></div>
<a id="trunkSourceWTFwtfRefh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WTF/wtf/Ref.h (175582 => 175583)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WTF/wtf/Ref.h 2014-11-04 22:38:56 UTC (rev 175582)
+++ trunk/Source/WTF/wtf/Ref.h 2014-11-04 23:00:48 UTC (rev 175583)
</span><span class="lines">@@ -58,6 +58,9 @@
</span><span class="cx"> const T* operator->() const { return m_ptr; }
</span><span class="cx"> T* operator->() { return m_ptr; }
</span><span class="cx">
</span><ins>+ const T* ptr() const { return m_ptr; }
+ T* ptr() { return m_ptr; }
+
</ins><span class="cx"> const T& get() const { return *m_ptr; }
</span><span class="cx"> T& get() { return *m_ptr; }
</span><span class="cx">
</span><span class="lines">@@ -80,7 +83,7 @@
</span><span class="cx"> template <typename T>
</span><span class="cx"> struct GetPtrHelper<Ref<T>> {
</span><span class="cx"> typedef T* PtrType;
</span><del>- static T* getPtr(const Ref<T>& p) { return const_cast<T*>(&p.get()); }
</del><ins>+ static T* getPtr(const Ref<T>& p) { return const_cast<T*>(p.ptr()); }
</ins><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> } // namespace WTF
</span></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (175582 => 175583)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2014-11-04 22:38:56 UTC (rev 175582)
+++ trunk/Source/WebCore/ChangeLog 2014-11-04 23:00:48 UTC (rev 175583)
</span><span class="lines">@@ -1,5 +1,138 @@
</span><span class="cx"> 2014-11-04 Chris Dumez <cdumez@apple.com>
</span><span class="cx">
</span><ins>+ Add ptr() method to Ref class
+ https://bugs.webkit.org/show_bug.cgi?id=138361
+
+ Reviewed by Darin Adler.
+
+ Use the new Ref::ptr() method.
+
+ No new tests, no behavior change.
+
+ * accessibility/AccessibilityMenuList.cpp:
+ (WebCore::AccessibilityMenuList::didUpdateActiveOption):
+ * bindings/js/JSHTMLAllCollectionCustom.cpp:
+ (WebCore::getNamedItems):
+ * bindings/js/JSHTMLFormControlsCollectionCustom.cpp:
+ (WebCore::getNamedItems):
+ * css/CSSStyleRule.h:
+ * css/CSSStyleSheet.cpp:
+ (WebCore::CSSStyleSheet::insertRule):
+ * css/CSSValueList.h:
+ (WebCore::CSSValueList::item):
+ (WebCore::CSSValueList::itemWithoutBoundsCheck):
+ * css/InspectorCSSOMWrappers.cpp:
+ (WebCore::InspectorCSSOMWrappers::collect):
+ * dom/ChildListMutationScope.cpp:
+ (WebCore::ChildListMutationAccumulator::~ChildListMutationAccumulator):
+ (WebCore::ChildListMutationAccumulator::childAdded):
+ * dom/ChildNodeList.cpp:
+ (WebCore::ChildNodeList::namedItem):
+ * dom/ContainerNode.cpp:
+ (WebCore::ContainerNode::removeChild):
+ * dom/CurrentScriptIncrementer.h:
+ (WebCore::CurrentScriptIncrementer::CurrentScriptIncrementer):
+ (WebCore::CurrentScriptIncrementer::~CurrentScriptIncrementer):
+ * dom/MutationRecord.cpp:
+ * dom/NodeRareData.h:
+ (WebCore::NodeListsNodeData::ensureChildNodeList):
+ (WebCore::NodeListsNodeData::ensureEmptyChildNodeList):
+ (WebCore::NodeListsNodeData::addCacheWithQualifiedName):
+ * dom/Range.cpp:
+ (WebCore::Range::setDocument):
+ * dom/ScriptElement.cpp:
+ (WebCore::ScriptElement::requestScript):
+ (WebCore::ScriptElement::executeScript):
+ * dom/StaticNodeList.cpp:
+ (WebCore::StaticNodeList::item):
+ (WebCore::StaticElementList::item):
+ * editing/CompositeEditCommand.cpp:
+ (WebCore::CompositeEditCommand::moveRemainingSiblingsToNewParent):
+ * editing/DictationCommand.cpp:
+ (WebCore::DictationCommand::insertText):
+ * editing/DictationCommand.h:
+ * editing/Editor.cpp:
+ (WebCore::Editor::insertTextWithoutSendingTextEvent):
+ * editing/ReplaceNodeWithSpanCommand.cpp:
+ (WebCore::swapInNodePreservingAttributesAndChildren):
+ * editing/SimplifyMarkupCommand.cpp:
+ (WebCore::SimplifyMarkupCommand::doApply):
+ * editing/markup.cpp:
+ (WebCore::hasOneChild):
+ (WebCore::hasOneTextChild):
+ (WebCore::replaceChildrenWithFragment):
+ (WebCore::replaceChildrenWithText):
+ * html/HTMLFormControlElement.cpp:
+ (WebCore::HTMLFormControlElement::checkValidity):
+ * html/HTMLFormElement.cpp:
+ (WebCore::HTMLFormElement::getNamedElements):
+ * html/HTMLLinkElement.cpp:
+ (WebCore::HTMLLinkElement::shouldLoadLink):
+ * inspector/InspectorStyleSheet.cpp:
+ (WebCore::InspectorStyleSheet::buildObjectForSelectorList):
+ (WebCore::InspectorStyleSheet::buildObjectForRule):
+ (WebCore::InspectorStyleSheet::revalidateStyle):
+ * loader/FrameLoader.cpp:
+ (WebCore::FrameLoader::continueLoadAfterNewWindowPolicy):
+ * page/FocusController.cpp:
+ (WebCore::FocusController::setFocusedElement):
+ * page/PageSerializer.cpp:
+ (WebCore::PageSerializer::retrieveResourcesForRule):
+ * page/PageSerializer.h:
+ * page/animation/AnimationController.cpp:
+ (WebCore::AnimationController::updateAnimations):
+ * platform/graphics/ca/TileCoverageMap.cpp:
+ (WebCore::TileCoverageMap::platformCALayerPaintContents):
+ * rendering/ClipPathOperation.h:
+ * rendering/RenderBlock.cpp:
+ (WebCore::styleForFirstLetter):
+ (WebCore::RenderBlock::updateFirstLetterStyle):
+ (WebCore::RenderBlock::createFirstLetterRenderer):
+ * rendering/RenderBlockFlow.cpp:
+ (WebCore::RenderBlockFlow::updateColumnProgressionFromStyle):
+ * rendering/RenderBlockFlow.h:
+ * rendering/RenderBox.cpp:
+ (WebCore::RenderBox::styleDidChange):
+ * rendering/RenderElement.cpp:
+ (WebCore::RenderElement::setStyle):
+ (WebCore::RenderElement::styleDidChange):
+ * rendering/RenderNamedFlowFragment.cpp:
+ (WebCore::RenderNamedFlowFragment::restoreRegionObjectsOriginalStyle):
+ * rendering/RenderTextControl.cpp:
+ (WebCore::RenderTextControl::adjustInnerTextStyle):
+ * rendering/RenderTextControl.h:
+ * rendering/RenderTextControlMultiLine.cpp:
+ (WebCore::RenderTextControlMultiLine::createInnerTextStyle):
+ * rendering/RenderTextControlSingleLine.cpp:
+ (WebCore::RenderTextControlSingleLine::createInnerTextStyle):
+ * rendering/style/DataRef.h:
+ (WebCore::DataRef::get):
+ (WebCore::DataRef::access):
+ (WebCore::DataRef::operator==):
+ (WebCore::DataRef::operator!=):
+ * rendering/style/RenderStyle.cpp:
+ (WebCore::RenderStyle::changeRequiresLayout):
+ (WebCore::RenderStyle::changeRequiresPositionedLayoutOnly):
+ (WebCore::RenderStyle::changeRequiresLayerRepaint):
+ (WebCore::RenderStyle::changeRequiresRepaint):
+ (WebCore::RenderStyle::changeRequiresRepaintIfTextOrBorderOrOutline):
+ (WebCore::RenderStyle::changeRequiresRecompositeLayer):
+ (WebCore::RenderStyle::diff):
+ (WebCore::RenderStyle::diffRequiresLayerRepaint):
+ * rendering/style/RenderStyle.h:
+ * rendering/style/StyleGeneratedImage.cpp:
+ (WebCore::StyleGeneratedImage::cssValue):
+ * rendering/style/StyleGeneratedImage.h:
+ * style/StyleResolveForDocument.cpp:
+ (WebCore::Style::resolveForDocument):
+ * style/StyleResolveTree.cpp:
+ (WebCore::Style::determineChange):
+ (WebCore::Style::resolveLocal):
+ (WebCore::Style::resolveTree):
+ * style/StyleResolveTree.h:
+
+2014-11-04 Chris Dumez <cdumez@apple.com>
+
</ins><span class="cx"> Move -webkit-text-emphasis-position to the new StyleBuilder
</span><span class="cx"> https://bugs.webkit.org/show_bug.cgi?id=138359
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreaccessibilityAccessibilityMenuListcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/accessibility/AccessibilityMenuList.cpp (175582 => 175583)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/accessibility/AccessibilityMenuList.cpp 2014-11-04 22:38:56 UTC (rev 175582)
+++ trunk/Source/WebCore/accessibility/AccessibilityMenuList.cpp 2014-11-04 23:00:48 UTC (rev 175583)
</span><span class="lines">@@ -125,7 +125,7 @@
</span><span class="cx"> downcast<AccessibilityMenuListPopup>(*childObjects[0]).didUpdateActiveOption(optionIndex);
</span><span class="cx"> }
</span><span class="cx">
</span><del>- cache->postNotification(this, &document.get(), AXObjectCache::AXMenuListValueChanged, TargetElement, PostSynchronously);
</del><ins>+ cache->postNotification(this, document.ptr(), AXObjectCache::AXMenuListValueChanged, TargetElement, PostSynchronously);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> } // namespace WebCore
</span></span></pre></div>
<a id="trunkSourceWebCorebindingsjsJSHTMLAllCollectionCustomcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/bindings/js/JSHTMLAllCollectionCustom.cpp (175582 => 175583)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/bindings/js/JSHTMLAllCollectionCustom.cpp 2014-11-04 22:38:56 UTC (rev 175582)
+++ trunk/Source/WebCore/bindings/js/JSHTMLAllCollectionCustom.cpp 2014-11-04 23:00:48 UTC (rev 175583)
</span><span class="lines">@@ -49,7 +49,7 @@
</span><span class="cx"> if (namedItems.isEmpty())
</span><span class="cx"> return jsUndefined();
</span><span class="cx"> if (namedItems.size() == 1)
</span><del>- return toJS(exec, collection->globalObject(), &namedItems[0].get());
</del><ins>+ return toJS(exec, collection->globalObject(), namedItems[0].ptr());
</ins><span class="cx">
</span><span class="cx"> // FIXME: HTML5 specification says this should be a HTMLCollection.
</span><span class="cx"> // http://www.whatwg.org/specs/web-apps/current-work/multipage/common-dom-interfaces.html#htmlallcollection
</span></span></pre></div>
<a id="trunkSourceWebCorebindingsjsJSHTMLFormControlsCollectionCustomcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/bindings/js/JSHTMLFormControlsCollectionCustom.cpp (175582 => 175583)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/bindings/js/JSHTMLFormControlsCollectionCustom.cpp 2014-11-04 22:38:56 UTC (rev 175582)
+++ trunk/Source/WebCore/bindings/js/JSHTMLFormControlsCollectionCustom.cpp 2014-11-04 23:00:48 UTC (rev 175583)
</span><span class="lines">@@ -47,7 +47,7 @@
</span><span class="cx"> if (namedItems.isEmpty())
</span><span class="cx"> return jsUndefined();
</span><span class="cx"> if (namedItems.size() == 1)
</span><del>- return toJS(exec, collection->globalObject(), &namedItems[0].get());
</del><ins>+ return toJS(exec, collection->globalObject(), namedItems[0].ptr());
</ins><span class="cx">
</span><span class="cx"> ASSERT(collection->impl().type() == FormControls);
</span><span class="cx"> return toJS(exec, collection->globalObject(), collection->impl().ownerNode().radioNodeList(name).get());
</span></span></pre></div>
<a id="trunkSourceWebCorecssCSSStyleRuleh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/css/CSSStyleRule.h (175582 => 175583)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/css/CSSStyleRule.h 2014-11-04 22:38:56 UTC (rev 175582)
+++ trunk/Source/WebCore/css/CSSStyleRule.h 2014-11-04 23:00:48 UTC (rev 175583)
</span><span class="lines">@@ -45,7 +45,7 @@
</span><span class="cx"> CSSStyleDeclaration& style();
</span><span class="cx">
</span><span class="cx"> // FIXME: Not CSSOM. Remove.
</span><del>- StyleRule* styleRule() const { return &const_cast<StyleRule&>(m_styleRule.get()); }
</del><ins>+ StyleRule& styleRule() const { return const_cast<StyleRule&>(m_styleRule.get()); }
</ins><span class="cx">
</span><span class="cx"> private:
</span><span class="cx"> CSSStyleRule(StyleRule&, CSSStyleSheet*);
</span></span></pre></div>
<a id="trunkSourceWebCorecssCSSStyleSheetcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/css/CSSStyleSheet.cpp (175582 => 175583)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/css/CSSStyleSheet.cpp 2014-11-04 22:38:56 UTC (rev 175582)
+++ trunk/Source/WebCore/css/CSSStyleSheet.cpp 2014-11-04 23:00:48 UTC (rev 175583)
</span><span class="lines">@@ -293,7 +293,7 @@
</span><span class="cx"> return 0;
</span><span class="cx"> }
</span><span class="cx"> CSSParser p(m_contents.get().parserContext());
</span><del>- RefPtr<StyleRuleBase> rule = p.parseRule(&m_contents.get(), ruleString);
</del><ins>+ RefPtr<StyleRuleBase> rule = p.parseRule(m_contents.ptr(), ruleString);
</ins><span class="cx">
</span><span class="cx"> if (!rule) {
</span><span class="cx"> ec = SYNTAX_ERR;
</span></span></pre></div>
<a id="trunkSourceWebCorecssCSSValueListh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/css/CSSValueList.h (175582 => 175583)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/css/CSSValueList.h 2014-11-04 22:38:56 UTC (rev 175582)
+++ trunk/Source/WebCore/css/CSSValueList.h 2014-11-04 23:00:48 UTC (rev 175583)
</span><span class="lines">@@ -52,10 +52,10 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> size_t length() const { return m_values.size(); }
</span><del>- CSSValue* item(size_t index) { return index < m_values.size() ? &m_values[index].get() : nullptr; }
- const CSSValue* item(size_t index) const { return index < m_values.size() ? &m_values[index].get() : nullptr; }
- CSSValue* itemWithoutBoundsCheck(size_t index) { return &m_values[index].get(); }
- const CSSValue* itemWithoutBoundsCheck(size_t index) const { ASSERT(index < m_values.size()); return &m_values[index].get(); }
</del><ins>+ CSSValue* item(size_t index) { return index < m_values.size() ? m_values[index].ptr() : nullptr; }
+ const CSSValue* item(size_t index) const { return index < m_values.size() ? m_values[index].ptr() : nullptr; }
+ CSSValue* itemWithoutBoundsCheck(size_t index) { return m_values[index].ptr(); }
+ const CSSValue* itemWithoutBoundsCheck(size_t index) const { ASSERT(index < m_values.size()); return m_values[index].ptr(); }
</ins><span class="cx">
</span><span class="cx"> const_iterator begin() const { return m_values.begin(); }
</span><span class="cx"> const_iterator end() const { return m_values.end(); }
</span></span></pre></div>
<a id="trunkSourceWebCorecssInspectorCSSOMWrapperscpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/css/InspectorCSSOMWrappers.cpp (175582 => 175583)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/css/InspectorCSSOMWrappers.cpp 2014-11-04 22:38:56 UTC (rev 175582)
+++ trunk/Source/WebCore/css/InspectorCSSOMWrappers.cpp 2014-11-04 23:00:48 UTC (rev 175583)
</span><span class="lines">@@ -72,7 +72,7 @@
</span><span class="cx"> break;
</span><span class="cx"> #endif
</span><span class="cx"> case CSSRule::STYLE_RULE:
</span><del>- m_styleRuleToCSSOMWrapperMap.add(downcast<CSSStyleRule>(*cssRule).styleRule(), downcast<CSSStyleRule>(cssRule));
</del><ins>+ m_styleRuleToCSSOMWrapperMap.add(&downcast<CSSStyleRule>(*cssRule).styleRule(), downcast<CSSStyleRule>(cssRule));
</ins><span class="cx"> break;
</span><span class="cx"> default:
</span><span class="cx"> break;
</span></span></pre></div>
<a id="trunkSourceWebCoredomChildListMutationScopecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/dom/ChildListMutationScope.cpp (175582 => 175583)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/dom/ChildListMutationScope.cpp 2014-11-04 22:38:56 UTC (rev 175582)
+++ trunk/Source/WebCore/dom/ChildListMutationScope.cpp 2014-11-04 23:00:48 UTC (rev 175583)
</span><span class="lines">@@ -58,7 +58,7 @@
</span><span class="cx"> {
</span><span class="cx"> if (!isEmpty())
</span><span class="cx"> enqueueMutationRecord();
</span><del>- accumulatorMap().remove(&m_target.get());
</del><ins>+ accumulatorMap().remove(m_target.ptr());
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> PassRefPtr<ChildListMutationAccumulator> ChildListMutationAccumulator::getOrCreate(ContainerNode& target)
</span><span class="lines">@@ -93,7 +93,7 @@
</span><span class="cx"> m_nextSibling = child->nextSibling();
</span><span class="cx"> }
</span><span class="cx">
</span><del>- m_lastAdded = &child.get();
</del><ins>+ m_lastAdded = child.ptr();
</ins><span class="cx"> m_addedNodes.append(child.get());
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoredomChildNodeListcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/dom/ChildNodeList.cpp (175582 => 175583)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/dom/ChildNodeList.cpp 2014-11-04 22:38:56 UTC (rev 175582)
+++ trunk/Source/WebCore/dom/ChildNodeList.cpp 2014-11-04 23:00:48 UTC (rev 175583)
</span><span class="lines">@@ -86,7 +86,7 @@
</span><span class="cx"> // FIXME: According to the spec child node list should not have namedItem().
</span><span class="cx"> if (m_parent.get().inDocument()) {
</span><span class="cx"> Element* element = m_parent.get().treeScope().getElementById(name);
</span><del>- if (element && element->parentNode() == &m_parent.get())
</del><ins>+ if (element && element->parentNode() == m_parent.ptr())
</ins><span class="cx"> return element;
</span><span class="cx"> if (!element || !m_parent.get().treeScope().containsMultipleElementsWithId(name))
</span><span class="cx"> return nullptr;
</span></span></pre></div>
<a id="trunkSourceWebCoredomContainerNodecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/dom/ContainerNode.cpp (175582 => 175583)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/dom/ContainerNode.cpp 2014-11-04 22:38:56 UTC (rev 175582)
+++ trunk/Source/WebCore/dom/ContainerNode.cpp 2014-11-04 23:00:48 UTC (rev 175583)
</span><span class="lines">@@ -534,7 +534,7 @@
</span><span class="cx">
</span><span class="cx"> Ref<Node> child(*oldChild);
</span><span class="cx">
</span><del>- document().removeFocusedNodeOfSubtree(&child.get());
</del><ins>+ document().removeFocusedNodeOfSubtree(child.ptr());
</ins><span class="cx">
</span><span class="cx"> #if ENABLE(FULLSCREEN_API)
</span><span class="cx"> document().removeFullScreenElementOfSubtree(&child.get());
</span></span></pre></div>
<a id="trunkSourceWebCoredomCurrentScriptIncrementerh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/dom/CurrentScriptIncrementer.h (175582 => 175583)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/dom/CurrentScriptIncrementer.h 2014-11-04 22:38:56 UTC (rev 175582)
+++ trunk/Source/WebCore/dom/CurrentScriptIncrementer.h 2014-11-04 23:00:48 UTC (rev 175583)
</span><span class="lines">@@ -37,22 +37,22 @@
</span><span class="cx"> class CurrentScriptIncrementer {
</span><span class="cx"> WTF_MAKE_NONCOPYABLE(CurrentScriptIncrementer);
</span><span class="cx"> public:
</span><del>- CurrentScriptIncrementer(Document* document, Element* element)
</del><ins>+ CurrentScriptIncrementer(Document& document, Element* element)
</ins><span class="cx"> : m_document(document)
</span><span class="cx"> , m_isHTMLScriptElement(is<HTMLScriptElement>(*element))
</span><span class="cx"> {
</span><span class="cx"> if (m_isHTMLScriptElement)
</span><del>- m_document->pushCurrentScript(downcast<HTMLScriptElement>(element));
</del><ins>+ m_document.pushCurrentScript(downcast<HTMLScriptElement>(element));
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> ~CurrentScriptIncrementer()
</span><span class="cx"> {
</span><span class="cx"> if (m_isHTMLScriptElement)
</span><del>- m_document->popCurrentScript();
</del><ins>+ m_document.popCurrentScript();
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> private:
</span><del>- Document* m_document;
</del><ins>+ Document& m_document;
</ins><span class="cx"> bool m_isHTMLScriptElement;
</span><span class="cx"> };
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoredomMutationRecordcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/dom/MutationRecord.cpp (175582 => 175583)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/dom/MutationRecord.cpp 2014-11-04 22:38:56 UTC (rev 175582)
+++ trunk/Source/WebCore/dom/MutationRecord.cpp 2014-11-04 23:00:48 UTC (rev 175583)
</span><span class="lines">@@ -52,7 +52,7 @@
</span><span class="cx">
</span><span class="cx"> private:
</span><span class="cx"> virtual const AtomicString& type() override;
</span><del>- virtual Node* target() override { return &m_target.get(); }
</del><ins>+ virtual Node* target() override { return m_target.ptr(); }
</ins><span class="cx"> virtual NodeList* addedNodes() override { return m_addedNodes.get(); }
</span><span class="cx"> virtual NodeList* removedNodes() override { return m_removedNodes.get(); }
</span><span class="cx"> virtual Node* previousSibling() override { return m_previousSibling.get(); }
</span><span class="lines">@@ -74,7 +74,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> private:
</span><del>- virtual Node* target() override { return &m_target.get(); }
</del><ins>+ virtual Node* target() override { return m_target.ptr(); }
</ins><span class="cx"> virtual String oldValue() override { return m_oldValue; }
</span><span class="cx"> virtual NodeList* addedNodes() override { return lazilyInitializeEmptyNodeList(m_addedNodes); }
</span><span class="cx"> virtual NodeList* removedNodes() override { return lazilyInitializeEmptyNodeList(m_removedNodes); }
</span></span></pre></div>
<a id="trunkSourceWebCoredomNodeRareDatah"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/dom/NodeRareData.h (175582 => 175583)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/dom/NodeRareData.h 2014-11-04 22:38:56 UTC (rev 175582)
+++ trunk/Source/WebCore/dom/NodeRareData.h 2014-11-04 23:00:48 UTC (rev 175583)
</span><span class="lines">@@ -75,7 +75,7 @@
</span><span class="cx"> if (m_childNodeList)
</span><span class="cx"> return *m_childNodeList;
</span><span class="cx"> auto list = ChildNodeList::create(node);
</span><del>- m_childNodeList = &list.get();
</del><ins>+ m_childNodeList = list.ptr();
</ins><span class="cx"> return list;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -93,7 +93,7 @@
</span><span class="cx"> if (m_emptyChildNodeList)
</span><span class="cx"> return *m_emptyChildNodeList;
</span><span class="cx"> auto list = EmptyNodeList::create(node);
</span><del>- m_emptyChildNodeList = &list.get();
</del><ins>+ m_emptyChildNodeList = list.ptr();
</ins><span class="cx"> return list;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -138,7 +138,7 @@
</span><span class="cx"> return *result.iterator->value;
</span><span class="cx">
</span><span class="cx"> auto list = TagNodeList::create(node, namespaceURI, localName);
</span><del>- result.iterator->value = &list.get();
</del><ins>+ result.iterator->value = list.ptr();
</ins><span class="cx"> return list;
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoredomRangecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/dom/Range.cpp (175582 => 175583)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/dom/Range.cpp 2014-11-04 22:38:56 UTC (rev 175582)
+++ trunk/Source/WebCore/dom/Range.cpp 2014-11-04 23:00:48 UTC (rev 175583)
</span><span class="lines">@@ -128,7 +128,7 @@
</span><span class="cx">
</span><span class="cx"> void Range::setDocument(Document& document)
</span><span class="cx"> {
</span><del>- ASSERT(&m_ownerDocument.get() != &document);
</del><ins>+ ASSERT(m_ownerDocument.ptr() != &document);
</ins><span class="cx"> m_ownerDocument->detachRange(this);
</span><span class="cx"> m_ownerDocument = document;
</span><span class="cx"> m_start.setToStartOfNode(&document);
</span></span></pre></div>
<a id="trunkSourceWebCoredomScriptElementcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/dom/ScriptElement.cpp (175582 => 175583)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/dom/ScriptElement.cpp 2014-11-04 22:38:56 UTC (rev 175582)
+++ trunk/Source/WebCore/dom/ScriptElement.cpp 2014-11-04 23:00:48 UTC (rev 175583)
</span><span class="lines">@@ -245,7 +245,7 @@
</span><span class="cx"> Ref<Document> originalDocument(m_element.document());
</span><span class="cx"> if (!m_element.dispatchBeforeLoadEvent(sourceUrl))
</span><span class="cx"> return false;
</span><del>- if (!m_element.inDocument() || &m_element.document() != &originalDocument.get())
</del><ins>+ if (!m_element.inDocument() || &m_element.document() != originalDocument.ptr())
</ins><span class="cx"> return false;
</span><span class="cx">
</span><span class="cx"> ASSERT(!m_cachedScript);
</span><span class="lines">@@ -292,8 +292,8 @@
</span><span class="cx">
</span><span class="cx"> Ref<Document> document(m_element.document());
</span><span class="cx"> if (Frame* frame = document->frame()) {
</span><del>- IgnoreDestructiveWriteCountIncrementer ignoreDesctructiveWriteCountIncrementer(m_isExternalScript ? &document.get() : 0);
- CurrentScriptIncrementer currentScriptIncrementer(&document.get(), &m_element);
</del><ins>+ IgnoreDestructiveWriteCountIncrementer ignoreDesctructiveWriteCountIncrementer(m_isExternalScript ? document.ptr() : nullptr);
+ CurrentScriptIncrementer currentScriptIncrementer(document, &m_element);
</ins><span class="cx">
</span><span class="cx"> // Create a script from the script element node, using the script
</span><span class="cx"> // block's source and the script block's type.
</span></span></pre></div>
<a id="trunkSourceWebCoredomStaticNodeListcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/dom/StaticNodeList.cpp (175582 => 175583)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/dom/StaticNodeList.cpp 2014-11-04 22:38:56 UTC (rev 175582)
+++ trunk/Source/WebCore/dom/StaticNodeList.cpp 2014-11-04 23:00:48 UTC (rev 175583)
</span><span class="lines">@@ -39,7 +39,7 @@
</span><span class="cx"> Node* StaticNodeList::item(unsigned index) const
</span><span class="cx"> {
</span><span class="cx"> if (index < m_nodes.size())
</span><del>- return &const_cast<Node&>(m_nodes[index].get());
</del><ins>+ return const_cast<Node*>(m_nodes[index].ptr());
</ins><span class="cx"> return nullptr;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -61,7 +61,7 @@
</span><span class="cx"> Node* StaticElementList::item(unsigned index) const
</span><span class="cx"> {
</span><span class="cx"> if (index < m_elements.size())
</span><del>- return &const_cast<Element&>(m_elements[index].get());
</del><ins>+ return const_cast<Element*>(m_elements[index].ptr());
</ins><span class="cx"> return nullptr;
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreeditingCompositeEditCommandcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/editing/CompositeEditCommand.cpp (175582 => 175583)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/editing/CompositeEditCommand.cpp 2014-11-04 22:38:56 UTC (rev 175582)
+++ trunk/Source/WebCore/editing/CompositeEditCommand.cpp 2014-11-04 23:00:48 UTC (rev 175583)
</span><span class="lines">@@ -436,9 +436,9 @@
</span><span class="cx"> for (; node && node != pastLastNodeToMove; node = node->nextSibling())
</span><span class="cx"> nodesToRemove.append(*node);
</span><span class="cx">
</span><del>- for (unsigned i = 0; i < nodesToRemove.size(); i++) {
- removeNode(&nodesToRemove[i].get());
- appendNode(&nodesToRemove[i].get(), newParent);
</del><ins>+ for (auto& nodeToRemove : nodesToRemove) {
+ removeNode(nodeToRemove.ptr());
+ appendNode(nodeToRemove.ptr(), newParent);
</ins><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreeditingDictationCommandcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/editing/DictationCommand.cpp (175582 => 175583)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/editing/DictationCommand.cpp 2014-11-04 22:38:56 UTC (rev 175582)
+++ trunk/Source/WebCore/editing/DictationCommand.cpp 2014-11-04 23:00:48 UTC (rev 175583)
</span><span class="lines">@@ -86,9 +86,9 @@
</span><span class="cx"> {
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void DictationCommand::insertText(Document* document, const String& text, const Vector<DictationAlternative>& alternatives, const VisibleSelection& selectionForInsertion)
</del><ins>+void DictationCommand::insertText(Document& document, const String& text, const Vector<DictationAlternative>& alternatives, const VisibleSelection& selectionForInsertion)
</ins><span class="cx"> {
</span><del>- RefPtr<Frame> frame = document->frame();
</del><ins>+ RefPtr<Frame> frame = document.frame();
</ins><span class="cx"> ASSERT(frame);
</span><span class="cx">
</span><span class="cx"> VisibleSelection currentSelection = frame->selection().selection();
</span><span class="lines">@@ -97,11 +97,11 @@
</span><span class="cx">
</span><span class="cx"> RefPtr<DictationCommand> cmd;
</span><span class="cx"> if (newText == text)
</span><del>- cmd = DictationCommand::create(*document, newText, alternatives);
</del><ins>+ cmd = DictationCommand::create(document, newText, alternatives);
</ins><span class="cx"> else
</span><span class="cx"> // If the text was modified before insertion, the location of dictation alternatives
</span><span class="cx"> // will not be valid anymore. We will just drop the alternatives.
</span><del>- cmd = DictationCommand::create(*document, newText, Vector<DictationAlternative>());
</del><ins>+ cmd = DictationCommand::create(document, newText, Vector<DictationAlternative>());
</ins><span class="cx"> applyTextInsertionCommand(frame.get(), cmd, selectionForInsertion, currentSelection);
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreeditingDictationCommandh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/editing/DictationCommand.h (175582 => 175583)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/editing/DictationCommand.h 2014-11-04 22:38:56 UTC (rev 175582)
+++ trunk/Source/WebCore/editing/DictationCommand.h 2014-11-04 23:00:48 UTC (rev 175583)
</span><span class="lines">@@ -36,7 +36,7 @@
</span><span class="cx"> class DictationCommand : public TextInsertionBaseCommand {
</span><span class="cx"> friend class DictationCommandLineOperation;
</span><span class="cx"> public:
</span><del>- static void insertText(Document*, const String&, const Vector<DictationAlternative>& alternatives, const VisibleSelection&);
</del><ins>+ static void insertText(Document&, const String&, const Vector<DictationAlternative>& alternatives, const VisibleSelection&);
</ins><span class="cx"> virtual bool isDictationCommand() const { return true; }
</span><span class="cx"> private:
</span><span class="cx"> static PassRefPtr<DictationCommand> create(Document& document, const String& text, const Vector<DictationAlternative>& alternatives)
</span></span></pre></div>
<a id="trunkSourceWebCoreeditingEditorcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/editing/Editor.cpp (175582 => 175583)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/editing/Editor.cpp 2014-11-04 22:38:56 UTC (rev 175582)
+++ trunk/Source/WebCore/editing/Editor.cpp 2014-11-04 23:00:48 UTC (rev 175583)
</span><span class="lines">@@ -1214,7 +1214,7 @@
</span><span class="cx">
</span><span class="cx"> // Insert the text
</span><span class="cx"> if (triggeringEvent && triggeringEvent->isDictation())
</span><del>- DictationCommand::insertText(&document.get(), text, triggeringEvent->dictationAlternatives(), selection);
</del><ins>+ DictationCommand::insertText(document, text, triggeringEvent->dictationAlternatives(), selection);
</ins><span class="cx"> else {
</span><span class="cx"> TypingCommand::Options options = 0;
</span><span class="cx"> if (selectInsertedText)
</span></span></pre></div>
<a id="trunkSourceWebCoreeditingReplaceNodeWithSpanCommandcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/editing/ReplaceNodeWithSpanCommand.cpp (175582 => 175583)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/editing/ReplaceNodeWithSpanCommand.cpp 2014-11-04 22:38:56 UTC (rev 175582)
+++ trunk/Source/WebCore/editing/ReplaceNodeWithSpanCommand.cpp 2014-11-04 23:00:48 UTC (rev 175583)
</span><span class="lines">@@ -57,8 +57,8 @@
</span><span class="cx"> newNode->cloneDataFromElement(*nodeToReplace);
</span><span class="cx"> NodeVector children;
</span><span class="cx"> getChildNodes(*nodeToReplace, children);
</span><del>- for (size_t i = 0; i < children.size(); ++i)
- newNode->appendChild(&children[i].get(), ASSERT_NO_EXCEPTION);
</del><ins>+ for (auto& child : children)
+ newNode->appendChild(child.ptr(), ASSERT_NO_EXCEPTION);
</ins><span class="cx">
</span><span class="cx"> parentNode->insertBefore(newNode, nodeToReplace, ASSERT_NO_EXCEPTION);
</span><span class="cx"> parentNode->removeChild(nodeToReplace, ASSERT_NO_EXCEPTION);
</span></span></pre></div>
<a id="trunkSourceWebCoreeditingSimplifyMarkupCommandcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/editing/SimplifyMarkupCommand.cpp (175582 => 175583)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/editing/SimplifyMarkupCommand.cpp 2014-11-04 22:38:56 UTC (rev 175582)
+++ trunk/Source/WebCore/editing/SimplifyMarkupCommand.cpp 2014-11-04 23:00:48 UTC (rev 175583)
</span><span class="lines">@@ -79,7 +79,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> unsigned context;
</span><del>- if (currentNode->renderStyle()->diff(startingStyle, context) == StyleDifferenceEqual)
</del><ins>+ if (currentNode->renderStyle()->diff(*startingStyle, context) == StyleDifferenceEqual)
</ins><span class="cx"> topNodeWithStartingStyle = currentNode;
</span><span class="cx">
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebCoreeditingmarkupcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/editing/markup.cpp (175582 => 175583)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/editing/markup.cpp 2014-11-04 22:38:56 UTC (rev 175582)
+++ trunk/Source/WebCore/editing/markup.cpp 2014-11-04 23:00:48 UTC (rev 175583)
</span><span class="lines">@@ -980,15 +980,15 @@
</span><span class="cx"> return fragment.release();
</span><span class="cx"> }
</span><span class="cx">
</span><del>-static inline bool hasOneChild(ContainerNode* node)
</del><ins>+static inline bool hasOneChild(ContainerNode& node)
</ins><span class="cx"> {
</span><del>- Node* firstChild = node->firstChild();
</del><ins>+ Node* firstChild = node.firstChild();
</ins><span class="cx"> return firstChild && !firstChild->nextSibling();
</span><span class="cx"> }
</span><span class="cx">
</span><del>-static inline bool hasOneTextChild(ContainerNode* node)
</del><ins>+static inline bool hasOneTextChild(ContainerNode& node)
</ins><span class="cx"> {
</span><del>- return hasOneChild(node) && node->firstChild()->isTextNode();
</del><ins>+ return hasOneChild(node) && node.firstChild()->isTextNode();
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void replaceChildrenWithFragment(ContainerNode& container, PassRefPtr<DocumentFragment> fragment, ExceptionCode& ec)
</span><span class="lines">@@ -1001,12 +1001,12 @@
</span><span class="cx"> return;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- if (hasOneTextChild(&containerNode.get()) && hasOneTextChild(fragment.get())) {
</del><ins>+ if (hasOneTextChild(containerNode) && hasOneTextChild(*fragment)) {
</ins><span class="cx"> downcast<Text>(*containerNode->firstChild()).setData(downcast<Text>(*fragment->firstChild()).data(), ec);
</span><span class="cx"> return;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- if (hasOneChild(&containerNode.get())) {
</del><ins>+ if (hasOneChild(containerNode)) {
</ins><span class="cx"> containerNode->replaceChild(fragment, containerNode->firstChild(), ec);
</span><span class="cx"> return;
</span><span class="cx"> }
</span><span class="lines">@@ -1020,14 +1020,14 @@
</span><span class="cx"> Ref<ContainerNode> containerNode(container);
</span><span class="cx"> ChildListMutationScope mutation(containerNode);
</span><span class="cx">
</span><del>- if (hasOneTextChild(&containerNode.get())) {
</del><ins>+ if (hasOneTextChild(containerNode)) {
</ins><span class="cx"> downcast<Text>(*containerNode->firstChild()).setData(text, ec);
</span><span class="cx"> return;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> RefPtr<Text> textNode = Text::create(containerNode->document(), text);
</span><span class="cx">
</span><del>- if (hasOneChild(&containerNode.get())) {
</del><ins>+ if (hasOneChild(containerNode)) {
</ins><span class="cx"> containerNode->replaceChild(textNode.release(), containerNode->firstChild(), ec);
</span><span class="cx"> return;
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebCorehtmlHTMLFormControlElementcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/HTMLFormControlElement.cpp (175582 => 175583)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/HTMLFormControlElement.cpp 2014-11-04 22:38:56 UTC (rev 175582)
+++ trunk/Source/WebCore/html/HTMLFormControlElement.cpp 2014-11-04 23:00:48 UTC (rev 175583)
</span><span class="lines">@@ -409,7 +409,7 @@
</span><span class="cx"> Ref<HTMLFormControlElement> protect(*this);
</span><span class="cx"> Ref<Document> originalDocument(document());
</span><span class="cx"> bool needsDefaultAction = dispatchEvent(Event::create(eventNames().invalidEvent, false, true));
</span><del>- if (needsDefaultAction && unhandledInvalidControls && inDocument() && &originalDocument.get() == &document())
</del><ins>+ if (needsDefaultAction && unhandledInvalidControls && inDocument() && originalDocument.ptr() == &document())
</ins><span class="cx"> unhandledInvalidControls->append(this);
</span><span class="cx"> return false;
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebCorehtmlHTMLFormElementcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/HTMLFormElement.cpp (175582 => 175583)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/HTMLFormElement.cpp 2014-11-04 22:38:56 UTC (rev 175582)
+++ trunk/Source/WebCore/html/HTMLFormElement.cpp 2014-11-04 23:00:48 UTC (rev 175583)
</span><span class="lines">@@ -799,7 +799,7 @@
</span><span class="cx"> elements()->namedItems(name, namedItems);
</span><span class="cx">
</span><span class="cx"> HTMLElement* elementFromPast = elementFromPastNamesMap(name);
</span><del>- if (namedItems.size() == 1 && &namedItems.first().get() != elementFromPast)
</del><ins>+ if (namedItems.size() == 1 && namedItems.first().ptr() != elementFromPast)
</ins><span class="cx"> addToPastNamesMap(downcast<HTMLElement>(namedItems.first().get()).asFormNamedItem(), name);
</span><span class="cx"> else if (elementFromPast && namedItems.isEmpty())
</span><span class="cx"> namedItems.append(*elementFromPast);
</span></span></pre></div>
<a id="trunkSourceWebCorehtmlHTMLLinkElementcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/HTMLLinkElement.cpp (175582 => 175583)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/HTMLLinkElement.cpp 2014-11-04 22:38:56 UTC (rev 175582)
+++ trunk/Source/WebCore/html/HTMLLinkElement.cpp 2014-11-04 23:00:48 UTC (rev 175583)
</span><span class="lines">@@ -175,7 +175,7 @@
</span><span class="cx"> if (!dispatchBeforeLoadEvent(getNonEmptyURLAttribute(hrefAttr)))
</span><span class="cx"> return false;
</span><span class="cx"> // A beforeload handler might have removed us from the document or changed the document.
</span><del>- if (!inDocument() || &document() != &originalDocument.get())
</del><ins>+ if (!inDocument() || &document() != originalDocument.ptr())
</ins><span class="cx"> return false;
</span><span class="cx"> return true;
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebCoreinspectorInspectorStyleSheetcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/inspector/InspectorStyleSheet.cpp (175582 => 175583)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/inspector/InspectorStyleSheet.cpp 2014-11-04 22:38:56 UTC (rev 175582)
+++ trunk/Source/WebCore/inspector/InspectorStyleSheet.cpp 2014-11-04 23:00:48 UTC (rev 175583)
</span><span class="lines">@@ -1041,10 +1041,10 @@
</span><span class="cx"> String selectorText = rule->selectorText();
</span><span class="cx">
</span><span class="cx"> if (sourceData)
</span><del>- selectors = selectorsFromSource(sourceData.get(), m_parsedStyleSheet->text(), rule->styleRule()->selectorList());
</del><ins>+ selectors = selectorsFromSource(sourceData.get(), m_parsedStyleSheet->text(), rule->styleRule().selectorList());
</ins><span class="cx"> else {
</span><span class="cx"> selectors = Inspector::Protocol::Array<Inspector::Protocol::CSS::CSSSelector>::create();
</span><del>- const CSSSelectorList& selectorList = rule->styleRule()->selectorList();
</del><ins>+ const CSSSelectorList& selectorList = rule->styleRule().selectorList();
</ins><span class="cx"> for (const CSSSelector* selector = selectorList.first(); selector; selector = CSSSelectorList::next(selector))
</span><span class="cx"> selectors->addItem(buildObjectForSelector(selector));
</span><span class="cx"> }
</span><span class="lines">@@ -1065,7 +1065,7 @@
</span><span class="cx">
</span><span class="cx"> RefPtr<Inspector::Protocol::CSS::CSSRule> result = Inspector::Protocol::CSS::CSSRule::create()
</span><span class="cx"> .setSelectorList(buildObjectForSelectorList(rule))
</span><del>- .setSourceLine(rule->styleRule()->sourceLine())
</del><ins>+ .setSourceLine(rule->styleRule().sourceLine())
</ins><span class="cx"> .setOrigin(m_origin)
</span><span class="cx"> .setStyle(buildObjectForStyle(&rule->style()));
</span><span class="cx">
</span><span class="lines">@@ -1361,7 +1361,7 @@
</span><span class="cx"> for (unsigned i = 0, size = m_flatRules.size(); i < size; ++i) {
</span><span class="cx"> CSSStyleRule* parsedRule = m_flatRules.at(i).get();
</span><span class="cx"> if (&parsedRule->style() == pageStyle) {
</span><del>- if (parsedRule->styleRule()->properties().asText() != pageStyle->cssText()) {
</del><ins>+ if (parsedRule->styleRule().properties().asText() != pageStyle->cssText()) {
</ins><span class="cx"> // Clear the disabled properties for the invalid style here.
</span><span class="cx"> m_inspectorStyles.remove(pageStyle);
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreloaderFrameLoadercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/loader/FrameLoader.cpp (175582 => 175583)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/loader/FrameLoader.cpp 2014-11-04 22:38:56 UTC (rev 175582)
+++ trunk/Source/WebCore/loader/FrameLoader.cpp 2014-11-04 23:00:48 UTC (rev 175583)
</span><span class="lines">@@ -2971,7 +2971,7 @@
</span><span class="cx"> mainFrame->page()->setOpenedByDOM();
</span><span class="cx"> mainFrame->loader().m_client.dispatchShow();
</span><span class="cx"> if (!m_suppressOpenerInNewFrame) {
</span><del>- mainFrame->loader().setOpener(&frame.get());
</del><ins>+ mainFrame->loader().setOpener(frame.ptr());
</ins><span class="cx"> mainFrame->document()->setReferrerPolicy(frame->document()->referrerPolicy());
</span><span class="cx"> }
</span><span class="cx"> mainFrame->loader().loadWithNavigationAction(request, NavigationAction(request), LockHistory::No, FrameLoadType::Standard, formState, allowNavigationToInvalidURL);
</span></span></pre></div>
<a id="trunkSourceWebCorepageFocusControllercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/page/FocusController.cpp (175582 => 175583)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/page/FocusController.cpp 2014-11-04 22:38:56 UTC (rev 175582)
+++ trunk/Source/WebCore/page/FocusController.cpp 2014-11-04 23:00:48 UTC (rev 175583)
</span><span class="lines">@@ -587,9 +587,9 @@
</span><span class="cx"> bool FocusController::setFocusedElement(Element* element, PassRefPtr<Frame> newFocusedFrame, FocusDirection direction)
</span><span class="cx"> {
</span><span class="cx"> RefPtr<Frame> oldFocusedFrame = focusedFrame();
</span><del>- RefPtr<Document> oldDocument = oldFocusedFrame ? oldFocusedFrame->document() : 0;
</del><ins>+ RefPtr<Document> oldDocument = oldFocusedFrame ? oldFocusedFrame->document() : nullptr;
</ins><span class="cx">
</span><del>- Element* oldFocusedElement = oldDocument ? oldDocument->focusedElement() : 0;
</del><ins>+ Element* oldFocusedElement = oldDocument ? oldDocument->focusedElement() : nullptr;
</ins><span class="cx"> if (oldFocusedElement == element)
</span><span class="cx"> return true;
</span><span class="cx">
</span><span class="lines">@@ -603,7 +603,7 @@
</span><span class="cx">
</span><span class="cx"> if (!element) {
</span><span class="cx"> if (oldDocument)
</span><del>- oldDocument->setFocusedElement(0);
</del><ins>+ oldDocument->setFocusedElement(nullptr);
</ins><span class="cx"> m_page.editorClient()->setInputMethodState(false);
</span><span class="cx"> return true;
</span><span class="cx"> }
</span><span class="lines">@@ -615,11 +615,11 @@
</span><span class="cx"> return true;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- if (oldDocument && oldDocument != &newDocument.get())
- oldDocument->setFocusedElement(0);
</del><ins>+ if (oldDocument && oldDocument != newDocument.ptr())
+ oldDocument->setFocusedElement(nullptr);
</ins><span class="cx">
</span><span class="cx"> if (newFocusedFrame && !newFocusedFrame->page()) {
</span><del>- setFocusedFrame(0);
</del><ins>+ setFocusedFrame(nullptr);
</ins><span class="cx"> return false;
</span><span class="cx"> }
</span><span class="cx"> setFocusedFrame(newFocusedFrame);
</span></span></pre></div>
<a id="trunkSourceWebCorepagePageSerializercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/page/PageSerializer.cpp (175582 => 175583)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/page/PageSerializer.cpp 2014-11-04 22:38:56 UTC (rev 175582)
+++ trunk/Source/WebCore/page/PageSerializer.cpp 2014-11-04 23:00:48 UTC (rev 175583)
</span><span class="lines">@@ -312,9 +312,9 @@
</span><span class="cx"> m_resourceURLs.add(url);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void PageSerializer::retrieveResourcesForRule(StyleRule* rule, Document* document)
</del><ins>+void PageSerializer::retrieveResourcesForRule(StyleRule& rule, Document* document)
</ins><span class="cx"> {
</span><del>- retrieveResourcesForProperties(&rule->properties(), document);
</del><ins>+ retrieveResourcesForProperties(&rule.properties(), document);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void PageSerializer::retrieveResourcesForProperties(const StyleProperties* styleDeclaration, Document* document)
</span></span></pre></div>
<a id="trunkSourceWebCorepagePageSerializerh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/page/PageSerializer.h (175582 => 175583)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/page/PageSerializer.h 2014-11-04 22:38:56 UTC (rev 175582)
+++ trunk/Source/WebCore/page/PageSerializer.h 2014-11-04 23:00:48 UTC (rev 175583)
</span><span class="lines">@@ -79,7 +79,7 @@
</span><span class="cx">
</span><span class="cx"> void addImageToResources(CachedImage*, RenderElement*, const URL&);
</span><span class="cx"> void retrieveResourcesForProperties(const StyleProperties*, Document*);
</span><del>- void retrieveResourcesForRule(StyleRule*, Document*);
</del><ins>+ void retrieveResourcesForRule(StyleRule&, Document*);
</ins><span class="cx">
</span><span class="cx"> Vector<Resource>* m_resources;
</span><span class="cx"> ListHashSet<URL> m_resourceURLs;
</span></span></pre></div>
<a id="trunkSourceWebCorepageanimationAnimationControllercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/page/animation/AnimationController.cpp (175582 => 175583)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/page/animation/AnimationController.cpp 2014-11-04 22:38:56 UTC (rev 175582)
+++ trunk/Source/WebCore/page/animation/AnimationController.cpp 2014-11-04 23:00:48 UTC (rev 175583)
</span><span class="lines">@@ -525,7 +525,7 @@
</span><span class="cx"> #endif
</span><span class="cx"> }
</span><span class="cx">
</span><del>- if (&blendedStyle.get() != &newStyleBeforeAnimation.get()) {
</del><ins>+ if (blendedStyle.ptr() != newStyleBeforeAnimation.ptr()) {
</ins><span class="cx"> // If the animations/transitions change opacity or transform, we need to update
</span><span class="cx"> // the style to impose the stacking rules. Note that this is also
</span><span class="cx"> // done in StyleResolver::adjustRenderStyle().
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicscaTileCoverageMapcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/ca/TileCoverageMap.cpp (175582 => 175583)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/ca/TileCoverageMap.cpp 2014-11-04 22:38:56 UTC (rev 175582)
+++ trunk/Source/WebCore/platform/graphics/ca/TileCoverageMap.cpp 2014-11-04 23:00:48 UTC (rev 175583)
</span><span class="lines">@@ -102,7 +102,7 @@
</span><span class="cx">
</span><span class="cx"> void TileCoverageMap::platformCALayerPaintContents(PlatformCALayer* platformCALayer, GraphicsContext& context, const FloatRect&)
</span><span class="cx"> {
</span><del>- ASSERT_UNUSED(platformCALayer, platformCALayer == &m_layer.get());
</del><ins>+ ASSERT_UNUSED(platformCALayer, platformCALayer == m_layer.ptr());
</ins><span class="cx"> m_controller.tileGrid().drawTileMapContents(context.platformContext(), m_layer.get().bounds());
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingClipPathOperationh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/ClipPathOperation.h (175582 => 175583)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/ClipPathOperation.h 2014-11-04 22:38:56 UTC (rev 175582)
+++ trunk/Source/WebCore/rendering/ClipPathOperation.h 2014-11-04 23:00:48 UTC (rev 175583)
</span><span class="lines">@@ -119,7 +119,7 @@
</span><span class="cx"> if (!isSameType(other))
</span><span class="cx"> return false;
</span><span class="cx"> const auto& shapeClip = downcast<ShapeClipPathOperation>(other);
</span><del>- return &m_shape.get() == &shapeClip.m_shape.get();
</del><ins>+ return m_shape.ptr() == shapeClip.m_shape.ptr();
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> explicit ShapeClipPathOperation(PassRef<BasicShape> shape)
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderBlockcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderBlock.cpp (175582 => 175583)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderBlock.cpp 2014-11-04 22:38:56 UTC (rev 175582)
+++ trunk/Source/WebCore/rendering/RenderBlock.cpp 2014-11-04 23:00:48 UTC (rev 175583)
</span><span class="lines">@@ -2976,7 +2976,7 @@
</span><span class="cx"> return firstLineBlock;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-static RenderStyle* styleForFirstLetter(RenderObject* firstLetterBlock, RenderObject* firstLetterContainer)
</del><ins>+static RenderStyle& styleForFirstLetter(RenderObject* firstLetterBlock, RenderObject* firstLetterContainer)
</ins><span class="cx"> {
</span><span class="cx"> RenderStyle* pseudoStyle = firstLetterBlock->getCachedPseudoStyle(FIRST_LETTER, &firstLetterContainer->firstLineStyle());
</span><span class="cx">
</span><span class="lines">@@ -3021,7 +3021,7 @@
</span><span class="cx"> pseudoStyle->setDisplay(pseudoStyle->isFloating() ? BLOCK : INLINE);
</span><span class="cx"> // CSS2 says first-letter can't be positioned.
</span><span class="cx"> pseudoStyle->setPosition(StaticPosition);
</span><del>- return pseudoStyle;
</del><ins>+ return *pseudoStyle;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> // CSS 2.1 http://www.w3.org/TR/CSS21/selector.html#first-letter
</span><span class="lines">@@ -3061,16 +3061,16 @@
</span><span class="cx"> {
</span><span class="cx"> RenderElement* firstLetter = currentChild->parent();
</span><span class="cx"> RenderElement* firstLetterContainer = firstLetter->parent();
</span><del>- RenderStyle* pseudoStyle = styleForFirstLetter(firstLetterBlock, firstLetterContainer);
</del><ins>+ RenderStyle& pseudoStyle = styleForFirstLetter(firstLetterBlock, firstLetterContainer);
</ins><span class="cx"> ASSERT(firstLetter->isFloating() || firstLetter->isInline());
</span><span class="cx">
</span><del>- if (Style::determineChange(&firstLetter->style(), pseudoStyle) == Style::Detach) {
</del><ins>+ if (Style::determineChange(firstLetter->style(), pseudoStyle) == Style::Detach) {
</ins><span class="cx"> // The first-letter renderer needs to be replaced. Create a new renderer of the right type.
</span><span class="cx"> RenderBoxModelObject* newFirstLetter;
</span><del>- if (pseudoStyle->display() == INLINE)
- newFirstLetter = new RenderInline(document(), *pseudoStyle);
</del><ins>+ if (pseudoStyle.display() == INLINE)
+ newFirstLetter = new RenderInline(document(), pseudoStyle);
</ins><span class="cx"> else
</span><del>- newFirstLetter = new RenderBlockFlow(document(), *pseudoStyle);
</del><ins>+ newFirstLetter = new RenderBlockFlow(document(), pseudoStyle);
</ins><span class="cx"> newFirstLetter->initializeStyle();
</span><span class="cx">
</span><span class="cx"> // Move the first letter into the new renderer.
</span><span class="lines">@@ -3096,18 +3096,18 @@
</span><span class="cx"> firstLetter = newFirstLetter;
</span><span class="cx"> firstLetterContainer->addChild(firstLetter, nextSibling);
</span><span class="cx"> } else
</span><del>- firstLetter->setStyle(*pseudoStyle);
</del><ins>+ firstLetter->setStyle(pseudoStyle);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void RenderBlock::createFirstLetterRenderer(RenderObject* firstLetterBlock, RenderText* currentTextChild)
</span><span class="cx"> {
</span><span class="cx"> RenderElement* firstLetterContainer = currentTextChild->parent();
</span><del>- RenderStyle* pseudoStyle = styleForFirstLetter(firstLetterBlock, firstLetterContainer);
- RenderBoxModelObject* firstLetter = 0;
- if (pseudoStyle->display() == INLINE)
- firstLetter = new RenderInline(document(), *pseudoStyle);
</del><ins>+ RenderStyle& pseudoStyle = styleForFirstLetter(firstLetterBlock, firstLetterContainer);
+ RenderBoxModelObject* firstLetter = nullptr;
+ if (pseudoStyle.display() == INLINE)
+ firstLetter = new RenderInline(document(), pseudoStyle);
</ins><span class="cx"> else
</span><del>- firstLetter = new RenderBlockFlow(document(), *pseudoStyle);
</del><ins>+ firstLetter = new RenderBlockFlow(document(), pseudoStyle);
</ins><span class="cx"> firstLetter->initializeStyle();
</span><span class="cx"> firstLetterContainer->addChild(firstLetter, currentTextChild);
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderBlockFlowcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderBlockFlow.cpp (175582 => 175583)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderBlockFlow.cpp 2014-11-04 22:38:56 UTC (rev 175582)
+++ trunk/Source/WebCore/rendering/RenderBlockFlow.cpp 2014-11-04 23:00:48 UTC (rev 175583)
</span><span class="lines">@@ -3751,21 +3751,21 @@
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void RenderBlockFlow::updateColumnProgressionFromStyle(RenderStyle* style)
</del><ins>+void RenderBlockFlow::updateColumnProgressionFromStyle(RenderStyle& style)
</ins><span class="cx"> {
</span><span class="cx"> if (!multiColumnFlowThread())
</span><span class="cx"> return;
</span><span class="cx">
</span><span class="cx"> bool needsLayout = false;
</span><span class="cx"> bool oldProgressionIsInline = multiColumnFlowThread()->progressionIsInline();
</span><del>- bool newProgressionIsInline = style->hasInlineColumnAxis();
</del><ins>+ bool newProgressionIsInline = style.hasInlineColumnAxis();
</ins><span class="cx"> if (oldProgressionIsInline != newProgressionIsInline) {
</span><span class="cx"> multiColumnFlowThread()->setProgressionIsInline(newProgressionIsInline);
</span><span class="cx"> needsLayout = true;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> bool oldProgressionIsReversed = multiColumnFlowThread()->progressionIsReversed();
</span><del>- bool newProgressionIsReversed = style->columnProgression() == ReverseColumnProgression;
</del><ins>+ bool newProgressionIsReversed = style.columnProgression() == ReverseColumnProgression;
</ins><span class="cx"> if (oldProgressionIsReversed != newProgressionIsReversed) {
</span><span class="cx"> multiColumnFlowThread()->setProgressionIsReversed(newProgressionIsReversed);
</span><span class="cx"> needsLayout = true;
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderBlockFlowh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderBlockFlow.h (175582 => 175583)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderBlockFlow.h 2014-11-04 22:38:56 UTC (rev 175582)
+++ trunk/Source/WebCore/rendering/RenderBlockFlow.h 2014-11-04 23:00:48 UTC (rev 175583)
</span><span class="lines">@@ -382,7 +382,7 @@
</span><span class="cx"> void createMultiColumnFlowThread();
</span><span class="cx"> void destroyMultiColumnFlowThread();
</span><span class="cx">
</span><del>- void updateColumnProgressionFromStyle(RenderStyle*);
</del><ins>+ void updateColumnProgressionFromStyle(RenderStyle&);
</ins><span class="cx"> void updateStylesForColumnChildren();
</span><span class="cx">
</span><span class="cx"> virtual bool needsLayoutAfterRegionRangeChange() const override;
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderBoxcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderBox.cpp (175582 => 175583)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderBox.cpp 2014-11-04 22:38:56 UTC (rev 175582)
+++ trunk/Source/WebCore/rendering/RenderBox.cpp 2014-11-04 23:00:48 UTC (rev 175583)
</span><span class="lines">@@ -403,7 +403,7 @@
</span><span class="cx"> if (viewChangedWritingMode && pagination.mode != Pagination::Unpaginated) {
</span><span class="cx"> viewStyle.setColumnStylesFromPaginationMode(pagination.mode);
</span><span class="cx"> if (view().multiColumnFlowThread())
</span><del>- view().updateColumnProgressionFromStyle(&viewStyle);
</del><ins>+ view().updateColumnProgressionFromStyle(viewStyle);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> if (viewStyleChanged && view().multiColumnFlowThread())
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderElementcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderElement.cpp (175582 => 175583)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderElement.cpp 2014-11-04 22:38:56 UTC (rev 175582)
+++ trunk/Source/WebCore/rendering/RenderElement.cpp 2014-11-04 23:00:48 UTC (rev 175583)
</span><span class="lines">@@ -391,7 +391,7 @@
</span><span class="cx"> // and remove the check of m_hasInitializedStyle below too.
</span><span class="cx"> ASSERT(m_hasInitializedStyle || isRenderView());
</span><span class="cx">
</span><del>- if (&m_style.get() == &style.get()) {
</del><ins>+ if (m_style.ptr() == style.ptr()) {
</ins><span class="cx"> // FIXME: Can we change things so we never hit this code path?
</span><span class="cx"> // We need to run through adjustStyleDifference() for iframes, plugins, and canvas so
</span><span class="cx"> // style sharing is disabled for them. That should ensure that we never hit this code path.
</span><span class="lines">@@ -405,7 +405,7 @@
</span><span class="cx"> StyleDifference diff = StyleDifferenceEqual;
</span><span class="cx"> unsigned contextSensitiveProperties = ContextSensitivePropertyNone;
</span><span class="cx"> if (m_hasInitializedStyle)
</span><del>- diff = m_style->diff(&style.get(), contextSensitiveProperties);
</del><ins>+ diff = m_style->diff(style.get(), contextSensitiveProperties);
</ins><span class="cx">
</span><span class="cx"> diff = adjustStyleDifference(diff, contextSensitiveProperties);
</span><span class="cx">
</span><span class="lines">@@ -430,11 +430,11 @@
</span><span class="cx">
</span><span class="cx"> bool doesNotNeedLayout = !parent();
</span><span class="cx">
</span><del>- styleDidChange(diff, &oldStyle.get());
</del><ins>+ styleDidChange(diff, oldStyle.ptr());
</ins><span class="cx">
</span><span class="cx"> // Text renderers use their parent style. Notify them about the change.
</span><span class="cx"> for (auto& child : childrenOfType<RenderText>(*this))
</span><del>- child.styleDidChange(diff, &oldStyle.get());
</del><ins>+ child.styleDidChange(diff, oldStyle.ptr());
</ins><span class="cx">
</span><span class="cx"> // FIXME: |this| might be destroyed here. This can currently happen for a RenderTextFragment when
</span><span class="cx"> // its first-letter block gets an update in RenderTextFragment::styleDidChange. For RenderTextFragment(s),
</span><span class="lines">@@ -451,9 +451,9 @@
</span><span class="cx"> if (updatedDiff == StyleDifferenceLayout)
</span><span class="cx"> setNeedsLayoutAndPrefWidthsRecalc();
</span><span class="cx"> else if (updatedDiff == StyleDifferenceLayoutPositionedMovementOnly)
</span><del>- setNeedsPositionedMovementLayout(&oldStyle.get());
</del><ins>+ setNeedsPositionedMovementLayout(oldStyle.ptr());
</ins><span class="cx"> else if (updatedDiff == StyleDifferenceSimplifiedLayoutAndPositionedMovement) {
</span><del>- setNeedsPositionedMovementLayout(&oldStyle.get());
</del><ins>+ setNeedsPositionedMovementLayout(oldStyle.ptr());
</ins><span class="cx"> setNeedsSimplifiedNormalFlowLayout();
</span><span class="cx"> } else if (updatedDiff == StyleDifferenceSimplifiedLayout)
</span><span class="cx"> setNeedsSimplifiedNormalFlowLayout();
</span><span class="lines">@@ -969,7 +969,7 @@
</span><span class="cx"> return;
</span><span class="cx">
</span><span class="cx"> if (diff == StyleDifferenceLayout || diff == StyleDifferenceSimplifiedLayout) {
</span><del>- RenderCounter::rendererStyleChanged(*this, oldStyle, &m_style.get());
</del><ins>+ RenderCounter::rendererStyleChanged(*this, oldStyle, m_style.ptr());
</ins><span class="cx">
</span><span class="cx"> // If the object already needs layout, then setNeedsLayout won't do
</span><span class="cx"> // any work. But if the containing block has changed, then we may need
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderNamedFlowFragmentcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderNamedFlowFragment.cpp (175582 => 175583)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderNamedFlowFragment.cpp 2014-11-04 22:38:56 UTC (rev 175582)
+++ trunk/Source/WebCore/rendering/RenderNamedFlowFragment.cpp 2014-11-04 23:00:48 UTC (rev 175583)
</span><span class="lines">@@ -472,7 +472,7 @@
</span><span class="cx"> if (!shouldCacheRegionStyle) {
</span><span class="cx"> // Check whether we should cache the computed style in region.
</span><span class="cx"> unsigned changedContextSensitiveProperties = ContextSensitivePropertyNone;
</span><del>- StyleDifference styleDiff = objectOriginalStyle->diff(objectRegionStyle.get(), changedContextSensitiveProperties);
</del><ins>+ StyleDifference styleDiff = objectOriginalStyle->diff(*objectRegionStyle, changedContextSensitiveProperties);
</ins><span class="cx"> if (styleDiff < StyleDifferenceLayoutPositionedMovementOnly)
</span><span class="cx"> shouldCacheRegionStyle = true;
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderTextControlcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderTextControl.cpp (175582 => 175583)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderTextControl.cpp 2014-11-04 22:38:56 UTC (rev 175582)
+++ trunk/Source/WebCore/rendering/RenderTextControl.cpp 2014-11-04 23:00:48 UTC (rev 175583)
</span><span class="lines">@@ -73,36 +73,36 @@
</span><span class="cx"> textFormControlElement().updatePlaceholderVisibility();
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void RenderTextControl::adjustInnerTextStyle(const RenderStyle* startStyle, RenderStyle* textBlockStyle) const
</del><ins>+void RenderTextControl::adjustInnerTextStyle(const RenderStyle* startStyle, RenderStyle& textBlockStyle) const
</ins><span class="cx"> {
</span><span class="cx"> // The inner block, if present, always has its direction set to LTR,
</span><span class="cx"> // so we need to inherit the direction and unicode-bidi style from the element.
</span><del>- textBlockStyle->setDirection(style().direction());
- textBlockStyle->setUnicodeBidi(style().unicodeBidi());
</del><ins>+ textBlockStyle.setDirection(style().direction());
+ textBlockStyle.setUnicodeBidi(style().unicodeBidi());
</ins><span class="cx">
</span><span class="cx"> HTMLTextFormControlElement& control = textFormControlElement();
</span><span class="cx"> if (HTMLElement* innerText = control.innerTextElement()) {
</span><span class="cx"> if (const StyleProperties* properties = innerText->presentationAttributeStyle()) {
</span><span class="cx"> RefPtr<CSSValue> value = properties->getPropertyCSSValue(CSSPropertyWebkitUserModify);
</span><span class="cx"> if (is<CSSPrimitiveValue>(value.get()))
</span><del>- textBlockStyle->setUserModify(downcast<CSSPrimitiveValue>(*value));
</del><ins>+ textBlockStyle.setUserModify(downcast<CSSPrimitiveValue>(*value));
</ins><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> if (control.isDisabledFormControl())
</span><del>- textBlockStyle->setColor(theme().disabledTextColor(textBlockStyle->visitedDependentColor(CSSPropertyColor), startStyle->visitedDependentColor(CSSPropertyBackgroundColor)));
</del><ins>+ textBlockStyle.setColor(theme().disabledTextColor(textBlockStyle.visitedDependentColor(CSSPropertyColor), startStyle->visitedDependentColor(CSSPropertyBackgroundColor)));
</ins><span class="cx"> #if PLATFORM(IOS)
</span><del>- if (textBlockStyle->textSecurity() != TSNONE && !textBlockStyle->isLeftToRightDirection()) {
</del><ins>+ if (textBlockStyle.textSecurity() != TSNONE && !textBlockStyle.isLeftToRightDirection()) {
</ins><span class="cx"> // Preserve the alignment but force the direction to LTR so that the last-typed, unmasked character
</span><span class="cx"> // (which cannot have RTL directionality) will appear to the right of the masked characters. See <rdar://problem/7024375>.
</span><span class="cx">
</span><del>- switch (textBlockStyle->textAlign()) {
</del><ins>+ switch (textBlockStyle.textAlign()) {
</ins><span class="cx"> case TASTART:
</span><span class="cx"> case JUSTIFY:
</span><del>- textBlockStyle->setTextAlign(RIGHT);
</del><ins>+ textBlockStyle.setTextAlign(RIGHT);
</ins><span class="cx"> break;
</span><span class="cx"> case TAEND:
</span><del>- textBlockStyle->setTextAlign(LEFT);
</del><ins>+ textBlockStyle.setTextAlign(LEFT);
</ins><span class="cx"> break;
</span><span class="cx"> case LEFT:
</span><span class="cx"> case RIGHT:
</span><span class="lines">@@ -113,7 +113,7 @@
</span><span class="cx"> break;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- textBlockStyle->setDirection(LTR);
</del><ins>+ textBlockStyle.setDirection(LTR);
</ins><span class="cx"> }
</span><span class="cx"> #endif
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderTextControlh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderTextControl.h (175582 => 175583)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderTextControl.h 2014-11-04 22:38:56 UTC (rev 175582)
+++ trunk/Source/WebCore/rendering/RenderTextControl.h 2014-11-04 23:00:48 UTC (rev 175583)
</span><span class="lines">@@ -51,7 +51,7 @@
</span><span class="cx"> TextControlInnerTextElement* innerTextElement() const;
</span><span class="cx">
</span><span class="cx"> int scrollbarThickness() const;
</span><del>- void adjustInnerTextStyle(const RenderStyle* startStyle, RenderStyle* textBlockStyle) const;
</del><ins>+ void adjustInnerTextStyle(const RenderStyle* startStyle, RenderStyle& textBlockStyle) const;
</ins><span class="cx">
</span><span class="cx"> virtual void styleDidChange(StyleDifference, const RenderStyle* oldStyle) override;
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderTextControlMultiLinecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderTextControlMultiLine.cpp (175582 => 175583)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderTextControlMultiLine.cpp 2014-11-04 22:38:56 UTC (rev 175582)
+++ trunk/Source/WebCore/rendering/RenderTextControlMultiLine.cpp 2014-11-04 23:00:48 UTC (rev 175583)
</span><span class="lines">@@ -91,7 +91,7 @@
</span><span class="cx"> {
</span><span class="cx"> auto textBlockStyle = RenderStyle::create();
</span><span class="cx"> textBlockStyle.get().inheritFrom(startStyle);
</span><del>- adjustInnerTextStyle(startStyle, &textBlockStyle.get());
</del><ins>+ adjustInnerTextStyle(startStyle, textBlockStyle.get());
</ins><span class="cx"> textBlockStyle.get().setDisplay(BLOCK);
</span><span class="cx">
</span><span class="cx"> #if PLATFORM(IOS)
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderTextControlSingleLinecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderTextControlSingleLine.cpp (175582 => 175583)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderTextControlSingleLine.cpp 2014-11-04 22:38:56 UTC (rev 175582)
+++ trunk/Source/WebCore/rendering/RenderTextControlSingleLine.cpp 2014-11-04 23:00:48 UTC (rev 175583)
</span><span class="lines">@@ -368,7 +368,7 @@
</span><span class="cx"> {
</span><span class="cx"> auto textBlockStyle = RenderStyle::create();
</span><span class="cx"> textBlockStyle.get().inheritFrom(startStyle);
</span><del>- adjustInnerTextStyle(startStyle, &textBlockStyle.get());
</del><ins>+ adjustInnerTextStyle(startStyle, textBlockStyle.get());
</ins><span class="cx">
</span><span class="cx"> textBlockStyle.get().setWhiteSpace(PRE);
</span><span class="cx"> textBlockStyle.get().setOverflowWrap(NormalOverflowWrap);
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingstyleDataRefh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/style/DataRef.h (175582 => 175583)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/style/DataRef.h 2014-11-04 22:38:56 UTC (rev 175582)
+++ trunk/Source/WebCore/rendering/style/DataRef.h 2014-11-04 23:00:48 UTC (rev 175583)
</span><span class="lines">@@ -35,7 +35,7 @@
</span><span class="cx"> DataRef(const DataRef& other) : m_data(const_cast<T&>(other.m_data.get())) { }
</span><span class="cx"> DataRef& operator=(const DataRef& other) { m_data = const_cast<T&>(other.m_data.get()); return *this; }
</span><span class="cx">
</span><del>- const T* get() const { return &m_data.get(); }
</del><ins>+ const T* get() const { return m_data.ptr(); }
</ins><span class="cx">
</span><span class="cx"> const T& operator*() const { return *get(); }
</span><span class="cx"> const T* operator->() const { return get(); }
</span><span class="lines">@@ -44,17 +44,17 @@
</span><span class="cx"> {
</span><span class="cx"> if (!m_data->hasOneRef())
</span><span class="cx"> m_data = m_data->copy();
</span><del>- return &m_data.get();
</del><ins>+ return m_data.ptr();
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> bool operator==(const DataRef<T>& o) const
</span><span class="cx"> {
</span><del>- return &m_data.get() == &o.m_data.get() || m_data.get() == o.m_data.get();
</del><ins>+ return m_data.ptr() == o.m_data.ptr() || m_data.get() == o.m_data.get();
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> bool operator!=(const DataRef<T>& o) const
</span><span class="cx"> {
</span><del>- return &m_data.get() != &o.m_data.get() && m_data.get() != o.m_data.get();
</del><ins>+ return m_data.ptr() != o.m_data.ptr() && m_data.get() != o.m_data.get();
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> private:
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingstyleRenderStylecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/style/RenderStyle.cpp (175582 => 175583)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/style/RenderStyle.cpp 2014-11-04 22:38:56 UTC (rev 175582)
+++ trunk/Source/WebCore/rendering/style/RenderStyle.cpp 2014-11-04 23:00:48 UTC (rev 175583)
</span><span class="lines">@@ -406,227 +406,227 @@
</span><span class="cx"> return false;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-bool RenderStyle::changeRequiresLayout(const RenderStyle* other, unsigned& changedContextSensitiveProperties) const
</del><ins>+bool RenderStyle::changeRequiresLayout(const RenderStyle& other, unsigned& changedContextSensitiveProperties) const
</ins><span class="cx"> {
</span><del>- if (m_box->width() != other->m_box->width()
- || m_box->minWidth() != other->m_box->minWidth()
- || m_box->maxWidth() != other->m_box->maxWidth()
- || m_box->height() != other->m_box->height()
- || m_box->minHeight() != other->m_box->minHeight()
- || m_box->maxHeight() != other->m_box->maxHeight())
</del><ins>+ if (m_box->width() != other.m_box->width()
+ || m_box->minWidth() != other.m_box->minWidth()
+ || m_box->maxWidth() != other.m_box->maxWidth()
+ || m_box->height() != other.m_box->height()
+ || m_box->minHeight() != other.m_box->minHeight()
+ || m_box->maxHeight() != other.m_box->maxHeight())
</ins><span class="cx"> return true;
</span><span class="cx">
</span><del>- if (m_box->verticalAlign() != other->m_box->verticalAlign() || noninherited_flags.verticalAlign() != other->noninherited_flags.verticalAlign())
</del><ins>+ if (m_box->verticalAlign() != other.m_box->verticalAlign() || noninherited_flags.verticalAlign() != other.noninherited_flags.verticalAlign())
</ins><span class="cx"> return true;
</span><span class="cx">
</span><del>- if (m_box->boxSizing() != other->m_box->boxSizing())
</del><ins>+ if (m_box->boxSizing() != other.m_box->boxSizing())
</ins><span class="cx"> return true;
</span><span class="cx">
</span><del>- if (surround->margin != other->surround->margin)
</del><ins>+ if (surround->margin != other.surround->margin)
</ins><span class="cx"> return true;
</span><span class="cx">
</span><del>- if (surround->padding != other->surround->padding)
</del><ins>+ if (surround->padding != other.surround->padding)
</ins><span class="cx"> return true;
</span><span class="cx">
</span><span class="cx"> // FIXME: We should add an optimized form of layout that just recomputes visual overflow.
</span><del>- if (changeAffectsVisualOverflow(*other))
</del><ins>+ if (changeAffectsVisualOverflow(other))
</ins><span class="cx"> return true;
</span><span class="cx">
</span><del>- if (rareNonInheritedData.get() != other->rareNonInheritedData.get()) {
- if (rareNonInheritedData->m_appearance != other->rareNonInheritedData->m_appearance
- || rareNonInheritedData->marginBeforeCollapse != other->rareNonInheritedData->marginBeforeCollapse
- || rareNonInheritedData->marginAfterCollapse != other->rareNonInheritedData->marginAfterCollapse
- || rareNonInheritedData->lineClamp != other->rareNonInheritedData->lineClamp
- || rareNonInheritedData->m_initialLetter != other->rareNonInheritedData->m_initialLetter
- || rareNonInheritedData->textOverflow != other->rareNonInheritedData->textOverflow)
</del><ins>+ if (rareNonInheritedData.get() != other.rareNonInheritedData.get()) {
+ if (rareNonInheritedData->m_appearance != other.rareNonInheritedData->m_appearance
+ || rareNonInheritedData->marginBeforeCollapse != other.rareNonInheritedData->marginBeforeCollapse
+ || rareNonInheritedData->marginAfterCollapse != other.rareNonInheritedData->marginAfterCollapse
+ || rareNonInheritedData->lineClamp != other.rareNonInheritedData->lineClamp
+ || rareNonInheritedData->m_initialLetter != other.rareNonInheritedData->m_initialLetter
+ || rareNonInheritedData->textOverflow != other.rareNonInheritedData->textOverflow)
</ins><span class="cx"> return true;
</span><span class="cx">
</span><del>- if (rareNonInheritedData->m_regionFragment != other->rareNonInheritedData->m_regionFragment)
</del><ins>+ if (rareNonInheritedData->m_regionFragment != other.rareNonInheritedData->m_regionFragment)
</ins><span class="cx"> return true;
</span><span class="cx">
</span><span class="cx"> #if ENABLE(CSS_SHAPES)
</span><del>- if (rareNonInheritedData->m_shapeMargin != other->rareNonInheritedData->m_shapeMargin)
</del><ins>+ if (rareNonInheritedData->m_shapeMargin != other.rareNonInheritedData->m_shapeMargin)
</ins><span class="cx"> return true;
</span><span class="cx"> #endif
</span><span class="cx">
</span><del>- if (rareNonInheritedData->m_deprecatedFlexibleBox.get() != other->rareNonInheritedData->m_deprecatedFlexibleBox.get()
- && *rareNonInheritedData->m_deprecatedFlexibleBox.get() != *other->rareNonInheritedData->m_deprecatedFlexibleBox.get())
</del><ins>+ if (rareNonInheritedData->m_deprecatedFlexibleBox.get() != other.rareNonInheritedData->m_deprecatedFlexibleBox.get()
+ && *rareNonInheritedData->m_deprecatedFlexibleBox.get() != *other.rareNonInheritedData->m_deprecatedFlexibleBox.get())
</ins><span class="cx"> return true;
</span><span class="cx">
</span><del>- if (rareNonInheritedData->m_flexibleBox.get() != other->rareNonInheritedData->m_flexibleBox.get()
- && *rareNonInheritedData->m_flexibleBox.get() != *other->rareNonInheritedData->m_flexibleBox.get())
</del><ins>+ if (rareNonInheritedData->m_flexibleBox.get() != other.rareNonInheritedData->m_flexibleBox.get()
+ && *rareNonInheritedData->m_flexibleBox.get() != *other.rareNonInheritedData->m_flexibleBox.get())
</ins><span class="cx"> return true;
</span><del>- if (rareNonInheritedData->m_order != other->rareNonInheritedData->m_order
- || rareNonInheritedData->m_alignContent != other->rareNonInheritedData->m_alignContent
- || rareNonInheritedData->m_alignItems != other->rareNonInheritedData->m_alignItems
- || rareNonInheritedData->m_alignSelf != other->rareNonInheritedData->m_alignSelf
- || rareNonInheritedData->m_justifyContent != other->rareNonInheritedData->m_justifyContent)
</del><ins>+ if (rareNonInheritedData->m_order != other.rareNonInheritedData->m_order
+ || rareNonInheritedData->m_alignContent != other.rareNonInheritedData->m_alignContent
+ || rareNonInheritedData->m_alignItems != other.rareNonInheritedData->m_alignItems
+ || rareNonInheritedData->m_alignSelf != other.rareNonInheritedData->m_alignSelf
+ || rareNonInheritedData->m_justifyContent != other.rareNonInheritedData->m_justifyContent)
</ins><span class="cx"> return true;
</span><span class="cx">
</span><del>- if (!rareNonInheritedData->reflectionDataEquivalent(*other->rareNonInheritedData.get()))
</del><ins>+ if (!rareNonInheritedData->reflectionDataEquivalent(*other.rareNonInheritedData.get()))
</ins><span class="cx"> return true;
</span><span class="cx">
</span><del>- if (rareNonInheritedData->m_multiCol.get() != other->rareNonInheritedData->m_multiCol.get()
- && *rareNonInheritedData->m_multiCol.get() != *other->rareNonInheritedData->m_multiCol.get())
</del><ins>+ if (rareNonInheritedData->m_multiCol.get() != other.rareNonInheritedData->m_multiCol.get()
+ && *rareNonInheritedData->m_multiCol.get() != *other.rareNonInheritedData->m_multiCol.get())
</ins><span class="cx"> return true;
</span><span class="cx">
</span><del>- if (rareNonInheritedData->m_transform.get() != other->rareNonInheritedData->m_transform.get()
- && *rareNonInheritedData->m_transform.get() != *other->rareNonInheritedData->m_transform.get()) {
</del><ins>+ if (rareNonInheritedData->m_transform.get() != other.rareNonInheritedData->m_transform.get()
+ && *rareNonInheritedData->m_transform.get() != *other.rareNonInheritedData->m_transform.get()) {
</ins><span class="cx"> changedContextSensitiveProperties |= ContextSensitivePropertyTransform;
</span><span class="cx"> // Don't return; keep looking for another change
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> #if ENABLE(CSS_GRID_LAYOUT)
</span><del>- if (rareNonInheritedData->m_grid.get() != other->rareNonInheritedData->m_grid.get()
- || rareNonInheritedData->m_gridItem.get() != other->rareNonInheritedData->m_gridItem.get())
</del><ins>+ if (rareNonInheritedData->m_grid.get() != other.rareNonInheritedData->m_grid.get()
+ || rareNonInheritedData->m_gridItem.get() != other.rareNonInheritedData->m_gridItem.get())
</ins><span class="cx"> return true;
</span><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> #if ENABLE(DASHBOARD_SUPPORT)
</span><span class="cx"> // If regions change, trigger a relayout to re-calc regions.
</span><del>- if (rareNonInheritedData->m_dashboardRegions != other->rareNonInheritedData->m_dashboardRegions)
</del><ins>+ if (rareNonInheritedData->m_dashboardRegions != other.rareNonInheritedData->m_dashboardRegions)
</ins><span class="cx"> return true;
</span><span class="cx"> #endif
</span><span class="cx"> }
</span><span class="cx">
</span><del>- if (rareInheritedData.get() != other->rareInheritedData.get()) {
- if (rareInheritedData->indent != other->rareInheritedData->indent
</del><ins>+ if (rareInheritedData.get() != other.rareInheritedData.get()) {
+ if (rareInheritedData->indent != other.rareInheritedData->indent
</ins><span class="cx"> #if ENABLE(CSS3_TEXT)
</span><del>- || rareInheritedData->m_textAlignLast != other->rareInheritedData->m_textAlignLast
- || rareInheritedData->m_textJustify != other->rareInheritedData->m_textJustify
- || rareInheritedData->m_textIndentLine != other->rareInheritedData->m_textIndentLine
</del><ins>+ || rareInheritedData->m_textAlignLast != other.rareInheritedData->m_textAlignLast
+ || rareInheritedData->m_textJustify != other.rareInheritedData->m_textJustify
+ || rareInheritedData->m_textIndentLine != other.rareInheritedData->m_textIndentLine
</ins><span class="cx"> #endif
</span><del>- || rareInheritedData->m_effectiveZoom != other->rareInheritedData->m_effectiveZoom
</del><ins>+ || rareInheritedData->m_effectiveZoom != other.rareInheritedData->m_effectiveZoom
</ins><span class="cx"> #if ENABLE(IOS_TEXT_AUTOSIZING)
</span><del>- || rareInheritedData->textSizeAdjust != other->rareInheritedData->textSizeAdjust
</del><ins>+ || rareInheritedData->textSizeAdjust != other.rareInheritedData->textSizeAdjust
</ins><span class="cx"> #endif
</span><del>- || rareInheritedData->wordBreak != other->rareInheritedData->wordBreak
- || rareInheritedData->overflowWrap != other->rareInheritedData->overflowWrap
- || rareInheritedData->nbspMode != other->rareInheritedData->nbspMode
- || rareInheritedData->lineBreak != other->rareInheritedData->lineBreak
- || rareInheritedData->textSecurity != other->rareInheritedData->textSecurity
- || rareInheritedData->hyphens != other->rareInheritedData->hyphens
- || rareInheritedData->hyphenationLimitBefore != other->rareInheritedData->hyphenationLimitBefore
- || rareInheritedData->hyphenationLimitAfter != other->rareInheritedData->hyphenationLimitAfter
- || rareInheritedData->hyphenationString != other->rareInheritedData->hyphenationString
- || rareInheritedData->locale != other->rareInheritedData->locale
- || rareInheritedData->m_rubyPosition != other->rareInheritedData->m_rubyPosition
- || rareInheritedData->textEmphasisMark != other->rareInheritedData->textEmphasisMark
- || rareInheritedData->textEmphasisPosition != other->rareInheritedData->textEmphasisPosition
- || rareInheritedData->textEmphasisCustomMark != other->rareInheritedData->textEmphasisCustomMark
- || rareInheritedData->m_textOrientation != other->rareInheritedData->m_textOrientation
- || rareInheritedData->m_tabSize != other->rareInheritedData->m_tabSize
- || rareInheritedData->m_lineBoxContain != other->rareInheritedData->m_lineBoxContain
- || rareInheritedData->m_lineGrid != other->rareInheritedData->m_lineGrid
</del><ins>+ || rareInheritedData->wordBreak != other.rareInheritedData->wordBreak
+ || rareInheritedData->overflowWrap != other.rareInheritedData->overflowWrap
+ || rareInheritedData->nbspMode != other.rareInheritedData->nbspMode
+ || rareInheritedData->lineBreak != other.rareInheritedData->lineBreak
+ || rareInheritedData->textSecurity != other.rareInheritedData->textSecurity
+ || rareInheritedData->hyphens != other.rareInheritedData->hyphens
+ || rareInheritedData->hyphenationLimitBefore != other.rareInheritedData->hyphenationLimitBefore
+ || rareInheritedData->hyphenationLimitAfter != other.rareInheritedData->hyphenationLimitAfter
+ || rareInheritedData->hyphenationString != other.rareInheritedData->hyphenationString
+ || rareInheritedData->locale != other.rareInheritedData->locale
+ || rareInheritedData->m_rubyPosition != other.rareInheritedData->m_rubyPosition
+ || rareInheritedData->textEmphasisMark != other.rareInheritedData->textEmphasisMark
+ || rareInheritedData->textEmphasisPosition != other.rareInheritedData->textEmphasisPosition
+ || rareInheritedData->textEmphasisCustomMark != other.rareInheritedData->textEmphasisCustomMark
+ || rareInheritedData->m_textOrientation != other.rareInheritedData->m_textOrientation
+ || rareInheritedData->m_tabSize != other.rareInheritedData->m_tabSize
+ || rareInheritedData->m_lineBoxContain != other.rareInheritedData->m_lineBoxContain
+ || rareInheritedData->m_lineGrid != other.rareInheritedData->m_lineGrid
</ins><span class="cx"> #if ENABLE(CSS_IMAGE_ORIENTATION)
</span><del>- || rareInheritedData->m_imageOrientation != other->rareInheritedData->m_imageOrientation
</del><ins>+ || rareInheritedData->m_imageOrientation != other.rareInheritedData->m_imageOrientation
</ins><span class="cx"> #endif
</span><span class="cx"> #if ENABLE(CSS_IMAGE_RESOLUTION)
</span><del>- || rareInheritedData->m_imageResolutionSource != other->rareInheritedData->m_imageResolutionSource
- || rareInheritedData->m_imageResolutionSnap != other->rareInheritedData->m_imageResolutionSnap
- || rareInheritedData->m_imageResolution != other->rareInheritedData->m_imageResolution
</del><ins>+ || rareInheritedData->m_imageResolutionSource != other.rareInheritedData->m_imageResolutionSource
+ || rareInheritedData->m_imageResolutionSnap != other.rareInheritedData->m_imageResolutionSnap
+ || rareInheritedData->m_imageResolution != other.rareInheritedData->m_imageResolution
</ins><span class="cx"> #endif
</span><del>- || rareInheritedData->m_lineSnap != other->rareInheritedData->m_lineSnap
- || rareInheritedData->m_lineAlign != other->rareInheritedData->m_lineAlign
</del><ins>+ || rareInheritedData->m_lineSnap != other.rareInheritedData->m_lineSnap
+ || rareInheritedData->m_lineAlign != other.rareInheritedData->m_lineAlign
</ins><span class="cx"> #if ENABLE(ACCELERATED_OVERFLOW_SCROLLING)
</span><del>- || rareInheritedData->useTouchOverflowScrolling != other->rareInheritedData->useTouchOverflowScrolling
</del><ins>+ || rareInheritedData->useTouchOverflowScrolling != other.rareInheritedData->useTouchOverflowScrolling
</ins><span class="cx"> #endif
</span><del>- || rareInheritedData->listStyleImage != other->rareInheritedData->listStyleImage)
</del><ins>+ || rareInheritedData->listStyleImage != other.rareInheritedData->listStyleImage)
</ins><span class="cx"> return true;
</span><span class="cx">
</span><del>- if (!rareInheritedData->shadowDataEquivalent(*other->rareInheritedData.get()))
</del><ins>+ if (!rareInheritedData->shadowDataEquivalent(*other.rareInheritedData.get()))
</ins><span class="cx"> return true;
</span><span class="cx">
</span><del>- if (textStrokeWidth() != other->textStrokeWidth())
</del><ins>+ if (textStrokeWidth() != other.textStrokeWidth())
</ins><span class="cx"> return true;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> #if ENABLE(TEXT_AUTOSIZING)
</span><del>- if (visual->m_textAutosizingMultiplier != other->visual->m_textAutosizingMultiplier)
</del><ins>+ if (visual->m_textAutosizingMultiplier != other.visual->m_textAutosizingMultiplier)
</ins><span class="cx"> return true;
</span><span class="cx"> #endif
</span><span class="cx">
</span><del>- if (inherited->line_height != other->inherited->line_height
</del><ins>+ if (inherited->line_height != other.inherited->line_height
</ins><span class="cx"> #if ENABLE(IOS_TEXT_AUTOSIZING)
</span><del>- || inherited->specifiedLineHeight != other->inherited->specifiedLineHeight
</del><ins>+ || inherited->specifiedLineHeight != other.inherited->specifiedLineHeight
</ins><span class="cx"> #endif
</span><del>- || inherited->font != other->inherited->font
- || inherited->horizontal_border_spacing != other->inherited->horizontal_border_spacing
- || inherited->vertical_border_spacing != other->inherited->vertical_border_spacing
- || inherited_flags._box_direction != other->inherited_flags._box_direction
- || inherited_flags.m_rtlOrdering != other->inherited_flags.m_rtlOrdering
- || noninherited_flags.position() != other->noninherited_flags.position()
- || noninherited_flags.floating() != other->noninherited_flags.floating()
- || noninherited_flags.originalDisplay() != other->noninherited_flags.originalDisplay())
</del><ins>+ || inherited->font != other.inherited->font
+ || inherited->horizontal_border_spacing != other.inherited->horizontal_border_spacing
+ || inherited->vertical_border_spacing != other.inherited->vertical_border_spacing
+ || inherited_flags._box_direction != other.inherited_flags._box_direction
+ || inherited_flags.m_rtlOrdering != other.inherited_flags.m_rtlOrdering
+ || noninherited_flags.position() != other.noninherited_flags.position()
+ || noninherited_flags.floating() != other.noninherited_flags.floating()
+ || noninherited_flags.originalDisplay() != other.noninherited_flags.originalDisplay())
</ins><span class="cx"> return true;
</span><span class="cx">
</span><span class="cx">
</span><span class="cx"> if ((noninherited_flags.effectiveDisplay()) >= TABLE) {
</span><del>- if (inherited_flags._border_collapse != other->inherited_flags._border_collapse
- || inherited_flags._empty_cells != other->inherited_flags._empty_cells
- || inherited_flags._caption_side != other->inherited_flags._caption_side
- || noninherited_flags.tableLayout() != other->noninherited_flags.tableLayout())
</del><ins>+ if (inherited_flags._border_collapse != other.inherited_flags._border_collapse
+ || inherited_flags._empty_cells != other.inherited_flags._empty_cells
+ || inherited_flags._caption_side != other.inherited_flags._caption_side
+ || noninherited_flags.tableLayout() != other.noninherited_flags.tableLayout())
</ins><span class="cx"> return true;
</span><span class="cx">
</span><span class="cx"> // In the collapsing border model, 'hidden' suppresses other borders, while 'none'
</span><span class="cx"> // does not, so these style differences can be width differences.
</span><span class="cx"> if (inherited_flags._border_collapse
</span><del>- && ((borderTopStyle() == BHIDDEN && other->borderTopStyle() == BNONE)
- || (borderTopStyle() == BNONE && other->borderTopStyle() == BHIDDEN)
- || (borderBottomStyle() == BHIDDEN && other->borderBottomStyle() == BNONE)
- || (borderBottomStyle() == BNONE && other->borderBottomStyle() == BHIDDEN)
- || (borderLeftStyle() == BHIDDEN && other->borderLeftStyle() == BNONE)
- || (borderLeftStyle() == BNONE && other->borderLeftStyle() == BHIDDEN)
- || (borderRightStyle() == BHIDDEN && other->borderRightStyle() == BNONE)
- || (borderRightStyle() == BNONE && other->borderRightStyle() == BHIDDEN)))
</del><ins>+ && ((borderTopStyle() == BHIDDEN && other.borderTopStyle() == BNONE)
+ || (borderTopStyle() == BNONE && other.borderTopStyle() == BHIDDEN)
+ || (borderBottomStyle() == BHIDDEN && other.borderBottomStyle() == BNONE)
+ || (borderBottomStyle() == BNONE && other.borderBottomStyle() == BHIDDEN)
+ || (borderLeftStyle() == BHIDDEN && other.borderLeftStyle() == BNONE)
+ || (borderLeftStyle() == BNONE && other.borderLeftStyle() == BHIDDEN)
+ || (borderRightStyle() == BHIDDEN && other.borderRightStyle() == BNONE)
+ || (borderRightStyle() == BNONE && other.borderRightStyle() == BHIDDEN)))
</ins><span class="cx"> return true;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> if (noninherited_flags.effectiveDisplay() == LIST_ITEM) {
</span><del>- if (inherited_flags._list_style_type != other->inherited_flags._list_style_type
- || inherited_flags._list_style_position != other->inherited_flags._list_style_position)
</del><ins>+ if (inherited_flags._list_style_type != other.inherited_flags._list_style_type
+ || inherited_flags._list_style_position != other.inherited_flags._list_style_position)
</ins><span class="cx"> return true;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- if (inherited_flags._text_align != other->inherited_flags._text_align
- || inherited_flags._text_transform != other->inherited_flags._text_transform
- || inherited_flags._direction != other->inherited_flags._direction
- || inherited_flags._white_space != other->inherited_flags._white_space
- || noninherited_flags.clear() != other->noninherited_flags.clear()
- || noninherited_flags.unicodeBidi() != other->noninherited_flags.unicodeBidi())
</del><ins>+ if (inherited_flags._text_align != other.inherited_flags._text_align
+ || inherited_flags._text_transform != other.inherited_flags._text_transform
+ || inherited_flags._direction != other.inherited_flags._direction
+ || inherited_flags._white_space != other.inherited_flags._white_space
+ || noninherited_flags.clear() != other.noninherited_flags.clear()
+ || noninherited_flags.unicodeBidi() != other.noninherited_flags.unicodeBidi())
</ins><span class="cx"> return true;
</span><span class="cx">
</span><span class="cx"> // Check block flow direction.
</span><del>- if (inherited_flags.m_writingMode != other->inherited_flags.m_writingMode)
</del><ins>+ if (inherited_flags.m_writingMode != other.inherited_flags.m_writingMode)
</ins><span class="cx"> return true;
</span><span class="cx">
</span><span class="cx"> // Check text combine mode.
</span><del>- if (rareNonInheritedData->m_textCombine != other->rareNonInheritedData->m_textCombine)
</del><ins>+ if (rareNonInheritedData->m_textCombine != other.rareNonInheritedData->m_textCombine)
</ins><span class="cx"> return true;
</span><span class="cx">
</span><span class="cx"> // Overflow returns a layout hint.
</span><del>- if (noninherited_flags.overflowX() != other->noninherited_flags.overflowX()
- || noninherited_flags.overflowY() != other->noninherited_flags.overflowY())
</del><ins>+ if (noninherited_flags.overflowX() != other.noninherited_flags.overflowX()
+ || noninherited_flags.overflowY() != other.noninherited_flags.overflowY())
</ins><span class="cx"> return true;
</span><span class="cx">
</span><span class="cx"> // If our border widths change, then we need to layout. Other changes to borders
</span><span class="cx"> // only necessitate a repaint.
</span><del>- if (borderLeftWidth() != other->borderLeftWidth()
- || borderTopWidth() != other->borderTopWidth()
- || borderBottomWidth() != other->borderBottomWidth()
- || borderRightWidth() != other->borderRightWidth())
</del><ins>+ if (borderLeftWidth() != other.borderLeftWidth()
+ || borderTopWidth() != other.borderTopWidth()
+ || borderBottomWidth() != other.borderBottomWidth()
+ || borderRightWidth() != other.borderRightWidth())
</ins><span class="cx"> return true;
</span><span class="cx">
</span><span class="cx"> // If the counter directives change, trigger a relayout to re-calculate counter values and rebuild the counter node tree.
</span><span class="cx"> const CounterDirectiveMap* mapA = rareNonInheritedData->m_counterDirectives.get();
</span><del>- const CounterDirectiveMap* mapB = other->rareNonInheritedData->m_counterDirectives.get();
</del><ins>+ const CounterDirectiveMap* mapB = other.rareNonInheritedData->m_counterDirectives.get();
</ins><span class="cx"> if (!(mapA == mapB || (mapA && mapB && *mapA == *mapB)))
</span><span class="cx"> return true;
</span><span class="cx">
</span><del>- if ((visibility() == COLLAPSE) != (other->visibility() == COLLAPSE))
</del><ins>+ if ((visibility() == COLLAPSE) != (other.visibility() == COLLAPSE))
</ins><span class="cx"> return true;
</span><span class="cx">
</span><del>- if (rareNonInheritedData->hasOpacity() != other->rareNonInheritedData->hasOpacity()) {
</del><ins>+ if (rareNonInheritedData->hasOpacity() != other.rareNonInheritedData->hasOpacity()) {
</ins><span class="cx"> // FIXME: We would like to use SimplifiedLayout here, but we can't quite do that yet.
</span><span class="cx"> // We need to make sure SimplifiedLayout can operate correctly on RenderInlines (we will need
</span><span class="cx"> // to add a selfNeedsSimplifiedLayout bit in order to not get confused and taint every line).
</span><span class="lines">@@ -635,16 +635,16 @@
</span><span class="cx"> return true;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- if (rareNonInheritedData->hasFilters() != other->rareNonInheritedData->hasFilters())
</del><ins>+ if (rareNonInheritedData->hasFilters() != other.rareNonInheritedData->hasFilters())
</ins><span class="cx"> return true;
</span><span class="cx">
</span><span class="cx"> const QuotesData* quotesDataA = rareInheritedData->quotes.get();
</span><del>- const QuotesData* quotesDataB = other->rareInheritedData->quotes.get();
</del><ins>+ const QuotesData* quotesDataB = other.rareInheritedData->quotes.get();
</ins><span class="cx"> if (!(quotesDataA == quotesDataB || (quotesDataA && quotesDataB && *quotesDataA == *quotesDataB)))
</span><span class="cx"> return true;
</span><span class="cx">
</span><span class="cx"> if (position() != StaticPosition) {
</span><del>- if (surround->offset != other->surround->offset) {
</del><ins>+ if (surround->offset != other.surround->offset) {
</ins><span class="cx"> // FIXME: We would like to use SimplifiedLayout for relative positioning, but we can't quite do that yet.
</span><span class="cx"> // We need to make sure SimplifiedLayout can operate correctly on RenderInlines (we will need
</span><span class="cx"> // to add a selfNeedsSimplifiedLayout bit in order to not get confused and taint every line).
</span><span class="lines">@@ -652,7 +652,7 @@
</span><span class="cx"> return true;
</span><span class="cx">
</span><span class="cx"> // Optimize for the case where a positioned layer is moving but not changing size.
</span><del>- if (!positionChangeIsMovementOnly(surround->offset, other->surround->offset, m_box->width()))
</del><ins>+ if (!positionChangeIsMovementOnly(surround->offset, other.surround->offset, m_box->width()))
</ins><span class="cx"> return true;
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="lines">@@ -660,121 +660,121 @@
</span><span class="cx"> return false;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-bool RenderStyle::changeRequiresPositionedLayoutOnly(const RenderStyle* other, unsigned&) const
</del><ins>+bool RenderStyle::changeRequiresPositionedLayoutOnly(const RenderStyle& other, unsigned&) const
</ins><span class="cx"> {
</span><span class="cx"> if (position() == StaticPosition)
</span><span class="cx"> return false;
</span><span class="cx">
</span><del>- if (surround->offset != other->surround->offset) {
</del><ins>+ if (surround->offset != other.surround->offset) {
</ins><span class="cx"> // Optimize for the case where a positioned layer is moving but not changing size.
</span><del>- if (position() == AbsolutePosition && positionChangeIsMovementOnly(surround->offset, other->surround->offset, m_box->width()))
</del><ins>+ if (position() == AbsolutePosition && positionChangeIsMovementOnly(surround->offset, other.surround->offset, m_box->width()))
</ins><span class="cx"> return true;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> return false;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-bool RenderStyle::changeRequiresLayerRepaint(const RenderStyle* other, unsigned& changedContextSensitiveProperties) const
</del><ins>+bool RenderStyle::changeRequiresLayerRepaint(const RenderStyle& other, unsigned& changedContextSensitiveProperties) const
</ins><span class="cx"> {
</span><span class="cx"> // StyleResolver has ensured that zIndex is non-auto only if it's applicable.
</span><del>- if (m_box->zIndex() != other->m_box->zIndex() || m_box->hasAutoZIndex() != other->m_box->hasAutoZIndex())
</del><ins>+ if (m_box->zIndex() != other.m_box->zIndex() || m_box->hasAutoZIndex() != other.m_box->hasAutoZIndex())
</ins><span class="cx"> return true;
</span><span class="cx">
</span><span class="cx"> if (position() != StaticPosition) {
</span><del>- if (visual->clip != other->visual->clip || visual->hasClip != other->visual->hasClip) {
</del><ins>+ if (visual->clip != other.visual->clip || visual->hasClip != other.visual->hasClip) {
</ins><span class="cx"> changedContextSensitiveProperties |= ContextSensitivePropertyClipRect;
</span><span class="cx"> return true;
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> #if ENABLE(CSS_COMPOSITING)
</span><del>- if (rareNonInheritedData->m_effectiveBlendMode != other->rareNonInheritedData->m_effectiveBlendMode)
</del><ins>+ if (rareNonInheritedData->m_effectiveBlendMode != other.rareNonInheritedData->m_effectiveBlendMode)
</ins><span class="cx"> return true;
</span><span class="cx"> #endif
</span><span class="cx">
</span><del>- if (rareNonInheritedData->opacity != other->rareNonInheritedData->opacity) {
</del><ins>+ if (rareNonInheritedData->opacity != other.rareNonInheritedData->opacity) {
</ins><span class="cx"> changedContextSensitiveProperties |= ContextSensitivePropertyOpacity;
</span><span class="cx"> // Don't return; keep looking for another change.
</span><span class="cx"> }
</span><span class="cx">
</span><del>- if (rareNonInheritedData->m_filter.get() != other->rareNonInheritedData->m_filter.get()
- && *rareNonInheritedData->m_filter.get() != *other->rareNonInheritedData->m_filter.get()) {
</del><ins>+ if (rareNonInheritedData->m_filter.get() != other.rareNonInheritedData->m_filter.get()
+ && *rareNonInheritedData->m_filter.get() != *other.rareNonInheritedData->m_filter.get()) {
</ins><span class="cx"> changedContextSensitiveProperties |= ContextSensitivePropertyFilter;
</span><span class="cx"> // Don't return; keep looking for another change.
</span><span class="cx"> }
</span><span class="cx">
</span><del>- if (rareNonInheritedData->m_mask != other->rareNonInheritedData->m_mask
- || rareNonInheritedData->m_maskBoxImage != other->rareNonInheritedData->m_maskBoxImage)
</del><ins>+ if (rareNonInheritedData->m_mask != other.rareNonInheritedData->m_mask
+ || rareNonInheritedData->m_maskBoxImage != other.rareNonInheritedData->m_maskBoxImage)
</ins><span class="cx"> return true;
</span><span class="cx">
</span><span class="cx"> return false;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-bool RenderStyle::changeRequiresRepaint(const RenderStyle* other, unsigned&) const
</del><ins>+bool RenderStyle::changeRequiresRepaint(const RenderStyle& other, unsigned&) const
</ins><span class="cx"> {
</span><del>- if (inherited_flags._visibility != other->inherited_flags._visibility
- || inherited_flags.m_printColorAdjust != other->inherited_flags.m_printColorAdjust
- || inherited_flags._insideLink != other->inherited_flags._insideLink
- || inherited_flags._insideDefaultButton != other->inherited_flags._insideDefaultButton
- || surround->border != other->surround->border
- || !m_background->isEquivalentForPainting(*other->m_background)
- || rareInheritedData->userModify != other->rareInheritedData->userModify
- || rareInheritedData->userSelect != other->rareInheritedData->userSelect
- || rareNonInheritedData->userDrag != other->rareNonInheritedData->userDrag
- || rareNonInheritedData->m_borderFit != other->rareNonInheritedData->m_borderFit
- || rareNonInheritedData->m_objectFit != other->rareNonInheritedData->m_objectFit
- || rareInheritedData->m_imageRendering != other->rareInheritedData->m_imageRendering)
</del><ins>+ if (inherited_flags._visibility != other.inherited_flags._visibility
+ || inherited_flags.m_printColorAdjust != other.inherited_flags.m_printColorAdjust
+ || inherited_flags._insideLink != other.inherited_flags._insideLink
+ || inherited_flags._insideDefaultButton != other.inherited_flags._insideDefaultButton
+ || surround->border != other.surround->border
+ || !m_background->isEquivalentForPainting(*other.m_background)
+ || rareInheritedData->userModify != other.rareInheritedData->userModify
+ || rareInheritedData->userSelect != other.rareInheritedData->userSelect
+ || rareNonInheritedData->userDrag != other.rareNonInheritedData->userDrag
+ || rareNonInheritedData->m_borderFit != other.rareNonInheritedData->m_borderFit
+ || rareNonInheritedData->m_objectFit != other.rareNonInheritedData->m_objectFit
+ || rareInheritedData->m_imageRendering != other.rareInheritedData->m_imageRendering)
</ins><span class="cx"> return true;
</span><span class="cx">
</span><span class="cx"> #if ENABLE(CSS_SHAPES)
</span><del>- if (rareNonInheritedData->m_shapeOutside != other->rareNonInheritedData->m_shapeOutside)
</del><ins>+ if (rareNonInheritedData->m_shapeOutside != other.rareNonInheritedData->m_shapeOutside)
</ins><span class="cx"> return true;
</span><span class="cx"> #endif
</span><span class="cx">
</span><del>- if (rareNonInheritedData->m_clipPath != other->rareNonInheritedData->m_clipPath)
</del><ins>+ if (rareNonInheritedData->m_clipPath != other.rareNonInheritedData->m_clipPath)
</ins><span class="cx"> return true;
</span><span class="cx">
</span><span class="cx"> return false;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-bool RenderStyle::changeRequiresRepaintIfTextOrBorderOrOutline(const RenderStyle* other, unsigned&) const
</del><ins>+bool RenderStyle::changeRequiresRepaintIfTextOrBorderOrOutline(const RenderStyle& other, unsigned&) const
</ins><span class="cx"> {
</span><del>- if (inherited->color != other->inherited->color
- || inherited_flags._text_decorations != other->inherited_flags._text_decorations
- || visual->textDecoration != other->visual->textDecoration
- || rareNonInheritedData->m_textDecorationStyle != other->rareNonInheritedData->m_textDecorationStyle
- || rareNonInheritedData->m_textDecorationColor != other->rareNonInheritedData->m_textDecorationColor
- || rareInheritedData->m_textDecorationSkip != other->rareInheritedData->m_textDecorationSkip
- || rareInheritedData->textFillColor != other->rareInheritedData->textFillColor
- || rareInheritedData->textStrokeColor != other->rareInheritedData->textStrokeColor
- || rareInheritedData->textEmphasisColor != other->rareInheritedData->textEmphasisColor
- || rareInheritedData->textEmphasisFill != other->rareInheritedData->textEmphasisFill)
</del><ins>+ if (inherited->color != other.inherited->color
+ || inherited_flags._text_decorations != other.inherited_flags._text_decorations
+ || visual->textDecoration != other.visual->textDecoration
+ || rareNonInheritedData->m_textDecorationStyle != other.rareNonInheritedData->m_textDecorationStyle
+ || rareNonInheritedData->m_textDecorationColor != other.rareNonInheritedData->m_textDecorationColor
+ || rareInheritedData->m_textDecorationSkip != other.rareInheritedData->m_textDecorationSkip
+ || rareInheritedData->textFillColor != other.rareInheritedData->textFillColor
+ || rareInheritedData->textStrokeColor != other.rareInheritedData->textStrokeColor
+ || rareInheritedData->textEmphasisColor != other.rareInheritedData->textEmphasisColor
+ || rareInheritedData->textEmphasisFill != other.rareInheritedData->textEmphasisFill)
</ins><span class="cx"> return true;
</span><span class="cx">
</span><span class="cx"> return false;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-bool RenderStyle::changeRequiresRecompositeLayer(const RenderStyle* other, unsigned&) const
</del><ins>+bool RenderStyle::changeRequiresRecompositeLayer(const RenderStyle& other, unsigned&) const
</ins><span class="cx"> {
</span><del>- if (rareNonInheritedData.get() != other->rareNonInheritedData.get()) {
- if (rareNonInheritedData->m_transformStyle3D != other->rareNonInheritedData->m_transformStyle3D
- || rareNonInheritedData->m_backfaceVisibility != other->rareNonInheritedData->m_backfaceVisibility
- || rareNonInheritedData->m_perspective != other->rareNonInheritedData->m_perspective
- || rareNonInheritedData->m_perspectiveOriginX != other->rareNonInheritedData->m_perspectiveOriginX
- || rareNonInheritedData->m_perspectiveOriginY != other->rareNonInheritedData->m_perspectiveOriginY)
</del><ins>+ if (rareNonInheritedData.get() != other.rareNonInheritedData.get()) {
+ if (rareNonInheritedData->m_transformStyle3D != other.rareNonInheritedData->m_transformStyle3D
+ || rareNonInheritedData->m_backfaceVisibility != other.rareNonInheritedData->m_backfaceVisibility
+ || rareNonInheritedData->m_perspective != other.rareNonInheritedData->m_perspective
+ || rareNonInheritedData->m_perspectiveOriginX != other.rareNonInheritedData->m_perspectiveOriginX
+ || rareNonInheritedData->m_perspectiveOriginY != other.rareNonInheritedData->m_perspectiveOriginY)
</ins><span class="cx"> return true;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> return false;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-StyleDifference RenderStyle::diff(const RenderStyle* other, unsigned& changedContextSensitiveProperties) const
</del><ins>+StyleDifference RenderStyle::diff(const RenderStyle& other, unsigned& changedContextSensitiveProperties) const
</ins><span class="cx"> {
</span><span class="cx"> changedContextSensitiveProperties = ContextSensitivePropertyNone;
</span><span class="cx">
</span><span class="cx"> StyleDifference svgChange = StyleDifferenceEqual;
</span><del>- if (m_svgStyle != other->m_svgStyle) {
- svgChange = m_svgStyle->diff(other->m_svgStyle.get());
</del><ins>+ if (m_svgStyle != other.m_svgStyle) {
+ svgChange = m_svgStyle->diff(other.m_svgStyle.get());
</ins><span class="cx"> if (svgChange == StyleDifferenceLayout)
</span><span class="cx"> return svgChange;
</span><span class="cx"> }
</span><span class="lines">@@ -816,10 +816,10 @@
</span><span class="cx"> {
</span><span class="cx"> unsigned changedContextSensitiveProperties = 0;
</span><span class="cx">
</span><del>- if (changeRequiresRepaint(&style, changedContextSensitiveProperties))
</del><ins>+ if (changeRequiresRepaint(style, changedContextSensitiveProperties))
</ins><span class="cx"> return true;
</span><span class="cx">
</span><del>- if (isComposited && changeRequiresLayerRepaint(&style, changedContextSensitiveProperties))
</del><ins>+ if (isComposited && changeRequiresLayerRepaint(style, changedContextSensitiveProperties))
</ins><span class="cx"> return changedContextSensitiveProperties & ContextSensitivePropertyClipRect;
</span><span class="cx">
</span><span class="cx"> return false;
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingstyleRenderStyleh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/style/RenderStyle.h (175582 => 175583)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/style/RenderStyle.h 2014-11-04 22:38:56 UTC (rev 175582)
+++ trunk/Source/WebCore/rendering/style/RenderStyle.h 2014-11-04 23:00:48 UTC (rev 175583)
</span><span class="lines">@@ -1734,7 +1734,7 @@
</span><span class="cx"> bool equalForTextAutosizing(const RenderStyle *other) const;
</span><span class="cx"> #endif
</span><span class="cx">
</span><del>- StyleDifference diff(const RenderStyle*, unsigned& changedContextSensitiveProperties) const;
</del><ins>+ StyleDifference diff(const RenderStyle&, unsigned& changedContextSensitiveProperties) const;
</ins><span class="cx"> bool diffRequiresLayerRepaint(const RenderStyle&, bool isComposited) const;
</span><span class="cx">
</span><span class="cx"> bool isDisplayReplacedType() const { return isDisplayReplacedType(display()); }
</span><span class="lines">@@ -2004,12 +2004,12 @@
</span><span class="cx">
</span><span class="cx"> private:
</span><span class="cx"> bool changeAffectsVisualOverflow(const RenderStyle&) const;
</span><del>- bool changeRequiresLayout(const RenderStyle*, unsigned& changedContextSensitiveProperties) const;
- bool changeRequiresPositionedLayoutOnly(const RenderStyle*, unsigned& changedContextSensitiveProperties) const;
- bool changeRequiresLayerRepaint(const RenderStyle*, unsigned& changedContextSensitiveProperties) const;
- bool changeRequiresRepaint(const RenderStyle*, unsigned& changedContextSensitiveProperties) const;
- bool changeRequiresRepaintIfTextOrBorderOrOutline(const RenderStyle*, unsigned& changedContextSensitiveProperties) const;
- bool changeRequiresRecompositeLayer(const RenderStyle*, unsigned& changedContextSensitiveProperties) const;
</del><ins>+ bool changeRequiresLayout(const RenderStyle&, unsigned& changedContextSensitiveProperties) const;
+ bool changeRequiresPositionedLayoutOnly(const RenderStyle&, unsigned& changedContextSensitiveProperties) const;
+ bool changeRequiresLayerRepaint(const RenderStyle&, unsigned& changedContextSensitiveProperties) const;
+ bool changeRequiresRepaint(const RenderStyle&, unsigned& changedContextSensitiveProperties) const;
+ bool changeRequiresRepaintIfTextOrBorderOrOutline(const RenderStyle&, unsigned& changedContextSensitiveProperties) const;
+ bool changeRequiresRecompositeLayer(const RenderStyle&, unsigned& changedContextSensitiveProperties) const;
</ins><span class="cx">
</span><span class="cx"> void setVisitedLinkColor(const Color&);
</span><span class="cx"> void setVisitedLinkBackgroundColor(const Color& v) { SET_VAR(rareNonInheritedData, m_visitedLinkBackgroundColor, v); }
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingstyleStyleGeneratedImagecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/style/StyleGeneratedImage.cpp (175582 => 175583)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/style/StyleGeneratedImage.cpp 2014-11-04 22:38:56 UTC (rev 175582)
+++ trunk/Source/WebCore/rendering/style/StyleGeneratedImage.cpp 2014-11-04 23:00:48 UTC (rev 175583)
</span><span class="lines">@@ -39,7 +39,7 @@
</span><span class="cx">
</span><span class="cx"> PassRefPtr<CSSValue> StyleGeneratedImage::cssValue() const
</span><span class="cx"> {
</span><del>- return &const_cast<CSSImageGeneratorValue&>(m_imageGeneratorValue.get());
</del><ins>+ return const_cast<CSSImageGeneratorValue*>(m_imageGeneratorValue.ptr());
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> FloatSize StyleGeneratedImage::imageSize(const RenderElement* renderer, float multiplier) const
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingstyleStyleGeneratedImageh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/style/StyleGeneratedImage.h (175582 => 175583)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/style/StyleGeneratedImage.h 2014-11-04 22:38:56 UTC (rev 175582)
+++ trunk/Source/WebCore/rendering/style/StyleGeneratedImage.h 2014-11-04 23:00:48 UTC (rev 175583)
</span><span class="lines">@@ -41,7 +41,7 @@
</span><span class="cx"> CSSImageGeneratorValue& imageValue() { return m_imageGeneratorValue; }
</span><span class="cx">
</span><span class="cx"> private:
</span><del>- virtual WrappedImagePtr data() const override { return &m_imageGeneratorValue.get(); }
</del><ins>+ virtual WrappedImagePtr data() const override { return m_imageGeneratorValue.ptr(); }
</ins><span class="cx">
</span><span class="cx"> virtual PassRefPtr<CSSValue> cssValue() const override;
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCorestyleStyleResolveForDocumentcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/style/StyleResolveForDocument.cpp (175582 => 175583)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/style/StyleResolveForDocument.cpp 2014-11-04 22:38:56 UTC (rev 175582)
+++ trunk/Source/WebCore/style/StyleResolveForDocument.cpp 2014-11-04 23:00:48 UTC (rev 175583)
</span><span class="lines">@@ -90,7 +90,7 @@
</span><span class="cx"> documentStyle.get().setColumnStylesFromPaginationMode(pagination.mode);
</span><span class="cx"> documentStyle.get().setColumnGap(pagination.gap);
</span><span class="cx"> if (renderView.multiColumnFlowThread())
</span><del>- renderView.updateColumnProgressionFromStyle(&documentStyle.get());
</del><ins>+ renderView.updateColumnProgressionFromStyle(documentStyle.get());
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> const Settings& settings = renderView.frame().settings();
</span><span class="lines">@@ -108,7 +108,7 @@
</span><span class="cx"> int size = fontSizeForKeyword(CSSValueMedium, false, document);
</span><span class="cx"> fontDescription.setSpecifiedSize(size);
</span><span class="cx"> bool useSVGZoomRules = document.isSVGDocument();
</span><del>- fontDescription.setComputedSize(computedFontSizeFromSpecifiedSize(size, fontDescription.isAbsoluteSize(), useSVGZoomRules, &documentStyle.get(), document));
</del><ins>+ fontDescription.setComputedSize(computedFontSizeFromSpecifiedSize(size, fontDescription.isAbsoluteSize(), useSVGZoomRules, documentStyle.ptr(), document));
</ins><span class="cx">
</span><span class="cx"> FontOrientation fontOrientation;
</span><span class="cx"> NonCJKGlyphOrientation glyphOrientation;
</span><span class="lines">@@ -118,7 +118,7 @@
</span><span class="cx">
</span><span class="cx"> documentStyle.get().setFontDescription(fontDescription);
</span><span class="cx">
</span><del>- CSSFontSelector* fontSelector = document.styleResolverIfExists() ? document.styleResolverIfExists()->fontSelector() : 0;
</del><ins>+ CSSFontSelector* fontSelector = document.styleResolverIfExists() ? document.styleResolverIfExists()->fontSelector() : nullptr;
</ins><span class="cx"> documentStyle.get().font().update(fontSelector);
</span><span class="cx">
</span><span class="cx"> return documentStyle;
</span></span></pre></div>
<a id="trunkSourceWebCorestyleStyleResolveTreecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/style/StyleResolveTree.cpp (175582 => 175583)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/style/StyleResolveTree.cpp 2014-11-04 22:38:56 UTC (rev 175582)
+++ trunk/Source/WebCore/style/StyleResolveTree.cpp 2014-11-04 23:00:48 UTC (rev 175583)
</span><span class="lines">@@ -93,54 +93,52 @@
</span><span class="cx"> static void resolveTextNode(Text&, RenderTreePosition&);
</span><span class="cx"> static void resolveTree(Element&, RenderStyle& inheritedStyle, RenderTreePosition&, Change);
</span><span class="cx">
</span><del>-Change determineChange(const RenderStyle* s1, const RenderStyle* s2)
</del><ins>+Change determineChange(const RenderStyle& s1, const RenderStyle& s2)
</ins><span class="cx"> {
</span><del>- if (!s1 || !s2)
</del><ins>+ if (s1.display() != s2.display())
</ins><span class="cx"> return Detach;
</span><del>- if (s1->display() != s2->display())
</del><ins>+ if (s1.hasPseudoStyle(FIRST_LETTER) != s2.hasPseudoStyle(FIRST_LETTER))
</ins><span class="cx"> return Detach;
</span><del>- if (s1->hasPseudoStyle(FIRST_LETTER) != s2->hasPseudoStyle(FIRST_LETTER))
- return Detach;
</del><span class="cx"> // We just detach if a renderer acquires or loses a column-span, since spanning elements
</span><span class="cx"> // typically won't contain much content.
</span><del>- if (s1->columnSpan() != s2->columnSpan())
</del><ins>+ if (s1.columnSpan() != s2.columnSpan())
</ins><span class="cx"> return Detach;
</span><del>- if (!s1->contentDataEquivalent(s2))
</del><ins>+ if (!s1.contentDataEquivalent(&s2))
</ins><span class="cx"> return Detach;
</span><span class="cx"> // When text-combine property has been changed, we need to prepare a separate renderer object.
</span><span class="cx"> // When text-combine is on, we use RenderCombineText, otherwise RenderText.
</span><span class="cx"> // https://bugs.webkit.org/show_bug.cgi?id=55069
</span><del>- if (s1->hasTextCombine() != s2->hasTextCombine())
</del><ins>+ if (s1.hasTextCombine() != s2.hasTextCombine())
</ins><span class="cx"> return Detach;
</span><span class="cx"> // We need to reattach the node, so that it is moved to the correct RenderFlowThread.
</span><del>- if (s1->flowThread() != s2->flowThread())
</del><ins>+ if (s1.flowThread() != s2.flowThread())
</ins><span class="cx"> return Detach;
</span><span class="cx"> // When the region thread has changed, we need to prepare a separate render region object.
</span><del>- if (s1->regionThread() != s2->regionThread())
</del><ins>+ if (s1.regionThread() != s2.regionThread())
</ins><span class="cx"> return Detach;
</span><span class="cx"> // FIXME: Multicolumn regions not yet supported (http://dev.w3.org/csswg/css-regions/#multi-column-regions)
</span><span class="cx"> // When the node has region style and changed its multicol style, we have to prepare
</span><span class="cx"> // a separate render region object.
</span><del>- if (s1->hasFlowFrom() && (s1->specifiesColumns() != s2->specifiesColumns()))
</del><ins>+ if (s1.hasFlowFrom() && (s1.specifiesColumns() != s2.specifiesColumns()))
</ins><span class="cx"> return Detach;
</span><span class="cx">
</span><del>- if (*s1 != *s2) {
- if (s1->inheritedNotEqual(s2))
</del><ins>+ if (s1 != s2) {
+ if (s1.inheritedNotEqual(&s2))
</ins><span class="cx"> return Inherit;
</span><del>- if (s1->hasExplicitlyInheritedProperties() || s2->hasExplicitlyInheritedProperties())
</del><ins>+ if (s1.hasExplicitlyInheritedProperties() || s2.hasExplicitlyInheritedProperties())
</ins><span class="cx"> return Inherit;
</span><span class="cx">
</span><span class="cx"> return NoInherit;
</span><span class="cx"> }
</span><span class="cx"> // If the pseudoStyles have changed, we want any StyleChange that is not NoChange
</span><span class="cx"> // because setStyle will do the right thing with anything else.
</span><del>- if (s1->hasAnyPublicPseudoStyles()) {
</del><ins>+ if (s1.hasAnyPublicPseudoStyles()) {
</ins><span class="cx"> for (PseudoId pseudoId = FIRST_PUBLIC_PSEUDOID; pseudoId < FIRST_INTERNAL_PSEUDOID; pseudoId = static_cast<PseudoId>(pseudoId + 1)) {
</span><del>- if (s1->hasPseudoStyle(pseudoId)) {
- RenderStyle* ps2 = s2->getCachedPseudoStyle(pseudoId);
</del><ins>+ if (s1.hasPseudoStyle(pseudoId)) {
+ RenderStyle* ps2 = s2.getCachedPseudoStyle(pseudoId);
</ins><span class="cx"> if (!ps2)
</span><span class="cx"> return NoInherit;
</span><del>- RenderStyle* ps1 = s1->getCachedPseudoStyle(pseudoId);
</del><ins>+ RenderStyle* ps1 = s1.getCachedPseudoStyle(pseudoId);
</ins><span class="cx"> if (!ps1 || *ps1 != *ps2)
</span><span class="cx"> return NoInherit;
</span><span class="cx"> }
</span><span class="lines">@@ -750,8 +748,9 @@
</span><span class="cx">
</span><span class="cx"> Document& document = current.document();
</span><span class="cx"> if (currentStyle && current.styleChangeType() != ReconstructRenderTree) {
</span><del>- newStyle = styleForElement(current, inheritedStyle);
- localChange = determineChange(currentStyle.get(), newStyle.get());
</del><ins>+ Ref<RenderStyle> style(styleForElement(current, inheritedStyle));
+ newStyle = style.ptr();
+ localChange = determineChange(*currentStyle, style);
</ins><span class="cx"> }
</span><span class="cx"> if (localChange == Detach) {
</span><span class="cx"> if (current.renderer() || current.isNamedFlowContentNode())
</span><span class="lines">@@ -984,7 +983,7 @@
</span><span class="cx"> documentStyle.get().font().update(styleResolver->fontSelector());
</span><span class="cx"> }
</span><span class="cx">
</span><del>- Style::Change documentChange = determineChange(&documentStyle.get(), &document.renderView()->style());
</del><ins>+ Style::Change documentChange = determineChange(documentStyle.get(), document.renderView()->style());
</ins><span class="cx"> if (documentChange != NoChange)
</span><span class="cx"> document.renderView()->setStyle(WTF::move(documentStyle));
</span><span class="cx"> else
</span></span></pre></div>
<a id="trunkSourceWebCorestyleStyleResolveTreeh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/style/StyleResolveTree.h (175582 => 175583)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/style/StyleResolveTree.h 2014-11-04 22:38:56 UTC (rev 175582)
+++ trunk/Source/WebCore/style/StyleResolveTree.h 2014-11-04 23:00:48 UTC (rev 175583)
</span><span class="lines">@@ -47,7 +47,7 @@
</span><span class="cx">
</span><span class="cx"> void updateTextRendererAfterContentChange(Text&, unsigned offsetOfReplacedData, unsigned lengthOfReplacedData);
</span><span class="cx">
</span><del>-Change determineChange(const RenderStyle*, const RenderStyle*);
</del><ins>+Change determineChange(const RenderStyle&, const RenderStyle&);
</ins><span class="cx">
</span><span class="cx"> void queuePostResolutionCallback(std::function<void ()>);
</span><span class="cx"> bool postResolutionCallbacksAreSuspended();
</span></span></pre></div>
<a id="trunkSourceWebKitmacChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/mac/ChangeLog (175582 => 175583)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/mac/ChangeLog 2014-11-04 22:38:56 UTC (rev 175582)
+++ trunk/Source/WebKit/mac/ChangeLog 2014-11-04 23:00:48 UTC (rev 175583)
</span><span class="lines">@@ -1,3 +1,20 @@
</span><ins>+2014-11-04 Chris Dumez <cdumez@apple.com>
+
+ Add ptr() method to Ref class
+ https://bugs.webkit.org/show_bug.cgi?id=138361
+
+ Reviewed by Darin Adler.
+
+ Use the new Ref::ptr() method.
+
+ * WebView/WebFrame.mm:
+ (-[WebFrame _setTypingStyle:withUndoAction:]):
+ * WebView/WebHTMLView.mm:
+ (-[WebHTMLView _applyStyleToSelection:withUndoAction:]):
+ (-[WebHTMLView _changeCSSColorUsingSelector:inRange:]):
+ * WebView/WebView.mm:
+ (-[WebView applyStyle:]):
+
</ins><span class="cx"> 2014-11-04 Darin Adler <darin@apple.com>
</span><span class="cx">
</span><span class="cx"> Eliminate ResourceBuffer and use SharedBuffer directly instead
</span></span></pre></div>
<a id="trunkSourceWebKitmacWebViewWebFramemm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/mac/WebView/WebFrame.mm (175582 => 175583)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/mac/WebView/WebFrame.mm 2014-11-04 22:38:56 UTC (rev 175582)
+++ trunk/Source/WebKit/mac/WebView/WebFrame.mm 2014-11-04 23:00:48 UTC (rev 175583)
</span><span class="lines">@@ -953,7 +953,7 @@
</span><span class="cx"> return;
</span><span class="cx"> // FIXME: We shouldn't have to create a copy here.
</span><span class="cx"> Ref<MutableStyleProperties> properties(core(style)->copyProperties());
</span><del>- _private->coreFrame->editor().computeAndSetTypingStyle(&properties.get(), undoAction);
</del><ins>+ _private->coreFrame->editor().computeAndSetTypingStyle(properties.ptr(), undoAction);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> #if ENABLE(DRAG_SUPPORT)
</span></span></pre></div>
<a id="trunkSourceWebKitmacWebViewWebHTMLViewmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/mac/WebView/WebHTMLView.mm (175582 => 175583)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/mac/WebView/WebHTMLView.mm 2014-11-04 22:38:56 UTC (rev 175582)
+++ trunk/Source/WebKit/mac/WebView/WebHTMLView.mm 2014-11-04 23:00:48 UTC (rev 175583)
</span><span class="lines">@@ -4755,7 +4755,7 @@
</span><span class="cx"> if (Frame* coreFrame = core([self _frame])) {
</span><span class="cx"> // FIXME: We shouldn't have to make a copy here. We want callers of this function to work directly with StyleProperties eventually.
</span><span class="cx"> Ref<MutableStyleProperties> properties(core(style)->copyProperties());
</span><del>- coreFrame->editor().applyStyleToSelection(&properties.get(), undoAction);
</del><ins>+ coreFrame->editor().applyStyleToSelection(properties.ptr(), undoAction);
</ins><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -5065,7 +5065,7 @@
</span><span class="cx"> if (Frame* coreFrame = core([self _frame])) {
</span><span class="cx"> // FIXME: We shouldn't have to make a copy here.
</span><span class="cx"> Ref<MutableStyleProperties> properties(core(style)->copyProperties());
</span><del>- coreFrame->editor().applyStyle(&properties.get(), [self _undoActionFromColorPanelWithSelector:selector]);
</del><ins>+ coreFrame->editor().applyStyle(properties.ptr(), [self _undoActionFromColorPanelWithSelector:selector]);
</ins><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKitmacWebViewWebViewmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/mac/WebView/WebView.mm (175582 => 175583)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/mac/WebView/WebView.mm 2014-11-04 22:38:56 UTC (rev 175582)
+++ trunk/Source/WebKit/mac/WebView/WebView.mm 2014-11-04 23:00:48 UTC (rev 175583)
</span><span class="lines">@@ -7540,7 +7540,7 @@
</span><span class="cx"> if (Frame* coreFrame = core(webFrame)) {
</span><span class="cx"> // FIXME: We shouldn't have to make a copy here.
</span><span class="cx"> Ref<MutableStyleProperties> properties(core(style)->copyProperties());
</span><del>- coreFrame->editor().applyStyle(&properties.get());
</del><ins>+ coreFrame->editor().applyStyle(properties.ptr());
</ins><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/ChangeLog (175582 => 175583)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/ChangeLog 2014-11-04 22:38:56 UTC (rev 175582)
+++ trunk/Source/WebKit2/ChangeLog 2014-11-04 23:00:48 UTC (rev 175583)
</span><span class="lines">@@ -1,3 +1,22 @@
</span><ins>+2014-11-04 Chris Dumez <cdumez@apple.com>
+
+ Add ptr() method to Ref class
+ https://bugs.webkit.org/show_bug.cgi?id=138361
+
+ Reviewed by Darin Adler.
+
+ Use the new Ref::ptr() method.
+
+ * UIProcess/WebContext.cpp:
+ (WebKit::WebContext::createWebPage):
+ * UIProcess/WebPageProxy.cpp:
+ (WebKit::WebPageProxy::setPreferences):
+ * UIProcess/WebProcessProxy.cpp:
+ (WebKit::WebProcessProxy::didNavigateWithNavigationData):
+ (WebKit::WebProcessProxy::didPerformClientRedirect):
+ (WebKit::WebProcessProxy::didPerformServerRedirect):
+ (WebKit::WebProcessProxy::didUpdateHistoryTitle):
+
</ins><span class="cx"> 2014-11-04 Andy Estes <aestes@apple.com>
</span><span class="cx">
</span><span class="cx"> [iOS] Include a WKActionSheetAssistant parameter in WKActionSheetAssistantDelegate methods
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessWebContextcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/WebContext.cpp (175582 => 175583)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/WebContext.cpp 2014-11-04 22:38:56 UTC (rev 175582)
+++ trunk/Source/WebKit2/UIProcess/WebContext.cpp 2014-11-04 23:00:48 UTC (rev 175583)
</span><span class="lines">@@ -855,7 +855,7 @@
</span><span class="cx"> PassRefPtr<WebPageProxy> WebContext::createWebPage(PageClient& pageClient, WebPageConfiguration configuration)
</span><span class="cx"> {
</span><span class="cx"> if (!configuration.pageGroup)
</span><del>- configuration.pageGroup = &m_defaultPageGroup.get();
</del><ins>+ configuration.pageGroup = m_defaultPageGroup.ptr();
</ins><span class="cx"> if (!configuration.preferences)
</span><span class="cx"> configuration.preferences = &configuration.pageGroup->preferences();
</span><span class="cx"> if (!configuration.visitedLinkProvider)
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessWebPageProxycpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/WebPageProxy.cpp (175582 => 175583)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/WebPageProxy.cpp 2014-11-04 22:38:56 UTC (rev 175582)
+++ trunk/Source/WebKit2/UIProcess/WebPageProxy.cpp 2014-11-04 23:00:48 UTC (rev 175583)
</span><span class="lines">@@ -467,7 +467,7 @@
</span><span class="cx">
</span><span class="cx"> void WebPageProxy::setPreferences(WebPreferences& preferences)
</span><span class="cx"> {
</span><del>- if (&preferences == &m_preferences.get())
</del><ins>+ if (&preferences == m_preferences.ptr())
</ins><span class="cx"> return;
</span><span class="cx">
</span><span class="cx"> m_preferences->removePage(*this);
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessWebProcessProxycpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/WebProcessProxy.cpp (175582 => 175583)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/WebProcessProxy.cpp 2014-11-04 22:38:56 UTC (rev 175582)
+++ trunk/Source/WebKit2/UIProcess/WebProcessProxy.cpp 2014-11-04 23:00:48 UTC (rev 175583)
</span><span class="lines">@@ -629,7 +629,7 @@
</span><span class="cx"> MESSAGE_CHECK(frame);
</span><span class="cx"> MESSAGE_CHECK(frame->page() == page);
</span><span class="cx">
</span><del>- m_context->historyClient().didNavigateWithNavigationData(&m_context.get(), page, store, frame);
</del><ins>+ m_context->historyClient().didNavigateWithNavigationData(m_context.ptr(), page, store, frame);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void WebProcessProxy::didPerformClientRedirect(uint64_t pageID, const String& sourceURLString, const String& destinationURLString, uint64_t frameID)
</span><span class="lines">@@ -647,7 +647,7 @@
</span><span class="cx"> MESSAGE_CHECK_URL(sourceURLString);
</span><span class="cx"> MESSAGE_CHECK_URL(destinationURLString);
</span><span class="cx">
</span><del>- m_context->historyClient().didPerformClientRedirect(&m_context.get(), page, sourceURLString, destinationURLString, frame);
</del><ins>+ m_context->historyClient().didPerformClientRedirect(m_context.ptr(), page, sourceURLString, destinationURLString, frame);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void WebProcessProxy::didPerformServerRedirect(uint64_t pageID, const String& sourceURLString, const String& destinationURLString, uint64_t frameID)
</span><span class="lines">@@ -665,7 +665,7 @@
</span><span class="cx"> MESSAGE_CHECK_URL(sourceURLString);
</span><span class="cx"> MESSAGE_CHECK_URL(destinationURLString);
</span><span class="cx">
</span><del>- m_context->historyClient().didPerformServerRedirect(&m_context.get(), page, sourceURLString, destinationURLString, frame);
</del><ins>+ m_context->historyClient().didPerformServerRedirect(m_context.ptr(), page, sourceURLString, destinationURLString, frame);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void WebProcessProxy::didUpdateHistoryTitle(uint64_t pageID, const String& title, const String& url, uint64_t frameID)
</span><span class="lines">@@ -679,7 +679,7 @@
</span><span class="cx"> MESSAGE_CHECK(frame->page() == page);
</span><span class="cx"> MESSAGE_CHECK_URL(url);
</span><span class="cx">
</span><del>- m_context->historyClient().didUpdateHistoryTitle(&m_context.get(), page, title, url, frame);
</del><ins>+ m_context->historyClient().didUpdateHistoryTitle(m_context.ptr(), page, title, url, frame);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void WebProcessProxy::pageSuppressibilityChanged(WebKit::WebPageProxy *page)
</span></span></pre></div>
<a id="trunkToolsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Tools/ChangeLog (175582 => 175583)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/ChangeLog 2014-11-04 22:38:56 UTC (rev 175582)
+++ trunk/Tools/ChangeLog 2014-11-04 23:00:48 UTC (rev 175583)
</span><span class="lines">@@ -1,3 +1,15 @@
</span><ins>+2014-11-04 Chris Dumez <cdumez@apple.com>
+
+ Add ptr() method to Ref class
+ https://bugs.webkit.org/show_bug.cgi?id=138361
+
+ Reviewed by Darin Adler.
+
+ Use the new Ref::ptr() method.
+
+ * TestWebKitAPI/Tests/WTF/Ref.cpp:
+ (TestWebKitAPI::TEST):
+
</ins><span class="cx"> 2014-11-04 Tibor Meszaros <tmeszaros.u-szeged@partner.samsung.com>
</span><span class="cx">
</span><span class="cx"> [jhbuild] Make it possible to build GTK/EFL in same repository
</span></span></pre></div>
<a id="trunkToolsTestWebKitAPITestsWTFRefcpp"></a>
<div class="modfile"><h4>Modified: trunk/Tools/TestWebKitAPI/Tests/WTF/Ref.cpp (175582 => 175583)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/TestWebKitAPI/Tests/WTF/Ref.cpp 2014-11-04 22:38:56 UTC (rev 175582)
+++ trunk/Tools/TestWebKitAPI/Tests/WTF/Ref.cpp 2014-11-04 23:00:48 UTC (rev 175583)
</span><span class="lines">@@ -38,14 +38,14 @@
</span><span class="cx">
</span><span class="cx"> {
</span><span class="cx"> Ref<RefLogger> ptr(a);
</span><del>- ASSERT_EQ(&a, &ptr.get());
</del><ins>+ ASSERT_EQ(&a, ptr.ptr());
</ins><span class="cx"> ASSERT_EQ(&a.name, &ptr->name);
</span><span class="cx"> }
</span><span class="cx"> ASSERT_STREQ("ref(a) deref(a) ", takeLogStr().c_str());
</span><span class="cx">
</span><span class="cx"> {
</span><span class="cx"> Ref<RefLogger> ptr(adoptRef(a));
</span><del>- ASSERT_EQ(&a, &ptr.get());
</del><ins>+ ASSERT_EQ(&a, ptr.ptr());
</ins><span class="cx"> ASSERT_EQ(&a.name, &ptr->name);
</span><span class="cx"> }
</span><span class="cx"> ASSERT_STREQ("deref(a) ", takeLogStr().c_str());
</span><span class="lines">@@ -59,40 +59,40 @@
</span><span class="cx">
</span><span class="cx"> {
</span><span class="cx"> Ref<RefLogger> ptr(a);
</span><del>- ASSERT_EQ(&a, &ptr.get());
</del><ins>+ ASSERT_EQ(&a, ptr.ptr());
</ins><span class="cx"> log() << "| ";
</span><span class="cx"> ptr = b;
</span><del>- ASSERT_EQ(&b, &ptr.get());
</del><ins>+ ASSERT_EQ(&b, ptr.ptr());
</ins><span class="cx"> log() << "| ";
</span><span class="cx"> }
</span><span class="cx"> ASSERT_STREQ("ref(a) | ref(b) deref(a) | deref(b) ", takeLogStr().c_str());
</span><span class="cx">
</span><span class="cx"> {
</span><span class="cx"> Ref<RefLogger> ptr(a);
</span><del>- ASSERT_EQ(&a, &ptr.get());
</del><ins>+ ASSERT_EQ(&a, ptr.ptr());
</ins><span class="cx"> log() << "| ";
</span><span class="cx"> ptr = c;
</span><del>- ASSERT_EQ(&c, &ptr.get());
</del><ins>+ ASSERT_EQ(&c, ptr.ptr());
</ins><span class="cx"> log() << "| ";
</span><span class="cx"> }
</span><span class="cx"> ASSERT_STREQ("ref(a) | ref(c) deref(a) | deref(c) ", takeLogStr().c_str());
</span><span class="cx">
</span><span class="cx"> {
</span><span class="cx"> Ref<RefLogger> ptr(a);
</span><del>- ASSERT_EQ(&a, &ptr.get());
</del><ins>+ ASSERT_EQ(&a, ptr.ptr());
</ins><span class="cx"> log() << "| ";
</span><span class="cx"> ptr = adoptRef(b);
</span><del>- ASSERT_EQ(&b, &ptr.get());
</del><ins>+ ASSERT_EQ(&b, ptr.ptr());
</ins><span class="cx"> log() << "| ";
</span><span class="cx"> }
</span><span class="cx"> ASSERT_STREQ("ref(a) | deref(a) | deref(b) ", takeLogStr().c_str());
</span><span class="cx">
</span><span class="cx"> {
</span><span class="cx"> Ref<RefLogger> ptr(a);
</span><del>- ASSERT_EQ(&a, &ptr.get());
</del><ins>+ ASSERT_EQ(&a, ptr.ptr());
</ins><span class="cx"> log() << "| ";
</span><span class="cx"> ptr = adoptRef(c);
</span><del>- ASSERT_EQ(&c, &ptr.get());
</del><ins>+ ASSERT_EQ(&c, ptr.ptr());
</ins><span class="cx"> log() << "| ";
</span><span class="cx"> }
</span><span class="cx"> ASSERT_STREQ("ref(a) | deref(a) | deref(c) ", takeLogStr().c_str());
</span><span class="lines">@@ -116,16 +116,16 @@
</span><span class="cx">
</span><span class="cx"> {
</span><span class="cx"> Ref<RefLogger> ptr(passWithPassRef(a));
</span><del>- ASSERT_EQ(&a, &ptr.get());
</del><ins>+ ASSERT_EQ(&a, ptr.ptr());
</ins><span class="cx"> }
</span><span class="cx"> ASSERT_STREQ("ref(a) deref(a) ", takeLogStr().c_str());
</span><span class="cx">
</span><span class="cx"> {
</span><span class="cx"> Ref<RefLogger> ptr(a);
</span><del>- ASSERT_EQ(&a, &ptr.get());
</del><ins>+ ASSERT_EQ(&a, ptr.ptr());
</ins><span class="cx"> log() << "| ";
</span><span class="cx"> ptr = passWithPassRef(b);
</span><del>- ASSERT_EQ(&b, &ptr.get());
</del><ins>+ ASSERT_EQ(&b, ptr.ptr());
</ins><span class="cx"> log() << "| ";
</span><span class="cx"> }
</span><span class="cx"> ASSERT_STREQ("ref(a) | ref(b) deref(a) | deref(b) ", takeLogStr().c_str());
</span></span></pre>
</div>
</div>
</body>
</html>