Title: [151629] trunk/Source/WebCore
Revision
151629
Author
[email protected]
Date
2013-06-16 21:23:15 -0700 (Sun, 16 Jun 2013)

Log Message

Fix test assertion after r151624

An assertion was hit in RenderObject::willBeDestroyed()
for fast/css/getComputedStyle/getComputedStyle-background-shorthand.html
because the code asserted that the RenderObject had been removed from
the FrameView's slowRepaintObject set before remove() was called,
so move the assertion to after that call.

* rendering/RenderObject.cpp:
(WebCore::RenderObject::willBeDestroyed):

Modified Paths

Diff

Modified: trunk/Source/WebCore/ChangeLog (151628 => 151629)


--- trunk/Source/WebCore/ChangeLog	2013-06-17 03:56:41 UTC (rev 151628)
+++ trunk/Source/WebCore/ChangeLog	2013-06-17 04:23:15 UTC (rev 151629)
@@ -1,3 +1,16 @@
+2013-06-16  Simon Fraser  <[email protected]>
+
+        Fix test assertion after r151624
+
+        An assertion was hit in RenderObject::willBeDestroyed()
+        for fast/css/getComputedStyle/getComputedStyle-background-shorthand.html
+        because the code asserted that the RenderObject had been removed from
+        the FrameView's slowRepaintObject set before remove() was called,
+        so move the assertion to after that call.
+
+        * rendering/RenderObject.cpp:
+        (WebCore::RenderObject::willBeDestroyed):
+
 2013-06-16  Gyuyoung Kim  <[email protected]>
 
         Remove a redundant virtual call to hostWindow() in FrameView::invalidateRect()

Modified: trunk/Source/WebCore/rendering/RenderObject.cpp (151628 => 151629)


--- trunk/Source/WebCore/rendering/RenderObject.cpp	2013-06-17 03:56:41 UTC (rev 151628)
+++ trunk/Source/WebCore/rendering/RenderObject.cpp	2013-06-17 04:23:15 UTC (rev 151629)
@@ -2443,8 +2443,6 @@
 
     animation()->cancelAnimations(this);
 
-    ASSERT(documentBeingDestroyed() || !frame()->view()->hasSlowRepaintObject(this));
-
     // For accessibility management, notify the parent of the imminent change to its child set.
     // We do it now, before remove(), while the parent pointer is still available.
     if (AXObjectCache* cache = document()->existingAXObjectCache())
@@ -2452,6 +2450,8 @@
 
     remove();
 
+    ASSERT(documentBeingDestroyed() || !frame()->view()->hasSlowRepaintObject(this));
+
     // The remove() call above may invoke axObjectCache()->childrenChanged() on the parent, which may require the AX render
     // object for this renderer. So we remove the AX render object now, after the renderer is removed.
     if (AXObjectCache* cache = document()->existingAXObjectCache())
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to