Changeset 150547 in webkit

Timestamp:

May 22, 2013 3:19:18 PM (11 years ago)

Author:

Simon Fraser

Message:

Fix assertion in the getComputedStyle-background-shorthand.html test
​https://bugs.webkit.org/show_bug.cgi?id=116639

Reviewed by Ryosuke Niwa.

getComputedStyle-background-shorthand.html was asserting under the newly added
code in willBeRemovedFromTree(). The assertion was caused by too many calls to
FrameView::removeSlowRepaintObject(), which happened because we called it for
RenderTexts, which share style with their parent renderer.

RenderText overrides styleWillChange() to do nothing, so we never
call add/removeSlowRepaintObject() for them. Thus we should also skip this
work in willBeRemovedFromTree() for RenderTexts.

• rendering/RenderObject.cpp:

(WebCore::RenderObject::willBeRemovedFromTree):

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• rendering/RenderObject.cpp (modified) (1 diff)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2013-05-22  Simon Fraser  <simon.fraser@apple.com>
+
+        Fix assertion in the getComputedStyle-background-shorthand.html test
+        https://bugs.webkit.org/show_bug.cgi?id=116639
+
+        Reviewed by Ryosuke Niwa.
+
+        getComputedStyle-background-shorthand.html was asserting under the newly added
+        code in willBeRemovedFromTree(). The assertion was caused by too many calls to
+        FrameView::removeSlowRepaintObject(), which happened because we called it for
+        RenderTexts, which share style with their parent renderer.
+        
+        RenderText overrides styleWillChange() to do nothing, so we never
+        call add/removeSlowRepaintObject() for them. Thus we should also skip this
+        work in willBeRemovedFromTree() for RenderTexts.
+
+        * rendering/RenderObject.cpp:
+        (WebCore::RenderObject::willBeRemovedFromTree):
+
 2013-05-22  Bem Jones-Bey  <bjonesbe@adobe.com>
 

trunk/Source/WebCore/rendering/RenderObject.cpp

@@ -2525 +2525 @@
     // FIXME: We should ASSERT(isRooted()) but we have some out-of-order removals which would need to be fixed first.
 
-    if (FrameView* frameView = view()->frameView()) {
-        bool repaintFixedBackgroundsOnScroll = shouldRepaintFixedBackgroundsOnScroll(frameView);
-        if (repaintFixedBackgroundsOnScroll && m_style && m_style->hasFixedBackgroundImage())
-            frameView->removeSlowRepaintObject();
+    if (!isText()) {
+        if (FrameView* frameView = view()->frameView()) {
+            bool repaintFixedBackgroundsOnScroll = shouldRepaintFixedBackgroundsOnScroll(frameView);
+            if (repaintFixedBackgroundsOnScroll && m_style && m_style->hasFixedBackgroundImage())
+                frameView->removeSlowRepaintObject();
+        }
     }