Changeset 96160 in webkit

Timestamp:

Sep 27, 2011 2:47:30 PM (13 years ago)

Author:

commit-queue@webkit.org

Message:

Add a mechanism to test for the compositing tree mutated during painting
​https://bugs.webkit.org/show_bug.cgi?id=68738

Patch by James Robinson <​jamesr@chromium.org> on 2011-09-27
Reviewed by Adam Barth.

Source/WebCore:

Sets a static bool during GraphicsLayer::paintGraphicsLayerContents and ASSERT()s that we never create or
destroy a GraphicsLayer inside this function. Painting should never mutate the GraphicsLayer tree.

Test: compositing/video/video-with-invalid-source.html

• platform/graphics/GraphicsLayer.cpp:

(WebCore::GraphicsLayer::GraphicsLayer):
(WebCore::GraphicsLayer::~GraphicsLayer):
(WebCore::GraphicsLayer::paintGraphicsLayerContents):

LayoutTests:

Adds a test that caused compositing to be disabled during painting before r95863 due to a video load failing.

• compositing/video/video-with-invalid-source-expected.txt: Added.
• compositing/video/video-with-invalid-source.html: Added.

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/compositing/video/video-with-invalid-source-expected.txt (added)
• LayoutTests/compositing/video/video-with-invalid-source.html (added)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/platform/graphics/GraphicsLayer.cpp (modified) (3 diffs)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2011-09-27  James Robinson  <jamesr@chromium.org>
+
+        Add a mechanism to test for the compositing tree mutated during painting
+        https://bugs.webkit.org/show_bug.cgi?id=68738
+
+        Reviewed by Adam Barth.
+
+        Adds a test that caused compositing to be disabled during painting before r95863 due to a video load failing.
+
+        * compositing/video/video-with-invalid-source-expected.txt: Added.
+        * compositing/video/video-with-invalid-source.html: Added.
+
 2011-09-27  Ojan Vafai  <ojan@chromium.org>
 

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2011-09-27  James Robinson  <jamesr@chromium.org>
+
+        Add a mechanism to test for the compositing tree mutated during painting
+        https://bugs.webkit.org/show_bug.cgi?id=68738
+
+        Reviewed by Adam Barth.
+
+        Sets a static bool during GraphicsLayer::paintGraphicsLayerContents and ASSERT()s that we never create or
+        destroy a GraphicsLayer inside this function. Painting should never mutate the GraphicsLayer tree.
+
+        Test: compositing/video/video-with-invalid-source.html
+
+        * platform/graphics/GraphicsLayer.cpp:
+        (WebCore::GraphicsLayer::GraphicsLayer):
+        (WebCore::GraphicsLayer::~GraphicsLayer):
+        (WebCore::GraphicsLayer::paintGraphicsLayerContents):
+
 2011-09-27  Ojan Vafai  <ojan@chromium.org>
 

trunk/Source/WebCore/platform/graphics/GraphicsLayer.cpp

@@ -62 +62 @@
 }
 
+#ifndef NDEBUG
+static bool s_inPaintContents = false;
+#endif
+
 GraphicsLayer::GraphicsLayer(GraphicsLayerClient* client)
     : m_client(client)
@@ -85 +89 @@
     , m_repaintCount(0)
 {
+    ASSERT(!s_inPaintContents);
 }
 
 GraphicsLayer::~GraphicsLayer()
 {
+    ASSERT(!s_inPaintContents);
     removeAllChildren();
     removeFromParent();
@@ -269 +275 @@
 void GraphicsLayer::paintGraphicsLayerContents(GraphicsContext& context, const IntRect& clip)
 {
+#ifndef NDEBUG
+    s_inPaintContents = true;
+#endif
     if (m_client)
         m_client->paintContents(this, context, m_paintingPhase, clip);
+#ifndef NDEBUG
+    s_inPaintContents = false;
+#endif
 }