diff options
| author |  borenet <borenet@google.com> | 2014-09-24 11:03:35 -0700 |
|---|---|---|
| committer |  Commit bot <commit-bot@chromium.org> | 2014-09-24 11:03:35 -0700 |
| commit | 2456b7681aea8d91072186b17f8209955846f2f7 (patch) | |
| tree | 9dabc7c1da1747c5ceef289b14fa5f3ee5b56f46 /samplecode/SampleTextureDomain.cpp | |
| parent | d632ea4b9eec5be3f83a9fa4982a30202e1239a7 (diff) | |
Revert of SkCanvas::drawImage is the new way for drawing an SkImage to a Canvas (patchset #9 id:160001 of https://codereview.chromium.org/583453002/)
Reason for revert:
Broke ChromiumOS Ozone builder: http://build.chromium.org/p/chromium.chromiumos/builders/Linux%20ChromiumOS%20Ozone%20Builder/builds/4087/steps/compile/logs/stdio
Reverting to unblock DEPS roll.
Original issue's description:
> SkCanvas::drawImage is the new way for drawing a SkImage to a Canvas
>
> BUG=skia:2947
>
> Committed: https://skia.googlesource.com/skia/+/432789972c1e1f8a66165c75a250dba1853efa08
R=junov@chromium.org, reed@google.com, bsalomon@google.com, piotaixr@chromium.org
TBR=bsalomon@google.com, junov@chromium.org, piotaixr@chromium.org, reed@google.com
NOTREECHECKS=true
NOTRY=true
BUG=skia:2947
Author: borenet@google.com
Review URL: https://codereview.chromium.org/598133002
Diffstat (limited to 'samplecode/SampleTextureDomain.cpp')
| -rw-r--r-- | samplecode/SampleTextureDomain.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/samplecode/SampleTextureDomain.cpp b/samplecode/SampleTextureDomain.cpp index af511c7b03..926c5596b0 100644 --- a/samplecode/SampleTextureDomain.cpp +++ b/samplecode/SampleTextureDomain.cpp @@ -71,7 +71,7 @@ protected: srcRect.setXYWH(1, 1, 3, 3); dstRect.setXYWH(405, 5, 305, 305); - canvas->drawImageRect(image, &srcRect, dstRect, &paint); + image->draw(canvas, &srcRect, dstRect, &paint); // Test that bitmap blurring using a subrect // renders correctly @@ -83,7 +83,7 @@ protected: SkBlurMaskFilter::kHighQuality_BlurFlag | SkBlurMaskFilter::kIgnoreTransform_BlurFlag); paint.setMaskFilter(mf)->unref(); - canvas->drawImageRect(image, &srcRect, dstRect, &paint); + image->draw(canvas, &srcRect, dstRect, &paint); // Blur and a rotation + NULL src rect // This should not trigger the texture domain code |