Fix copy-paste bugs in SkCanvas Nine and Lattice

Fix copy-paste bugs in SkCanvas Nine and Lattice

BUG=skia:
GOLD_TRYBOT_URL= https://gold.skia.org/search?issue=2203983002

Committed: https://skia.googlesource.com/skia/+/552bca9afadd81d263041d04e2605d8d897940b6

[msarett, 2016-08-02 21:46:27]

Description was changed from

==========
Fix copy-paste bugs in SkCanvas Nine and Lattice

BUG=skia:
==========

to

==========
Fix copy-paste bugs in SkCanvas Nine and Lattice

BUG=skia:
GOLD_TRYBOT_URL= https://gold.skia.org/search?issue=2203983002
==========

[msarett, 2016-08-02 21:47:47]

msarett@google.com changed reviewers:
+ reed@google.com

[msarett, 2016-08-02 21:47:48]

https://codereview.chromium.org/2203983002/diff/1/src/core/SkCanvas.cpp
File src/core/SkCanvas.cpp (right):

https://codereview.chromium.org/2203983002/diff/1/src/core/SkCanvas.cpp#newco...
src/core/SkCanvas.cpp:1989: return this->drawImageRect(image, dst, paint);
I think this is a bug?

https://codereview.chromium.org/2203983002/diff/1/src/core/SkCanvas.cpp#newco...
src/core/SkCanvas.cpp:2026: return this->drawBitmapRect(bitmap, dst, paint);
Ditto

https://codereview.chromium.org/2203983002/diff/1/src/core/SkCanvas.cpp#newco...
src/core/SkCanvas.cpp:2044: return this->drawImageRect(image, dst, paint);
Pretty sure this is a bug, since I wrote it...

[reed1, 2016-08-03 13:13:05]

good catch.

https://codereview.chromium.org/2203983002/diff/1/src/core/SkCanvas.cpp
File src/core/SkCanvas.cpp (right):

https://codereview.chromium.org/2203983002/diff/1/src/core/SkCanvas.cpp#newco...
src/core/SkCanvas.cpp:1989: return this->drawImageRect(image, dst, paint);
On 2016/08/02 21:47:48, msarett wrote:
> I think this is a bug?

return void is odd. How about

if (Valid) {
    this->onDrawImageNine
} else {
    this->drawImageRect
}

https://codereview.chromium.org/2203983002/diff/1/src/core/SkCanvas.cpp#newco...
src/core/SkCanvas.cpp:2026: return this->drawBitmapRect(bitmap, dst, paint);
On 2016/08/02 21:47:48, msarett wrote:
> Ditto

ditto

[msarett, 2016-08-03 13:20:52]

https://codereview.chromium.org/2203983002/diff/1/src/core/SkCanvas.cpp
File src/core/SkCanvas.cpp (right):

https://codereview.chromium.org/2203983002/diff/1/src/core/SkCanvas.cpp#newco...
src/core/SkCanvas.cpp:1989: return this->drawImageRect(image, dst, paint);
On 2016/08/03 13:13:05, reed1 wrote:
> On 2016/08/02 21:47:48, msarett wrote:
> > I think this is a bug?
> 
> return void is odd. How about
> 
> if (Valid) {
>     this->onDrawImageNine
> } else {
>     this->drawImageRect
> }

Done.

https://codereview.chromium.org/2203983002/diff/1/src/core/SkCanvas.cpp#newco...
src/core/SkCanvas.cpp:2026: return this->drawBitmapRect(bitmap, dst, paint);
On 2016/08/03 13:13:05, reed1 wrote:
> On 2016/08/02 21:47:48, msarett wrote:
> > Ditto
> 
> ditto

Done.

https://codereview.chromium.org/2203983002/diff/1/src/core/SkCanvas.cpp#newco...
src/core/SkCanvas.cpp:2044: return this->drawImageRect(image, dst, paint);
On 2016/08/02 21:47:48, msarett wrote:
> Pretty sure this is a bug, since I wrote it...

Done.

[reed1, 2016-08-03 13:30:48]

lgtm

[msarett, 2016-08-03 13:33:10]

The CQ bit was checked by msarett@google.com

[commit-bot: I haz the power, 2016-08-03 13:33:17]

CQ is trying da patch. Follow status at
 
https://chromium-cq-status.appspot.com/v2/patch-status/codereview.chromium.or...

[commit-bot: I haz the power, 2016-08-03 13:53:29]

Description was changed from

==========
Fix copy-paste bugs in SkCanvas Nine and Lattice

BUG=skia:
GOLD_TRYBOT_URL= https://gold.skia.org/search?issue=2203983002
==========

to

==========
Fix copy-paste bugs in SkCanvas Nine and Lattice

BUG=skia:
GOLD_TRYBOT_URL= https://gold.skia.org/search?issue=2203983002

Committed:
https://skia.googlesource.com/skia/+/552bca9afadd81d263041d04e2605d8d897940b6
==========

[commit-bot: I haz the power, 2016-08-03 13:53:30]

Committed patchset #2 (id:20001) as
https://skia.googlesource.com/skia/+/552bca9afadd81d263041d04e2605d8d897940b6