diff options
| author |  kjlubick <kjlubick@google.com> | 2016-02-11 12:05:24 -0800 |
|---|---|---|
| committer |  Commit bot <commit-bot@chromium.org> | 2016-02-11 12:05:24 -0800 |
| commit | 0eed945294fa0b2dee7d971c16dc9beefab2ec1c (patch) | |
| tree | 3eab5f804aa31631465e6955b8eec9d43896674f /src/gpu/GrDrawContext.cpp | |
| parent | 27004b7e653a38570d3fd1621ed0107e5443b31a (diff) | |
Revert of Make copySurface work for texture dsts, return a bool, & add unit test. (patchset #6 id:100001 of https://codereview.chromium.org/1684313002/ )
Reason for revert:
Copy surface tests are not happy for Windows, Android and probably others:
https://uberchromegw.corp.google.com/i/client.skia.android/builders/Test-Android-GCC-Nexus7-GPU-Tegra3-Arm7-Release/builds/4161
https://uberchromegw.corp.google.com/i/client.skia/builders/Test-Win8-MSVC-ShuttleA-GPU-GTX960-x86_64-Release/builds/3694
Original issue's description:
> Make copySurface work for texture dsts, return a bool, & add unit test.
> GOLD_TRYBOT_URL= https://gold.skia.org/search2?unt=true&query=source_type%3Dgm&master=false&issue=1684313002
>
> Committed: https://skia.googlesource.com/skia/+/7ea5e28065e5eb797e95f5d81c1a65cf3209d741
TBR=robertphillips@google.com,bsalomon@google.com
# Skipping CQ checks because original CL landed less than 1 days ago.
NOPRESUBMIT=true
NOTREECHECKS=true
NOTRY=true
Review URL: https://codereview.chromium.org/1690053002
Diffstat (limited to 'src/gpu/GrDrawContext.cpp')
| -rw-r--r-- | src/gpu/GrDrawContext.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/gpu/GrDrawContext.cpp b/src/gpu/GrDrawContext.cpp index d971f58ece..f37c48c9f3 100644 --- a/src/gpu/GrDrawContext.cpp +++ b/src/gpu/GrDrawContext.cpp @@ -97,13 +97,13 @@ GrDrawTarget* GrDrawContext::getDrawTarget() { return fDrawTarget; } -bool GrDrawContext::copySurface(GrSurface* src, const SkIRect& srcRect, const SkIPoint& dstPoint) { +void GrDrawContext::copySurface(GrSurface* src, const SkIRect& srcRect, const SkIPoint& dstPoint) { ASSERT_SINGLE_OWNER - RETURN_FALSE_IF_ABANDONED + RETURN_IF_ABANDONED SkDEBUGCODE(this->validate();) GR_AUDIT_TRAIL_AUTO_FRAME(fAuditTrail, "GrDrawContext::copySurface"); - return this->getDrawTarget()->copySurface(fRenderTarget, src, srcRect, dstPoint); + this->getDrawTarget()->copySurface(fRenderTarget, src, srcRect, dstPoint); } void GrDrawContext::drawText(const GrClip& clip, const GrPaint& grPaint, |