diff options
| author |  robertphillips <robertphillips@google.com> | 2016-07-13 13:27:16 -0700 |
|---|---|---|
| committer |  Commit bot <commit-bot@chromium.org> | 2016-07-13 13:27:16 -0700 |
| commit | dda54455a20dcd89de610bdb80e4a8e9137b80a4 (patch) | |
| tree | 5c578a4207775bb102080fb304802ec43926de36 /gm/multipicturedraw.cpp | |
| parent | e92badc3ffce83668f76fcfa33a49784346cab1e (diff) | |
Remove GrLayerHoister
This relies on https://codereview.chromium.org/1944013002/ (Add legacy flag to allow Skia to remove Ganesh layer hoister) landing first so as to not break the DEPS roll.
GOLD_TRYBOT_URL= https://gold.skia.org/search2?unt=true&query=source_type%3Dgm&master=false&issue=1950523002
Review-Url: https://codereview.chromium.org/1950523002
Diffstat (limited to 'gm/multipicturedraw.cpp')
| -rw-r--r-- | gm/multipicturedraw.cpp | 18 |
1 files changed, 6 insertions, 12 deletions
diff --git a/gm/multipicturedraw.cpp b/gm/multipicturedraw.cpp index 787646f6d8..83b0d5b86a 100644 --- a/gm/multipicturedraw.cpp +++ b/gm/multipicturedraw.cpp @@ -59,8 +59,7 @@ static sk_sp<SkPicture> make_hex_plane_picture(SkColor fillColor) { SkCanvas* canvas = recorder.beginRecording(SkIntToScalar(kPicWidth), SkIntToScalar(kPicHeight), - &bbhFactory, - SkPictureRecorder::kComputeSaveLayerInfo_RecordFlag); + &bbhFactory); SkScalar xPos, yPos = 0; @@ -108,8 +107,7 @@ static sk_sp<SkPicture> make_single_layer_hex_plane_picture() { SkRTreeFactory bbhFactory; static const SkScalar kBig = 10000.0f; - SkCanvas* canvas = recorder.beginRecording(kBig, kBig, &bbhFactory, - SkPictureRecorder::kComputeSaveLayerInfo_RecordFlag); + SkCanvas* canvas = recorder.beginRecording(kBig, kBig, &bbhFactory); canvas->saveLayer(nullptr, nullptr); @@ -165,8 +163,7 @@ static sk_sp<SkPicture> make_tri_picture() { SkCanvas* canvas = recorder.beginRecording(SkIntToScalar(kPicWidth), SkIntToScalar(kPicHeight), - &bbhFactory, - SkPictureRecorder::kComputeSaveLayerInfo_RecordFlag); + &bbhFactory); SkRect r = tri.getBounds(); r.outset(2.0f, 2.0f); // outset for stroke canvas->clipRect(r); @@ -185,8 +182,7 @@ static sk_sp<SkPicture> make_sub_picture(const SkPicture* tri) { SkCanvas* canvas = recorder.beginRecording(SkIntToScalar(kPicWidth), SkIntToScalar(kPicHeight), - &bbhFactory, - SkPictureRecorder::kComputeSaveLayerInfo_RecordFlag); + &bbhFactory); canvas->scale(1.0f/2.0f, 1.0f/2.0f); @@ -220,8 +216,7 @@ static sk_sp<SkPicture> make_sierpinski_picture() { SkCanvas* canvas = recorder.beginRecording(SkIntToScalar(kPicWidth), SkIntToScalar(kPicHeight), - &bbhFactory, - SkPictureRecorder::kComputeSaveLayerInfo_RecordFlag); + &bbhFactory); static const int kNumLevels = 4; for (int i = 0; i < kNumLevels; ++i) { @@ -362,8 +357,7 @@ static void create_content(SkMultiPictureDraw* mpd, PFContentMtd pfGen, SkCanvas* pictureCanvas = recorder.beginRecording(SkIntToScalar(kPicWidth), SkIntToScalar(kPicHeight), - &bbhFactory, - SkPictureRecorder::kComputeSaveLayerInfo_RecordFlag); + &bbhFactory); (*pfGen)(pictureCanvas, pictures); |