Roll Skia to 7b971f0152299ae9a924252a9bfd220318497bdd

skia/ext/analysis_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/trace_event/trace_event.h"
 #include "skia/ext/analysis_canvas.h"
 #include "third_party/skia/include/core/SkDraw.h"
 #include "third_party/skia/include/core/SkRRect.h"
 #include "third_party/skia/include/core/SkShader.h"
@@ skipping 307 matching lines @@
     *color = SK_ColorTRANSPARENT;
     return true;
   }
   if (is_solid_color_) {
     *color = color_;
     return true;
   }
   return false;
 }
 
-bool AnalysisCanvas::abortDrawing() {
+bool AnalysisCanvas::abort() {
   // Early out as soon as we have more than one draw op.
   // TODO(vmpstr): Investigate if 1 is the correct metric here. We need to
   // balance the amount of time we spend analyzing vs how many tiles would be
   // solid if the number was higher.
   if (draw_op_count_ > 1) {
     // We have to reset solid/transparent state to false since we don't
     // know whether consequent operations will make this false.
     is_solid_color_ = false;
     is_transparent_ = false;
     return true;
@@ skipping 105 matching lines @@
       force_not_transparent_stack_level_ = kNoLayer;
     }
   }
 
   INHERITED::willRestore();
 }
 
 }  // namespace skia