Hide SaveFlags from the public SkCanvas API.

src/core/SkCanvas.cpp

 
 /*
  * Copyright 2008 The Android Open Source Project
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 
 #include "SkCanvas.h"
@@ skipping 816 matching lines @@
         fClipStack.save();
     }
 
     return saveCount;
 }
 
 void SkCanvas::willSave(SaveFlags) {
     // Do nothing. Subclasses may do something.
 }
 
+#ifdef SK_SUPPORT_LEGACY_SAVEFLAGS
 int SkCanvas::save(SaveFlags flags) {
+#else
+int SkCanvas::save() {
+    SaveFlags flags = kMatrixClip_SaveFlag;
+#endif
+
     this->willSave(flags);
     // call shared impl
     return this->internalSave(flags);
 }
 
-static bool bounds_affects_clip(SkCanvas::SaveFlags flags) {
+bool SkCanvas::bounds_affects_clip(SkCanvas::SaveFlags flags) {
 #ifdef SK_SUPPORT_LEGACY_CLIPTOLAYERFLAG
     return (flags & SkCanvas::kClipToLayer_SaveFlag) != 0;
 #else
     return true;
 #endif
 }
 
 bool SkCanvas::clipRectBounds(const SkRect* bounds, SaveFlags flags,
                                SkIRect* intersection, const SkImageFilter* imageFilter) {
     SkIRect clipBounds;
@@ skipping 37 matching lines @@
     }
     return true;
 }
 
 SkCanvas::SaveLayerStrategy SkCanvas::willSaveLayer(const SkRect*, const SkPaint*, SaveFlags) {
 
     // Do nothing. Subclasses may do something.
     return kFullLayer_SaveLayerStrategy;
 }
 
+#ifdef SK_SUPPORT_LEGACY_SAVEFLAGS
 int SkCanvas::saveLayer(const SkRect* bounds, const SkPaint* paint,
                         SaveFlags flags) {
+#else
+int SkCanvas::saveLayer(const SkRect* bounds, const SkPaint* paint) {
+    SaveFlags flags = kARGB_ClipLayer_SaveFlag;
+#endif
+
     // Overriding classes may return false to signal that we don't need to create a layer.
     SaveLayerStrategy strategy = this->willSaveLayer(bounds, paint, flags);
     return this->internalSaveLayer(bounds, paint, flags, false, strategy);
 }
 
 static SkBaseDevice* create_compatible_device(SkCanvas* canvas,
                                               const SkImageInfo& info) {
     SkBaseDevice* device = canvas->getDevice();
     return device ? device->createCompatibleDevice(info) : NULL;
 }
@@ skipping 55 matching lines @@
     device->unref();
 
     layer->fNext = fMCRec->fTopLayer;
     fMCRec->fLayer = layer;
     fMCRec->fTopLayer = layer;    // this field is NOT an owner of layer
 
     fSaveLayerCount += 1;
     return count;
 }
 
+
+#ifdef SK_SUPPORT_LEGACY_SAVEFLAGS
 int SkCanvas::saveLayerAlpha(const SkRect* bounds, U8CPU alpha,
                              SaveFlags flags) {
+#else
+int SkCanvas::saveLayerAlpha(const SkRect* bounds, U8CPU alpha) {
+#endif
+
     if (0xFF == alpha) {
-        return this->saveLayer(bounds, NULL, flags);
+        return this->saveLayer(bounds, NULL
+#ifdef SK_SUPPORT_LEGACY_SAVEFLAGS
+                               , flags
+#endif
+                               );
     } else {
         SkPaint tmpPaint;
         tmpPaint.setAlpha(alpha);
-        return this->saveLayer(bounds, &tmpPaint, flags);
+        return this->saveLayer(bounds, &tmpPaint
+#ifdef SK_SUPPORT_LEGACY_SAVEFLAGS
+                               , flags
+#endif
+                               );
     }
 }
 
 void SkCanvas::willRestore() {
     // Do nothing. Subclasses may do something.
 }
 
 void SkCanvas::restore() {
     // check for underflow
     if (fMCStack.count() > 1) {
@@ skipping 1641 matching lines @@
     if (!supported_for_raster_canvas(info)) {
         return NULL;
     }
 
     SkBitmap bitmap;
     if (!bitmap.installPixels(info, pixels, rowBytes)) {
         return NULL;
     }
     return SkNEW_ARGS(SkCanvas, (bitmap));
 }