Revert "Create a semi-stable API for capturing the state of an SkCanvas and reconstructing that sta…

gm/canvasstate.cpp

 /*
  * Copyright 2013 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 #include "gm.h"
 #include "SkCanvas.h"
 #include "SkPaint.h"
@@ skipping 94 matching lines @@
     }
 
     typedef GM INHERITED;
 };
 
 //////////////////////////////////////////////////////////////////////////////
 
 class CanvasLayerStateGM : public GM {
 public:
     CanvasLayerStateGM() {
+        fRedPaint.setColor(SK_ColorRED);
+        fRedPaint.setStyle(SkPaint::kFill_Style);
+
         fBluePaint.setColor(SK_ColorBLUE);
         fBluePaint.setStyle(SkPaint::kFill_Style);
 
         fRect = SkRect::MakeXYWH(SPACER, SPACER, WIDTH-(2*SPACER), (HEIGHT-(2*SPACER)) / 7);
     }
 
 protected:
     virtual SkString onShortName() SK_OVERRIDE {
         return SkString("canvas-layer-state");
     }
@@ skipping 32 matching lines @@
         canvas->drawRect(fRect, fBluePaint);
         canvas->restore();
     }
 
     enum {
         WIDTH = 400,
         HEIGHT = 400,
         SPACER = 10,
     };
 
+    SkPaint fRedPaint;
     SkPaint fBluePaint;
     SkRect fRect;
 
     typedef GM INHERITED;
 };
 
 //////////////////////////////////////////////////////////////////////////////
 
 DEF_GM( return SkNEW(CanvasStateGM); )
 DEF_GM( return SkNEW(CanvasLayerStateGM); )
 
 } // end namespace