switch to using SaveLayerFlags (SaveFlags are deprecated)

skia/ext/benchmarking_canvas.cc

 // Copyright (c) 2013 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "skia/ext/benchmarking_canvas.h"
 
 #include <utility>
 
 #include "base/logging.h"
 #include "base/strings/stringprintf.h"
@@ skipping 256 matching lines @@
   if (paint.getColorFilter())
     val->Set("ColorFilter", AsValue(*paint.getColorFilter()));
 
   if (paint.getImageFilter())
     val->Set("ImageFilter", AsValue(*paint.getImageFilter()));
 
   return std::move(val);
 }
 
 WARN_UNUSED_RESULT
-scoped_ptr<base::Value> AsValue(SkCanvas::SaveFlags flags) {
+scoped_ptr<base::Value> SaveLayerFlagsAsValue(SkCanvas::SaveLayerFlags flags) {

[f(malita), 2015/12/19 18:09:14]

Bummer, we're breaking the overload-fest :)

   FlagsBuilder builder('|');
-  builder.addFlag(flags & SkCanvas::kHasAlphaLayer_SaveFlag,
-                  "kHasAlphaLayer");
-  builder.addFlag(flags & SkCanvas::kFullColorLayer_SaveFlag,
-                  "kFullColorLayer");
-  builder.addFlag(flags & SkCanvas::kClipToLayer_SaveFlag,
-                  "kClipToLayer");
+  builder.addFlag(flags & SkCanvas::kIsOpaque_SaveLayerFlag,
+                  "kIsOpaque");
+  builder.addFlag(flags & SkCanvas::kPreserveLCDText_SaveLayerFlag,
+                  "kPreserveLCDText");
 
   scoped_ptr<base::StringValue> val(new base::StringValue(builder.str()));
 
   return std::move(val);
 }
 
 WARN_UNUSED_RESULT
 scoped_ptr<base::Value> AsValue(SkRegion::Op op) {
   static const char* gOpStrings[] = { "Difference",
                                       "Intersect",
@@ skipping 248 matching lines @@
 
   INHERITED::willSave();
 }
 
 SkCanvas::SaveLayerStrategy BenchmarkingCanvas::getSaveLayerStrategy(
     const SaveLayerRec& rec) {
   AutoOp op(this, "SaveLayer", rec.fPaint);
   if (rec.fBounds)
     op.addParam("bounds", AsValue(*rec.fBounds));
   if (rec.fSaveLayerFlags)
-    op.addParam("flags", AsValue(rec.fSaveLayerFlags));
+    op.addParam("flags", SaveLayerFlagsAsValue(rec.fSaveLayerFlags));
 
   return INHERITED::getSaveLayerStrategy(rec);
 }
 
 void BenchmarkingCanvas::willRestore() {
   AutoOp op(this, "Restore");
 
   INHERITED::willRestore();
 }
 
@@ skipping 233 matching lines @@
   DCHECK(blob);
   AutoOp op(this, "DrawTextBlob", &paint);
   op.addParam("blob", AsValue(*blob));
   op.addParam("x", AsValue(x));
   op.addParam("y", AsValue(y));
 
   INHERITED::onDrawTextBlob(blob, x, y, *op.paint());
 }
 
 } // namespace skia