Reduce internal explicit SaveFlags usage.

tests/DeferredCanvasTest.cpp

 /*
  * Copyright 2012 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 #include "../src/image/SkImagePriv.h"
 #include "../src/image/SkSurface_Base.h"
 #include "SkBitmap.h"
@@ skipping 272 matching lines @@
     // verify that frame is intially fresh
     REPORTER_ASSERT(reporter, canvas->isFreshFrame());
     // no clearing op since last call to isFreshFrame -> not fresh
     REPORTER_ASSERT(reporter, !canvas->isFreshFrame());
 
     // Verify that clear triggers a fresh frame
     canvas->clear(0x00000000);
     REPORTER_ASSERT(reporter, canvas->isFreshFrame());
 
     // Verify that clear with saved state triggers a fresh frame
-    canvas->save(SkCanvas::kMatrixClip_SaveFlag);
+    canvas->save();
     canvas->clear(0x00000000);
     canvas->restore();
     REPORTER_ASSERT(reporter, canvas->isFreshFrame());
 
     // Verify that clear within a layer does NOT trigger a fresh frame
-    canvas->saveLayer(NULL, NULL, SkCanvas::kARGB_ClipLayer_SaveFlag);
+    canvas->saveLayer(NULL, NULL);
     canvas->clear(0x00000000);
     canvas->restore();
     REPORTER_ASSERT(reporter, !canvas->isFreshFrame());
 
     // Verify that a clear with clipping triggers a fresh frame
     // (clear is not affected by clipping)
-    canvas->save(SkCanvas::kMatrixClip_SaveFlag);
+    canvas->save();
     canvas->clipRect(partialRect, SkRegion::kIntersect_Op, false);
     canvas->clear(0x00000000);
     canvas->restore();
     REPORTER_ASSERT(reporter, canvas->isFreshFrame());
 
     // Verify that full frame rects with different forms of opaque paint
     // trigger frames to be marked as fresh
     {
         SkPaint paint;
         paint.setStyle(SkPaint::kFill_Style);
@@ skipping 65 matching lines @@
         SkPaint paint;
         paint.setStyle(SkPaint::kFill_Style);
         paint.setAlpha(255);
         canvas->drawRect(partialRect, paint);
         REPORTER_ASSERT(reporter, !canvas->isFreshFrame());
     }
 
     // Verify that incomplete coverage due to clipping does not trigger a fresh
     // frame
     {
-        canvas->save(SkCanvas::kMatrixClip_SaveFlag);
+        canvas->save();
         canvas->clipRect(partialRect, SkRegion::kIntersect_Op, false);
         SkPaint paint;
         paint.setStyle(SkPaint::kFill_Style);
         paint.setAlpha(255);
         canvas->drawRect(fullRect, paint);
         canvas->restore();
         REPORTER_ASSERT(reporter, !canvas->isFreshFrame());
     }
     {
-        canvas->save(SkCanvas::kMatrixClip_SaveFlag);
+        canvas->save();
         SkPaint paint;
         paint.setStyle(SkPaint::kFill_Style);
         paint.setAlpha(255);
         SkPath path;
         path.addCircle(SkIntToScalar(0), SkIntToScalar(0), SkIntToScalar(2));
         canvas->clipPath(path, SkRegion::kIntersect_Op, false);
         canvas->drawRect(fullRect, paint);
         canvas->restore();
         REPORTER_ASSERT(reporter, !canvas->isFreshFrame());
     }
@@ skipping 415 matching lines @@
     TestDeferredCanvasBitmapSizeThreshold(reporter);
     TestDeferredCanvasCreateCompatibleDevice(reporter);
     TestDeferredCanvasWritePixelsToSurface(reporter);
     TestDeferredCanvasSurface(reporter, NULL);
     TestDeferredCanvasSetSurface(reporter, NULL);
     if (NULL != factory) {
         TestDeferredCanvasSurface(reporter, factory);
         TestDeferredCanvasSetSurface(reporter, factory);
     }
 }