Hide SaveFlags from the public SkCanvas API.

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 47 matching lines @@
     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 };
+        unsigned flags[] = {
+#ifdef SK_SUPPORT_LEGACY_SAVEFLAGS
+            SkCanvas::kMatrix_SaveFlag,
+            SkCanvas::kClip_SaveFlag,
+            SkCanvas::kMatrixClip_SaveFlag
+#else
+            0, 0, 0 // placeholders
+#endif
+        };
 
         // 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));
                 }
             }
         }
     }
 
 
     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) {
+                         unsigned flags, bool doClip, bool doScale) {
         canvas->save();
         canvas->translate(SkIntToScalar(x*WIDTH), SkIntToScalar(y*HEIGHT));
 
         canvas->drawRect(fOutlineRect, fStrokePaint);
-        canvas->save(flags);
+        canvas->save(
+#ifdef SK_SUPPORT_LEGACY_SAVEFLAGS
+                    (SkCanvas::SaveFlags)flags
+#endif
+                    );
         if(doClip) {
             canvas->clipPath(fPath);
         }
         if (doScale) {
             canvas->scale(SkDoubleToScalar(0.5), SkDoubleToScalar(0.5));
         }
         canvas->restore();
         canvas->drawRect(fFillRect, fFillPaint);
 
         canvas->restore();
@@ skipping 20 matching lines @@
 
     virtual SkISize onISize() SK_OVERRIDE {
         return SkISize::Make(WIDTH, HEIGHT);
     }
 
     virtual void onDraw(SkCanvas* canvas) SK_OVERRIDE {
 
         // clear the canvas to red
         canvas->drawColor(SK_ColorRED);
 
-#ifdef SK_SUPPORT_LEGACY_CLIPTOLAYERFLAG
+#if defined(SK_SUPPORT_LEGACY_CLIPTOLAYERFLAG) && defined(SK_SUPPORT_LEGACY_SAVEFLAGS)
+
         // both rects should appear
         drawTestPattern(canvas, 255, SkCanvas::kARGB_NoClipLayer_SaveFlag);
 
         canvas->translate(0, 2*(fRect.height() + 10));
 
         // only the top rect should appear
         drawTestPattern(canvas, 255, SkCanvas::kARGB_ClipLayer_SaveFlag);
 
         canvas->translate(0, 2*(fRect.height() + 10));
 
         // only the bottom rect should appear
         drawTestPattern(canvas, 0, SkCanvas::kARGB_NoClipLayer_SaveFlag);
 #endif
     }
 
     virtual uint32_t onGetFlags() const SK_OVERRIDE { return kSkipGPU_Flag; }
 
 private:
     // draw a rect within the layer's bounds and again outside the layer's bounds
-    void drawTestPattern(SkCanvas* canvas, U8CPU layerAlpha, SkCanvas::SaveFlags flags) {
-        canvas->saveLayerAlpha(&fRect, layerAlpha, flags);
+    void drawTestPattern(SkCanvas* canvas, U8CPU layerAlpha, unsigned flags) {
+        canvas->saveLayerAlpha(&fRect, layerAlpha
+#ifdef SK_SUPPORT_LEGACY_SAVEFLAGS
+                               , (SkCanvas::SaveFlags)flags
+#endif
+                               );
         canvas->drawRect(fRect, fBluePaint);
         canvas->translate(0, fRect.height() + 10);
         canvas->drawRect(fRect, fBluePaint);
         canvas->restore();
     }
 
     enum {
         WIDTH = 400,
         HEIGHT = 400,
         SPACER = 10,
     };
 
     SkPaint fBluePaint;
     SkRect fRect;
 
     typedef GM INHERITED;
 };
 
 //////////////////////////////////////////////////////////////////////////////
 
 DEF_GM( return SkNEW(CanvasStateGM); )
 DEF_GM( return SkNEW(CanvasLayerStateGM); )
 
 } // end namespace