Remove SkPicture::kUsePathBoundsForClip_RecordingFlag

src/core/SkPictureRecord.cpp

Index: src/core/SkPictureRecord.cpp
diff --git a/src/core/SkPictureRecord.cpp b/src/core/SkPictureRecord.cpp
index 0c59b13b8699fbbfa48f3730f9f29c8c780daaff..1a1aecc6007dae75c977078186434c1d855f18d6 100644
--- a/src/core/SkPictureRecord.cpp
+++ b/src/core/SkPictureRecord.cpp
@@ -863,11 +863,7 @@ void SkPictureRecord::onClipRRect(const SkRRect& rrect, SkRegion::Op op, ClipEdg
 #else
     this->recordClipRRect(rrect, op, kSoft_ClipEdgeStyle == edgeStyle);
 #endif
-    if (fRecordFlags & SkPicture::kUsePathBoundsForClip_RecordingFlag) {
-        this->updateClipConservativelyUsingBounds(rrect.getBounds(), op, false);
-    } else {
-        this->INHERITED::onClipRRect(rrect, op, edgeStyle);
-    }
+    this->updateClipConservativelyUsingBounds(rrect.getBounds(), op, false);

[scroggo, 2014/06/05 17:58:16]

So if I understand this correctly, the playback will still clip to the RRect on
draw thanks to recordClipRRect above, but this will use the bounds for quick
reject, so it may *not* reject some things that it could have, in order to go
faster?

If that is an overall win for Chrome, I don't see how it could be harmful to
Android.

[robertphillips, 2014/06/05 18:40:23]

Right - it records the original clip and then updates the raster clip using the
bounding box of the path rather then the path itself. The clip is updated
conservatively (based on the operation) to create a clip that is qualitatively
the same.

From Android's perspective it does alter the contract of all the Canvas::clip*
methods in that their return value will be more conservative (e.g., they may
actually report the clip is open even though a more careful accounting would
label it closed). Additionally the contracts of the Canvas getClipBounds and
quickReject entry points would be changed (i.e., their answers would be more
conservative).

 }
 
 size_t SkPictureRecord::recordClipRRect(const SkRRect& rrect, SkRegion::Op op, bool doAA) {
@@ -899,12 +895,8 @@ void SkPictureRecord::onClipPath(const SkPath& path, SkRegion::Op op, ClipEdgeSt
     this->recordClipPath(pathID, op, kSoft_ClipEdgeStyle == edgeStyle);
 #endif
 
-    if (fRecordFlags & SkPicture::kUsePathBoundsForClip_RecordingFlag) {
-        this->updateClipConservativelyUsingBounds(path.getBounds(), op,
-                                                  path.isInverseFillType());
-    } else {
-        this->INHERITED::onClipPath(path, op, edgeStyle);
-    }
+    this->updateClipConservativelyUsingBounds(path.getBounds(), op,
+                                              path.isInverseFillType());
 }
 
 size_t SkPictureRecord::recordClipPath(int pathID, SkRegion::Op op, bool doAA) {