Reduce internal explicit SaveFlags usage.

Most of these are either redundant/defaults or (hopefully)
unnecessarily specific.

R=reed@google.com, robertphillips@google.com

Author: fmalita@chromium.org

Review URL: https://codereview.chromium.org/241453003

git-svn-id: http://skia.googlecode.com/svn/trunk@14253 2bbb7eff-a529-9590-31e7-b0007b416f81

2 files changed, 6 insertions, 8 deletions

diff --git a/tests/DeferredCanvasTest.cpp b/tests/DeferredCanvasTest.cpp
index 13758a768d..ffcbc23d56 100644
--- a/tests/DeferredCanvasTest.cpp
+++ b/tests/DeferredCanvasTest.cpp
@@ -290,20 +290,20 @@ static void TestDeferredCanvasFreshFrame(skiatest::Reporter* reporter) {
     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();
@@ -389,7 +389,7 @@ static void TestDeferredCanvasFreshFrame(skiatest::Reporter* reporter) {
     // 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);
@@ -399,7 +399,7 @@ static void TestDeferredCanvasFreshFrame(skiatest::Reporter* reporter) {
         REPORTER_ASSERT(reporter, !canvas->isFreshFrame());
     }
     {
-        canvas->save(SkCanvas::kMatrixClip_SaveFlag);
+        canvas->save();
         SkPaint paint;
         paint.setStyle(SkPaint::kFill_Style);
         paint.setAlpha(255);
diff --git a/tests/ImageFilterTest.cpp b/tests/ImageFilterTest.cpp
index 9748ecfa10..a58c3af5a0 100644
--- a/tests/ImageFilterTest.cpp
+++ b/tests/ImageFilterTest.cpp
@@ -285,9 +285,7 @@ DEF_TEST(ImageFilterMatrixTest, reporter) {
     SkAutoTUnref<MatrixTestImageFilter> imageFilter(
         new MatrixTestImageFilter(reporter, expectedMatrix));
     paint.setImageFilter(imageFilter.get());
-    SkCanvas::SaveFlags saveFlags = static_cast<SkCanvas::SaveFlags>(
-        SkCanvas::kHasAlphaLayer_SaveFlag | SkCanvas::kFullColorLayer_SaveFlag);
-    recordingCanvas->saveLayer(NULL, &paint, saveFlags);
+    recordingCanvas->saveLayer(NULL, &paint);
     SkPaint solidPaint;
     solidPaint.setColor(0xFFFFFFFF);
     recordingCanvas->save();