Changeset 107360 in webkit

Timestamp:

Feb 9, 2012 10:08:40 PM (12 years ago)

Author:

commit-queue@webkit.org

Message:

[Chromium] Assertion failure minX <= maxX in Region.cpp
​https://bugs.webkit.org/show_bug.cgi?id=78038

Patch by Dana Jansens <​danakj@chromium.org> on 2012-02-09
Reviewed by James Robinson.

Covered by existing tests (should make them stop asserting).

Clamp sizes for composited layers coming out of WebCore to make sure they are valid non-negative values.

• platform/graphics/chromium/GraphicsLayerChromium.cpp:

(WebCore::GraphicsLayerChromium::setSize):

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• platform/graphics/chromium/GraphicsLayerChromium.cpp (modified) (1 diff)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2012-02-09  Dana Jansens  <danakj@chromium.org>
+
+        [Chromium] Assertion failure minX <= maxX in Region.cpp
+        https://bugs.webkit.org/show_bug.cgi?id=78038
+
+        Reviewed by James Robinson.
+
+        Covered by existing tests (should make them stop asserting).
+
+        Clamp sizes for composited layers coming out of WebCore to make sure they are valid non-negative values.
+
+        * platform/graphics/chromium/GraphicsLayerChromium.cpp:
+        (WebCore::GraphicsLayerChromium::setSize):
+
 2012-02-09  Gregg Tavares  <gman@google.com>
 

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

@@ -176 +176 @@
 void GraphicsLayerChromium::setSize(const FloatSize& size)
 {
-    if (size == m_size)
-        return;
-
-    GraphicsLayer::setSize(size);
+    // We are receiving negative sizes here that cause assertions to fail in the compositor. Clamp them to 0 to
+    // avoid those assertions.
+    FloatSize clampedSize = size;
+    if (clampedSize.isEmpty())
+        clampedSize = FloatSize();
+
+    if (clampedSize == m_size)
+        return;
+
+    GraphicsLayer::setSize(clampedSize);
     updateLayerSize();
 }