Ensure conservative raster clipping for AnalysisCanvas

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/SkPath.h"
 #include "third_party/skia/include/core/SkRRect.h"
@@ skipping 314 matching lines @@
                                     SkBlendMode bmode,
                                     const uint16_t indices[],
                                     int index_count,
                                     const SkPaint& paint) {
   TRACE_EVENT0("disabled-by-default-skia", "AnalysisCanvas::onDrawVertices");
   is_solid_color_ = false;
   is_transparent_ = false;
   ++draw_op_count_;
 }
 
-// Needed for now, since SkCanvas requires a bitmap, even if it is not backed
-// by any pixels
-static SkBitmap MakeEmptyBitmap(int width, int height) {
-  SkBitmap bitmap;
-  bitmap.setInfo(SkImageInfo::MakeUnknown(width, height));
-  return bitmap;
-}
-
 AnalysisCanvas::AnalysisCanvas(int width, int height)
-    : INHERITED(MakeEmptyBitmap(width, height)),
+    : INHERITED(width, height),
       saved_stack_size_(0),
       force_not_solid_stack_level_(kNoLayer),
       force_not_transparent_stack_level_(kNoLayer),
       is_forced_not_solid_(false),
       is_forced_not_transparent_(false),
       is_solid_color_(true),
       color_(SK_ColorTRANSPARENT),
       is_transparent_(true),
       draw_op_count_(0),
-      rejected_op_count_(0) {
-}
+      rejected_op_count_(0) {}
 
 AnalysisCanvas::~AnalysisCanvas() {}
 
 bool AnalysisCanvas::GetColorIfSolid(SkColor* color) const {
   if (is_transparent_) {
     *color = SK_ColorTRANSPARENT;
     return true;
   }
   if (is_solid_color_) {
     *color = color_;
@@ skipping 150 matching lines @@
       force_not_transparent_stack_level_ = kNoLayer;
     }
   }
 
   INHERITED::willRestore();
 }
 
 }  // namespace skia