[chromium] Remove compositing assertions about creating layers when p…

…ainting 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: Canonical link: https://commits.webkit.org/82549@main git-svn-id: https://svn.webkit.org/repository/webkit/trunk@93571 268f45cc-cd09-0410-ab3c-d52691b4dbfc
WebKit · Aug 23, 2011 · a0abe39 · a0abe39
1 parent da7a32b
commit a0abe39
Show file tree

Hide file tree

Showing 4 changed files with 18 additions and 15 deletions.
diff --git a/Source/WebCore/ChangeLog b/Source/WebCore/ChangeLog
@@ -1,3 +1,21 @@
+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>
 
         showModalDialog does not correctly return the defined returnValue in case domain relaxing is used

diff --git a/Source/WebCore/platform/graphics/chromium/LayerChromium.cpp b/Source/WebCore/platform/graphics/chromium/LayerChromium.cpp
@@ -80,12 +80,10 @@ LayerChromium::LayerChromium(GraphicsLayerChromium* owner)
     , m_drawOpacity(0)
     , 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.
     ASSERT(!parent());

diff --git a/Source/WebCore/platform/graphics/chromium/LayerRendererChromium.cpp b/Source/WebCore/platform/graphics/chromium/LayerRendererChromium.cpp
@@ -78,10 +78,6 @@ static size_t textureMemoryReclaimLimitBytes = 64 * 1024 * 1024;
 // The maximum texture memory usage when asked to release textures.
 static size_t textureMemoryLowLimitBytes = 3 * 1024 * 1024;
 
-#ifndef NDEBUG
-bool LayerRendererChromium::s_inPaintLayerContents = false;
-#endif
-
 namespace {
 
 IntRect calculateVisibleRect(const IntRect& targetSurfaceRect, const IntRect& layerBoundRect, const TransformationMatrix& transform)
@@ -629,13 +625,7 @@ void LayerRendererChromium::updateLayers(LayerChromium* rootLayer)
         calculateDrawTransformsAndVisibility<LayerChromium, RenderSurfaceChromium, void*>(rootLayer, rootLayer, identityMatrix, identityMatrix, renderSurfaceLayerList, rootRenderSurface->layerList(), 0, m_maxTextureSize);
     }
 
-#ifndef NDEBUG
-    s_inPaintLayerContents = true;
-#endif
     paintLayerContents(renderSurfaceLayerList);
-#ifndef NDEBUG
-    s_inPaintLayerContents = false;
-#endif
 
     m_contentsTextureManager->reduceMemoryToLimit(textureMemoryReclaimLimitBytes);
     m_contentsTextureManager->deleteEvictedTextures(m_context.get());

diff --git a/Source/WebCore/platform/graphics/chromium/LayerRendererChromium.h b/Source/WebCore/platform/graphics/chromium/LayerRendererChromium.h
@@ -155,9 +155,6 @@ class LayerRendererChromium : public RefCounted<LayerRendererChromium> {
 
     GC3Denum bestTextureFormat();
 
-#ifndef NDEBUG
-    static bool s_inPaintLayerContents;
-#endif
     typedef Vector<RefPtr<LayerChromium> > LayerList;
     typedef Vector<RefPtr<CCLayerImpl> > CCLayerList;