Roll skia to 409fd66a5afcef5f165f7ccec7c3473add231752.

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 "base/logging.h"
 #include "base/strings/stringprintf.h"
 #include "base/time/time.h"
 #include "skia/ext/benchmarking_canvas.h"
 #include "third_party/skia/include/core/SkColorFilter.h"
 #include "third_party/skia/include/core/SkImageFilter.h"
@@ skipping 136 matching lines @@
 }
 
 WARN_UNUSED_RESULT
 scoped_ptr<base::Value> AsValue(const SkColorFilter& filter) {
   scoped_ptr<base::DictionaryValue> val(new base::DictionaryValue());
 
   if (unsigned flags = filter.getFlags()) {
     FlagsBuilder builder('|');
     builder.addFlag(flags & SkColorFilter::kAlphaUnchanged_Flag,
                     "kAlphaUnchanged_Flag");
-    builder.addFlag(flags & SkColorFilter::kHasFilter16_Flag,
-                    "kHasFilter16_Flag");
 
     val->SetString("flags", builder.str());
   }
 
   SkScalar color_matrix[20];
   if (filter.asColorMatrix(color_matrix)) {
     scoped_ptr<base::ListValue> color_matrix_val(new base::ListValue());
     for (unsigned i = 0; i < 20; ++i)
       color_matrix_val->Append(AsValue(color_matrix[i]).release());
 
@@ skipping 644 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