Changeset 93571 in webkit

Timestamp:

Aug 22, 2011 6:35:48 PM (13 years ago)

Author:

enne@google.com

Message:

[chromium] Remove compositing assertions about creating layers when painting
​https://bugs.webkit.org/show_bug.cgi?id=66731

Reviewed by James Robinson.

The trigger for this assertion would cause a real rendering issue, but
it is both intermittent and in the wrong place in the codebase to
catch the source of the problem.

• platform/graphics/chromium/LayerChromium.cpp:

(WebCore::LayerChromium::LayerChromium):
(WebCore::LayerChromium::~LayerChromium):

• platform/graphics/chromium/LayerRendererChromium.cpp:

(WebCore::LayerRendererChromium::updateLayers):

• platform/graphics/chromium/LayerRendererChromium.h:

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• platform/graphics/chromium/LayerChromium.cpp (modified) (1 diff)
• platform/graphics/chromium/LayerRendererChromium.cpp (modified) (2 diffs)
• platform/graphics/chromium/LayerRendererChromium.h (modified) (1 diff)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2011-08-22  Adrienne Walker  <enne@google.com>
+
+        [chromium] Remove compositing assertions about creating layers when painting
+        https://bugs.webkit.org/show_bug.cgi?id=66731
+
+        Reviewed by James Robinson.
+
+        The trigger for this assertion would cause a real rendering issue, but
+        it is both intermittent and in the wrong place in the codebase to
+        catch the source of the problem.
+
+        * platform/graphics/chromium/LayerChromium.cpp:
+        (WebCore::LayerChromium::LayerChromium):
+        (WebCore::LayerChromium::~LayerChromium):
+        * platform/graphics/chromium/LayerRendererChromium.cpp:
+        (WebCore::LayerRendererChromium::updateLayers):
+        * platform/graphics/chromium/LayerRendererChromium.h:
+
 2011-08-22  Alexey Proskuryakov  <ap@apple.com>
 

trunk/Source/WebCore/platform/graphics/chromium/LayerChromium.cpp

@@ -81 +81 @@
     , m_targetRenderSurface(0)
 {
-    ASSERT(!LayerRendererChromium::s_inPaintLayerContents);
 }
 
 LayerChromium::~LayerChromium()
 {
-    ASSERT(!LayerRendererChromium::s_inPaintLayerContents);
     // Our parent should be holding a reference to us so there should be no
     // way for us to be destroyed while we still have a parent.

trunk/Source/WebCore/platform/graphics/chromium/LayerRendererChromium.cpp

@@ -79 +79 @@
 static size_t textureMemoryLowLimitBytes = 3 * 1024 * 1024;
 
-#ifndef NDEBUG
-bool LayerRendererChromium::s_inPaintLayerContents = false;
-#endif
-
 namespace {
 
@@ -630 +626 @@
     }
 
-#ifndef NDEBUG
-    s_inPaintLayerContents = true;
-#endif
     paintLayerContents(renderSurfaceLayerList);
-#ifndef NDEBUG
-    s_inPaintLayerContents = false;
-#endif
 
     m_contentsTextureManager->reduceMemoryToLimit(textureMemoryReclaimLimitBytes);

trunk/Source/WebCore/platform/graphics/chromium/LayerRendererChromium.h

@@ -156 +156 @@
     GC3Denum bestTextureFormat();
 
-#ifndef NDEBUG
-    static bool s_inPaintLayerContents;
-#endif
     typedef Vector<RefPtr<LayerChromium> > LayerList;
     typedef Vector<RefPtr<CCLayerImpl> > CCLayerList;