Revert of skia/ext: Early out from analysis when we have more than 1 draw op.

skia/ext/analysis_canvas.h

 // 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.
 
 #ifndef SKIA_EXT_ANALYSIS_CANVAS_H_
 #define SKIA_EXT_ANALYSIS_CANVAS_H_
 
 #include "base/compiler_specific.h"
 #include "third_party/skia/include/core/SkCanvas.h"
 #include "third_party/skia/include/core/SkPicture.h"
 
 namespace skia {
 
 // Does not render anything, but gathers statistics about a region
 // (specified as a clip rectangle) of an SkPicture as the picture is
 // played back through it.
 // To use: play a picture into the canvas, and then check result.
 class SK_API AnalysisCanvas : public SkCanvas, public SkDrawPictureCallback {
  public:
   AnalysisCanvas(int width, int height);
   virtual ~AnalysisCanvas();
 
   // Returns true when a SkColor can be used to represent result.
   bool GetColorIfSolid(SkColor* color) const;
+  bool HasText() const;
 
   void SetForceNotSolid(bool flag);
   void SetForceNotTransparent(bool flag);
 
   // SkDrawPictureCallback override.
   virtual bool abortDrawing() OVERRIDE;
 
   // SkCanvas overrides.
   virtual void clear(SkColor) OVERRIDE;
   virtual void drawPaint(const SkPaint& paint) OVERRIDE;
@@ skipping 78 matching lines @@
 
   int saved_stack_size_;
   int force_not_solid_stack_level_;
   int force_not_transparent_stack_level_;
 
   bool is_forced_not_solid_;
   bool is_forced_not_transparent_;
   bool is_solid_color_;
   SkColor color_;
   bool is_transparent_;
-  int draw_op_count_;
+  bool has_text_;
 };
 
 }  // namespace skia
 
 #endif  // SKIA_EXT_ANALYSIS_CANVAS_H_