Changeset 179776 in webkit

Timestamp:

Feb 6, 2015, 8:35:58 PM (12 years ago)

Author:

Alan Bujtas

Message:

ASSERT repaintContainer->hasLayer() in WebCore::RenderObject::repaintUsingContainer
​https://bugs.webkit.org/show_bug.cgi?id=140750

Reviewed by Simon Fraser.

There's a short period of time when RenderObject::layer() still returns a valid pointer
even though we already cleared the hasLayer() flag.
Do not use the layer as repaint container in such cases.

Source/WebCore:

Test: compositing/repaint-container-assertion-when-toggling-compositing.html

• rendering/RenderObject.cpp:

(WebCore::RenderObject::enclosingLayer):

LayoutTests:

• compositing/repaint-container-assertion-when-toggling-compositing-expected.txt: Added.
• compositing/repaint-container-assertion-when-toggling-compositing.html: Added.

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/compositing/repaint-container-assertion-when-toggling-compositing-expected.txt (added)
• LayoutTests/compositing/repaint-container-assertion-when-toggling-compositing.html (added)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/rendering/RenderObject.cpp (modified) (1 diff)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2015-02-06  Zalan Bujtas  <zalan@apple.com>
+
+        ASSERT repaintContainer->hasLayer() in WebCore::RenderObject::repaintUsingContainer
+        https://bugs.webkit.org/show_bug.cgi?id=140750
+
+        Reviewed by Simon Fraser.
+
+        There's a short period of time when RenderObject::layer() still returns a valid pointer
+        even though we already cleared the hasLayer() flag.
+        Do not use the layer as repaint container in such cases.
+
+        * compositing/repaint-container-assertion-when-toggling-compositing-expected.txt: Added.
+        * compositing/repaint-container-assertion-when-toggling-compositing.html: Added.
+
 2015-02-06  Said Abou-Hallawa  <sabouhallawa@apple.com>
 

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2015-02-06  Zalan Bujtas  <zalan@apple.com>
+
+        ASSERT repaintContainer->hasLayer() in WebCore::RenderObject::repaintUsingContainer
+        https://bugs.webkit.org/show_bug.cgi?id=140750
+
+        Reviewed by Simon Fraser.
+
+        There's a short period of time when RenderObject::layer() still returns a valid pointer
+        even though we already cleared the hasLayer() flag.
+        Do not use the layer as repaint container in such cases.
+
+        Test: compositing/repaint-container-assertion-when-toggling-compositing.html
+
+        * rendering/RenderObject.cpp:
+        (WebCore::RenderObject::enclosingLayer):
+
 2015-02-06  Chris Dumez  <cdumez@apple.com>
 

trunk/Source/WebCore/rendering/RenderObject.cpp

@@ -475 +475 @@
 {
     for (auto& renderer : lineageOfType<RenderLayerModelObject>(*this)) {
-        if (renderer.layer())
+        if (renderer.hasLayer())
             return renderer.layer();
     }