Fixing GraphicsContext state checks to support oilpan

Source/platform/graphics/GraphicsContext.h

 /*
  * Copyright (C) 2003, 2006, 2007, 2008, 2009 Apple Inc. All rights reserved.
  * Copyright (C) 2008-2009 Torch Mobile, Inc.
  * Copyright (C) 2013 Google Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
@@ skipping 94 matching lines @@
     // needed in some other way.
     // See bug# 372110
     bool isRecordingCanvas() const
     {
         return m_canvas->imageInfo().colorType() == kUnknown_SkColorType;
     }
 
     // ---------- 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();
 
     float strokeThickness() const { return immutableState()->strokeData().thickness(); }
     void setStrokeThickness(float thickness) { mutableState()->setStrokeThickness(thickness); }
 
     StrokeStyle strokeStyle() const { return immutableState()->strokeData().style(); }
     void setStrokeStyle(StrokeStyle style) { mutableState()->setStrokeStyle(style); }
 
@@ skipping 381 matching lines @@
     bool m_pendingCanvasSave;
 
     AnnotationModeFlags m_annotationMode;
 
     struct RecordingState;
     Vector<RecordingState> m_recordingStateStack;
 
 #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;
 
     // Tracks the region where text is painted via the GraphicsContext.
     SkRect m_textRegion;
 
     unsigned m_disabledState;
 
     // Activation for the above region tracking features
     bool m_trackOpaqueRegion : 1;
     bool m_trackTextRegion : 1;
 
     // Are we on a high DPI display? If so, spelling and grammar markers are larger.
     bool m_useHighResMarker : 1;
     // FIXME: Make this go away: crbug.com/236892
     bool m_updatingControlTints : 1;
     bool m_accelerated : 1;
     bool m_isCertainlyOpaque : 1;
     bool m_printing : 1;
     bool m_antialiasHairlineImages : 1;
 };
 
 } // namespace WebCore
 
 #endif // GraphicsContext_h