diff options
| author | robertphillips@google.com <robertphillips@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-06-12 18:29:02 +0000 |
|---|---|---|
| committer | robertphillips@google.com <robertphillips@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-06-12 18:29:02 +0000 |
| commit | 151f36878fa4def448573e3dbe591cb625b7e4cb (patch) | |
| tree | fc4016ee28b0a56b46abb17e565f8bfa317182e5 /cc/resources | |
| parent | a9c64d483ed30cf805cdb11a63c2065fbc26dccf (diff) | |
| download | chromium_src-151f36878fa4def448573e3dbe591cb625b7e4cb.zip chromium_src-151f36878fa4def448573e3dbe591cb625b7e4cb.tar.gz chromium_src-151f36878fa4def448573e3dbe591cb625b7e4cb.tar.bz2 | |
Remove use of kUsePathBoundsForClip_RecordingFlag
The behavior once invoked by the
SkPicture::kUsePathBoundsForClip_RecordingFlag is now
the default so this flag is going away.
Skia 9f1c241e
(Remove SkPicture::kUsePathBoundsForClip_RecordingFlag -
https://codereview.chromium.org/316143003/)
cc: enne@
skia: fmalita@
Review URL: https://codereview.chromium.org/322123002
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@276754 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'cc/resources')
| -rw-r--r-- | cc/resources/picture.cc | 10 | ||||
| -rw-r--r-- | cc/resources/picture_pile_impl.cc | 5 |
2 files changed, 4 insertions, 11 deletions
diff --git a/cc/resources/picture.cc b/cc/resources/picture.cc index 7147a15..dd37418 100644 --- a/cc/resources/picture.cc +++ b/cc/resources/picture.cc @@ -267,11 +267,8 @@ void Picture::Record(ContentLayerClient* painter, scoped_ptr<EXPERIMENTAL::SkRecording> recording; skia::RefPtr<SkCanvas> canvas; - canvas = skia::SharePtr( - recorder.beginRecording(layer_rect_.width(), - layer_rect_.height(), - &factory, - SkPicture::kUsePathBoundsForClip_RecordingFlag)); + canvas = skia::SharePtr(recorder.beginRecording( + layer_rect_.width(), layer_rect_.height(), &factory)); ContentLayerClient::GraphicsContextStatus graphics_context_status = ContentLayerClient::GRAPHICS_CONTEXT_ENABLED; @@ -448,8 +445,7 @@ scoped_ptr<base::Value> Picture::AsValue() const { skia::RefPtr<SkCanvas> canvas(skia::SharePtr(recorder.beginRecording( layer_rect_.width(), layer_rect_.height(), - NULL, // Default (no) bounding-box hierarchy is fastest. - SkPicture::kUsePathBoundsForClip_RecordingFlag))); + NULL))); // Default (no) bounding-box hierarchy is fastest. playback_->draw(canvas.get()); skia::RefPtr<SkPicture> picture(skia::AdoptRef(recorder.endRecording())); picture->serialize(&stream, &EncodeBitmap); diff --git a/cc/resources/picture_pile_impl.cc b/cc/resources/picture_pile_impl.cc index bb46747..2b9d094 100644 --- a/cc/resources/picture_pile_impl.cc +++ b/cc/resources/picture_pile_impl.cc @@ -348,10 +348,7 @@ skia::RefPtr<SkPicture> PicturePileImpl::GetFlattenedPicture() { gfx::Rect tiling_rect(tiling_.tiling_rect()); SkPictureRecorder recorder; SkCanvas* canvas = - recorder.beginRecording(tiling_rect.width(), - tiling_rect.height(), - NULL, - SkPicture::kUsePathBoundsForClip_RecordingFlag); + recorder.beginRecording(tiling_rect.width(), tiling_rect.height()); if (!tiling_rect.IsEmpty()) RasterToBitmap(canvas, tiling_rect, 1.0, NULL); skia::RefPtr<SkPicture> picture = skia::AdoptRef(recorder.endRecording()); |