Changeset 126901 in webkit

Timestamp:

Aug 28, 2012, 11:22:07 AM (14 years ago)

Author:

danakj@chromium.org

Message:

[chromium] Be robust to WebCore popping an empty GraphicsContext stack
​https://bugs.webkit.org/show_bug.cgi?id=95152

Reviewed by James Robinson.

• platform/graphics/skia/OpaqueRegionSkia.cpp:

(WebCore::OpaqueRegionSkia::popCanvasLayer):

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• platform/graphics/skia/OpaqueRegionSkia.cpp (modified) (1 diff)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2012-08-28  Dana Jansens  <danakj@chromium.org>
+
+        [chromium] Be robust to WebCore popping an empty GraphicsContext stack
+        https://bugs.webkit.org/show_bug.cgi?id=95152
+
+        Reviewed by James Robinson.
+
+        * platform/graphics/skia/OpaqueRegionSkia.cpp:
+        (WebCore::OpaqueRegionSkia::popCanvasLayer):
+
 2012-08-28  David Hyatt  <hyatt@apple.com>
 

trunk/Source/WebCore/platform/graphics/skia/OpaqueRegionSkia.cpp

@@ -183 +183 @@
 void OpaqueRegionSkia::popCanvasLayer(const PlatformContextSkia* context)
 {
+    ASSERT(!m_canvasLayerStack.isEmpty());
+    if (m_canvasLayerStack.isEmpty())
+        return;
+
     const CanvasLayerState& canvasLayer = m_canvasLayerStack.last();
     SkRect layerOpaqueRect = canvasLayer.opaqueRect;