Title: [93571] trunk/Source/WebCore
- Revision
- 93571
- Author
- [email protected]
- Date
- 2011-08-22 18:35:48 -0700 (Mon, 22 Aug 2011)
Log 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:
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (93570 => 93571)
--- trunk/Source/WebCore/ChangeLog 2011-08-23 01:07:33 UTC (rev 93570)
+++ trunk/Source/WebCore/ChangeLog 2011-08-23 01:35:48 UTC (rev 93571)
@@ -1,3 +1,21 @@
+2011-08-22 Adrienne Walker <[email protected]>
+
+ [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 <[email protected]>
showModalDialog does not correctly return the defined returnValue in case domain relaxing is used
Modified: trunk/Source/WebCore/platform/graphics/chromium/LayerChromium.cpp (93570 => 93571)
--- trunk/Source/WebCore/platform/graphics/chromium/LayerChromium.cpp 2011-08-23 01:07:33 UTC (rev 93570)
+++ trunk/Source/WebCore/platform/graphics/chromium/LayerChromium.cpp 2011-08-23 01:35:48 UTC (rev 93571)
@@ -80,12 +80,10 @@
, 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());
Modified: trunk/Source/WebCore/platform/graphics/chromium/LayerRendererChromium.cpp (93570 => 93571)
--- trunk/Source/WebCore/platform/graphics/chromium/LayerRendererChromium.cpp 2011-08-23 01:07:33 UTC (rev 93570)
+++ trunk/Source/WebCore/platform/graphics/chromium/LayerRendererChromium.cpp 2011-08-23 01:35:48 UTC (rev 93571)
@@ -78,10 +78,6 @@
// 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 @@
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());
Modified: trunk/Source/WebCore/platform/graphics/chromium/LayerRendererChromium.h (93570 => 93571)
--- trunk/Source/WebCore/platform/graphics/chromium/LayerRendererChromium.h 2011-08-23 01:07:33 UTC (rev 93570)
+++ trunk/Source/WebCore/platform/graphics/chromium/LayerRendererChromium.h 2011-08-23 01:35:48 UTC (rev 93571)
@@ -155,9 +155,6 @@
GC3Denum bestTextureFormat();
-#ifndef NDEBUG
- static bool s_inPaintLayerContents;
-#endif
typedef Vector<RefPtr<LayerChromium> > LayerList;
typedef Vector<RefPtr<CCLayerImpl> > CCLayerList;
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
