[webkit-changes] [154929] trunk/Source/WebCore

[akling]

Title: [154929] trunk/Source/WebCore

Revision

154929

Author

akl...@apple.com

Date

2013-08-31 07:14:23 -0700 (Sat, 31 Aug 2013)

Log Message

PostAttachCallbackDisabler should take a ContainerNode&.
<https://webkit.org/b/120560>

Reviewed by Antti Koivisto.

Let PostAttachCallbackDisabler take a reference and remove an ugly assertion.

* dom/ContainerNode.h:
(WebCore::PostAttachCallbackDisabler::PostAttachCallbackDisabler):
(WebCore::PostAttachCallbackDisabler::~PostAttachCallbackDisabler):
* dom/Document.cpp:
(WebCore::Document::recalcStyle):
* style/StyleResolveTree.cpp:
(WebCore::Style::attachRenderTree):

Modified Paths

• trunk/Source/WebCore/ChangeLog
• trunk/Source/WebCore/dom/ContainerNode.h
• trunk/Source/WebCore/dom/Document.cpp
• trunk/Source/WebCore/style/StyleResolveTree.cpp

Diff

Modified: trunk/Source/WebCore/ChangeLog (154928 => 154929)

--- trunk/Source/WebCore/ChangeLog	2013-08-31 14:12:00 UTC (rev 154928)
+++ trunk/Source/WebCore/ChangeLog	2013-08-31 14:14:23 UTC (rev 154929)
@@ -1,3 +1,20 @@
+2013-08-31  Andreas Kling  <akl...@apple.com>
+
+        PostAttachCallbackDisabler should take a ContainerNode&.
+        <https://webkit.org/b/120560>
+
+        Reviewed by Antti Koivisto.
+
+        Let PostAttachCallbackDisabler take a reference and remove an ugly assertion.
+
+        * dom/ContainerNode.h:
+        (WebCore::PostAttachCallbackDisabler::PostAttachCallbackDisabler):
+        (WebCore::PostAttachCallbackDisabler::~PostAttachCallbackDisabler):
+        * dom/Document.cpp:
+        (WebCore::Document::recalcStyle):
+        * style/StyleResolveTree.cpp:
+        (WebCore::Style::attachRenderTree):
+
 2013-08-31  Antti Koivisto  <an...@apple.com>
 
         Rename ChildIterator -> ElementChildIterator, DescendantIterator -> ElementDescendantIterator

Modified: trunk/Source/WebCore/dom/ContainerNode.h (154928 => 154929)

--- trunk/Source/WebCore/dom/ContainerNode.h	2013-08-31 14:12:00 UTC (rev 154928)
+++ trunk/Source/WebCore/dom/ContainerNode.h	2013-08-31 14:14:23 UTC (rev 154929)
@@ -305,20 +305,19 @@
 
 class PostAttachCallbackDisabler {
 public:
-    PostAttachCallbackDisabler(ContainerNode* node)
+    PostAttachCallbackDisabler(ContainerNode& node)
         : m_node(node)
     {
-        ASSERT(m_node);
-        m_node->suspendPostAttachCallbacks();
+        m_node.suspendPostAttachCallbacks();
     }
 
     ~PostAttachCallbackDisabler()
     {
-        m_node->resumePostAttachCallbacks();
+        m_node.resumePostAttachCallbacks();
     }
 
 private:
-    ContainerNode* m_node;
+    ContainerNode& m_node;
 };
 
 } // namespace WebCore

Modified: trunk/Source/WebCore/dom/Document.cpp (154928 => 154929)

--- trunk/Source/WebCore/dom/Document.cpp	2013-08-31 14:12:00 UTC (rev 154928)
+++ trunk/Source/WebCore/dom/Document.cpp	2013-08-31 14:14:23 UTC (rev 154929)
@@ -1762,7 +1762,7 @@
 
     m_inStyleRecalc = true;
     {
-        PostAttachCallbackDisabler disabler(this);
+        PostAttachCallbackDisabler disabler(*this);
         WidgetHierarchyUpdatesSuspensionScope suspendWidgetHierarchyUpdates;
 
         frameView.pauseScheduledEvents();

Modified: trunk/Source/WebCore/style/StyleResolveTree.cpp (154928 => 154929)

--- trunk/Source/WebCore/style/StyleResolveTree.cpp	2013-08-31 14:12:00 UTC (rev 154928)
+++ trunk/Source/WebCore/style/StyleResolveTree.cpp	2013-08-31 14:14:23 UTC (rev 154929)
@@ -469,7 +469,7 @@
 
 static void attachRenderTree(Element& current, RenderStyle* resolvedStyle)
 {
-    PostAttachCallbackDisabler callbackDisabler(&current);
+    PostAttachCallbackDisabler callbackDisabler(current);
     WidgetHierarchyUpdatesSuspensionScope suspendWidgetHierarchyUpdates;
 
     if (current.hasCustomStyleResolveCallbacks())

_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes