SaveFlags be-gone

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 46 matching lines @@
 protected:
     virtual SkString onShortName() SK_OVERRIDE {
         return SkString("canvas-state");
     }
 
     virtual SkISize onISize() SK_OVERRIDE {
         return SkISize::Make(WIDTH*3, HEIGHT*4);
     }
 
     virtual void onDraw(SkCanvas* canvas) SK_OVERRIDE {
-
-        SkCanvas::SaveFlags flags[] = { SkCanvas::kMatrix_SaveFlag,
-                                        SkCanvas::kClip_SaveFlag,
-                                        SkCanvas::kMatrixClip_SaveFlag };
-
-        // columns -- flags
         // rows -- permutations of setting the clip and matrix
-        for (int i = 0; i < static_cast<int>(SK_ARRAY_COUNT(flags)); ++i) {
-            for (int j = 0; j < 2; ++j) {
-                for (int k = 0; k < 2; ++k) {
-                    this->drawTestPattern(i, (2*j)+k, canvas, flags[i],
-                                          SkToBool(j), SkToBool(k));
-                }
+        for (int j = 0; j < 2; ++j) {
+            for (int k = 0; k < 2; ++k) {
+                this->drawTestPattern((2*j)+k, canvas, SkToBool(j), SkToBool(k));
             }
         }
     }
 
 
     virtual uint32_t onGetFlags() const SK_OVERRIDE { return kSkipPicture_Flag; }
 
 private:
-    void drawTestPattern(int x, int y, SkCanvas* canvas,
-                         SkCanvas::SaveFlags flags, bool doClip, bool doScale) {
+    void drawTestPattern(int y, SkCanvas* canvas, bool doClip, bool doScale) {
         canvas->save();
-        canvas->translate(SkIntToScalar(x*WIDTH), SkIntToScalar(y*HEIGHT));
+        canvas->translate(0, SkIntToScalar(y*HEIGHT));
 
         canvas->drawRect(fOutlineRect, fStrokePaint);
-        canvas->save(flags);
+        canvas->save();
         if(doClip) {
             canvas->clipPath(fPath);
         }
         if (doScale) {
             canvas->scale(SkDoubleToScalar(0.5), SkDoubleToScalar(0.5));
         }
         canvas->restore();
         canvas->drawRect(fFillRect, fFillPaint);
 
         canvas->restore();
@@ skipping 66 matching lines @@
 
     typedef GM INHERITED;
 };
 
 //////////////////////////////////////////////////////////////////////////////
 
 DEF_GM( return SkNEW(CanvasStateGM); )
 DEF_GM( return SkNEW(CanvasLayerStateGM); )
 
 } // end namespace