Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(285)

Unified Diff: Source/WebCore/platform/graphics/skia/OpaqueRegionSkia.cpp

Issue 10913094: Merge 126901 (Closed) Base URL: http://svn.webkit.org/repository/webkit/branches/chromium/1229/
Patch Set: Created 8 years, 3 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/WebCore/platform/graphics/skia/OpaqueRegionSkia.cpp
===================================================================
--- Source/WebCore/platform/graphics/skia/OpaqueRegionSkia.cpp (revision 127637)
+++ Source/WebCore/platform/graphics/skia/OpaqueRegionSkia.cpp (working copy)
@@ -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;
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698