Moving updateClipConservativelyUsingBounds into SkCanvas

src/utils/SkPictureUtils.cpp

 /*
  * Copyright 2012 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 #include "SkPictureUtils.h"
 #include "SkCanvas.h"
 #include "SkData.h"
@@ skipping 162 matching lines @@
     // disable aa for speed
     virtual bool clipRect(const SkRect& rect, SkRegion::Op op,
                           bool doAA) SK_OVERRIDE {
         return this->INHERITED::clipRect(rect, op, false);
     }
 
     // for speed, just respect the bounds, and disable AA. May give us a few
     // false positives and negatives.
     virtual bool clipPath(const SkPath& path, SkRegion::Op op,
                           bool doAA) SK_OVERRIDE {
-        return this->INHERITED::clipRect(path.getBounds(), op, false);
+        return this->updateClipConservativelyUsingBounds(path.getBounds(), op, path.isInverseFillType());
     }
     virtual bool clipRRect(const SkRRect& rrect, SkRegion::Op op,
                            bool doAA) SK_OVERRIDE {
-        return this->INHERITED::clipRect(rrect.getBounds(), op, false);
+        return this->updateClipConservativelyUsingBounds(rrect.getBounds(), op, false);
     }
 
 private:
     typedef SkCanvas INHERITED;
 };
 
 SkData* SkPictureUtils::GatherPixelRefs(SkPicture* pict, const SkRect& area) {
     if (NULL == pict) {
         return NULL;
     }
@@ skipping 18 matching lines @@
     canvas.clipRect(area, SkRegion::kIntersect_Op, false);
     canvas.drawPicture(*pict);
 
     SkData* data = NULL;
     int count = array.count();
     if (count > 0) {
         data = SkData::NewFromMalloc(array.detach(), count * sizeof(SkPixelRef*));
     }
     return data;
 }