Title: [126901] trunk/Source/WebCore
- Revision
- 126901
- Author
- [email protected]
- Date
- 2012-08-28 11:22:07 -0700 (Tue, 28 Aug 2012)
Log 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):
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (126900 => 126901)
--- trunk/Source/WebCore/ChangeLog 2012-08-28 18:14:30 UTC (rev 126900)
+++ trunk/Source/WebCore/ChangeLog 2012-08-28 18:22:07 UTC (rev 126901)
@@ -1,3 +1,13 @@
+2012-08-28 Dana Jansens <[email protected]>
+
+ [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 <[email protected]>
[New Multicolumn] Rename some flow thread methods and region methods/members to make them
Modified: trunk/Source/WebCore/platform/graphics/skia/OpaqueRegionSkia.cpp (126900 => 126901)
--- trunk/Source/WebCore/platform/graphics/skia/OpaqueRegionSkia.cpp 2012-08-28 18:14:30 UTC (rev 126900)
+++ trunk/Source/WebCore/platform/graphics/skia/OpaqueRegionSkia.cpp 2012-08-28 18:22:07 UTC (rev 126901)
@@ -182,6 +182,10 @@
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;
SkPaint layerPaint = canvasLayer.paint;
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo/webkit-changes
