Fixing GraphicsContext state checks to support oilpan

Source/platform/graphics/GraphicsContext.h

Index: Source/platform/graphics/GraphicsContext.h
diff --git a/Source/platform/graphics/GraphicsContext.h b/Source/platform/graphics/GraphicsContext.h
index 0178d341b7c3bf99f85c3ec1ff175482359a8572..94be401860c2dd32c70759dae9a7cb6ec7fdddd5 100644
--- a/Source/platform/graphics/GraphicsContext.h
+++ b/Source/platform/graphics/GraphicsContext.h
@@ -112,6 +112,11 @@ public:
     // ---------- State management methods -----------------
     void save();
     void restore();
+    void unwindStateStack();
+#if !ASSERT_DISABLED
+    unsigned saveCount() { return m_saveCount; }

[f(malita), 2014/05/27 20:28:22]

return m_canvasStateStack.size()?

+    void disableDestructionChecks() { m_disableDestructionChecks = true; }
+#endif
 
     void saveLayer(const SkRect* bounds, const SkPaint*);
     void restoreLayer();
@@ -513,6 +518,8 @@ private:
 #if !ASSERT_DISABLED
     unsigned m_annotationCount;
     unsigned m_layerCount;
+    unsigned m_saveCount;

[f(malita), 2014/05/27 20:28:22]

Can we use m_canvasStateStack.size() instead?

[Justin Novosad, 2014/05/27 22:25:25]

I guess. I am being prematurely concerned about interfering with a hypothetical
future optimization that would introduce unrealized saves to m_canvasStateStack.
:-)

+    bool m_disableDestructionChecks;
 #endif
     // Tracks the region painted opaque via the GraphicsContext.
     OpaqueRegionSkia m_opaqueRegion;