diff options
author | scroggo <scroggo@google.com> | 2015-07-17 05:57:34 -0700 |
---|---|---|
committer | Commit bot <commit-bot@chromium.org> | 2015-07-17 05:57:34 -0700 |
commit | 91110195a2eee170c11885da9d16f94b00a39f87 (patch) | |
tree | 4dc22ce2b05e9cde0369d2f4d97bb18cd8d2f6aa /bench | |
parent | ac66a8122b27c388cc74b3913d9a9be351a44e54 (diff) |
Revert of guard to remove DrawBitmapRectFlags (patchset #1 id:1 of https://codereview.chromium.org/1235393003/)
Reason for revert:
breaking android framework build
Original issue's description:
> guard to remove DrawBitmapRectFlags
>
> BUG=skia:
>
> Committed: https://skia.googlesource.com/skia/+/6fb0b6779e40ce05c20cf279f0ecff31fa3cd60d
TBR=fmalita@chromium.org,djsollen@google.com,reed@chromium.org
NOPRESUBMIT=true
NOTREECHECKS=true
NOTRY=true
BUG=skia:
Review URL: https://codereview.chromium.org/1230823007
Diffstat (limited to 'bench')
-rw-r--r-- | bench/BitmapRectBench.cpp | 2 | ||||
-rw-r--r-- | bench/GameBench.cpp | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/bench/BitmapRectBench.cpp b/bench/BitmapRectBench.cpp index 596c18f5a9..d3a7574e04 100644 --- a/bench/BitmapRectBench.cpp +++ b/bench/BitmapRectBench.cpp @@ -96,7 +96,7 @@ protected: paint.setAlpha(fAlpha); for (int i = 0; i < loops; i++) { - canvas->drawBitmapRect(fBitmap, &fSrcR, fDstR, &paint); + canvas->drawBitmapRectToRect(fBitmap, &fSrcR, fDstR, &paint); } } diff --git a/bench/GameBench.cpp b/bench/GameBench.cpp index 3d9885f692..d9a397e190 100644 --- a/bench/GameBench.cpp +++ b/bench/GameBench.cpp @@ -204,11 +204,11 @@ protected: 4, verts, uvs, NULL, NULL, indices, 6, p2); } else { - canvas->drawBitmapRect(fAtlas, src, dst, &p, - SkCanvas::kFast_SrcRectConstraint); + canvas->drawBitmapRect(fAtlas, &src, dst, &p, + SkCanvas::kBleed_DrawBitmapRectFlag); } } else { - canvas->drawBitmapRect(fCheckerboard, dst, &p); + canvas->drawBitmapRect(fCheckerboard, NULL, dst, &p); } } } |