diff options
author | Stephen White <senorblanco@chromium.org> | 2018-05-26 18:07:27 +0000 |
---|---|---|
committer | Skia Commit-Bot <skia-commit-bot@chromium.org> | 2018-05-26 18:28:43 +0000 |
commit | 633f20ed34f99be198470edfaf6a5b03757cd50d (patch) | |
tree | fd15ac83cfc9106c2ce41422eea0f33446136a03 /gm | |
parent | 024317f75bc359ff810b3a48fe9ffe98fb896018 (diff) |
Revert "Add support for SkCanvas::kStrict_SrcRectConstraint to GrTextureOp."
This reverts commit a0047bcff704a9121a6d82a6f97d6124463a2e54.
Reason for revert: Possibly blocking the Chromium roll (layout tests)
Original change's description:
> Add support for SkCanvas::kStrict_SrcRectConstraint to GrTextureOp.
>
> Change-Id: I8faa2838b3110b8080ac48bbe223240e3fb22998
> Reviewed-on: https://skia-review.googlesource.com/129762
> Reviewed-by: Brian Osman <brianosman@google.com>
> Commit-Queue: Brian Salomon <bsalomon@google.com>
TBR=bsalomon@google.com,brianosman@google.com
# Not skipping CQ checks because original CL landed > 1 day ago.
Change-Id: If7ddf13d8a63bc1ab6a51a1395896282f3a31702
Reviewed-on: https://skia-review.googlesource.com/130304
Reviewed-by: Stephen White <senorblanco@chromium.org>
Commit-Queue: Stephen White <senorblanco@chromium.org>
Diffstat (limited to 'gm')
-rw-r--r-- | gm/perspimages.cpp | 34 |
1 files changed, 10 insertions, 24 deletions
diff --git a/gm/perspimages.cpp b/gm/perspimages.cpp index b4ad5eb9ae..a4242cf6f2 100644 --- a/gm/perspimages.cpp +++ b/gm/perspimages.cpp @@ -28,7 +28,7 @@ public: protected: SkString onShortName() override { return SkString("persp_images"); } - SkISize onISize() override { return SkISize::Make(1150, 1280); } + SkISize onISize() override { return SkISize::Make(1150, 880); } void onOnceBeforeDraw() override { fImages.push_back(make_image1()); @@ -60,13 +60,7 @@ protected: } canvas->translate(-bounds.fLeft + 10.f, -bounds.fTop + 10.f); canvas->save(); - enum class DrawType { - kDrawImage, - kDrawImageRectStrict, - kDrawImageRectFast, - }; - for (auto type : - {DrawType::kDrawImage, DrawType::kDrawImageRectStrict, DrawType::kDrawImageRectFast}) { + for (auto subrect : {false, true}) { for (const auto& m : matrices) { for (auto aa : {false, true}) { paint.setAntiAlias(aa); @@ -76,22 +70,14 @@ protected: paint.setFilterQuality(filter); canvas->save(); canvas->concat(m); - SkRect src = {img->width() / 4.f, img->height() / 4.f, - 3.f * img->width() / 4.f, 3.f * img->height() / 4}; - SkRect dst = {0, 0, - 3.f / 4.f * img->width(), 3.f / 4.f * img->height()}; - switch (type) { - case DrawType::kDrawImage: - canvas->drawImage(img, 0, 0, &paint); - break; - case DrawType::kDrawImageRectStrict: - canvas->drawImageRect(img, src, dst, &paint, - SkCanvas::kStrict_SrcRectConstraint); - break; - case DrawType::kDrawImageRectFast: - canvas->drawImageRect(img, src, dst, &paint, - SkCanvas::kFast_SrcRectConstraint); - break; + if (subrect) { + SkRect src = {img->width() / 4.f, img->height() / 4.f, + 3.f * img->width() / 4.f, 3.f * img->height() / 4}; + SkRect dst = {0, 0, + 3.f / 4.f * img->width(), 3.f / 4.f * img->height()}; + canvas->drawImageRect(img, src, dst, &paint); + } else { + canvas->drawImage(img, 0, 0, &paint); } canvas->restore(); ++n; |