Fix SkAndroidSDKCanvas virtuals

Fix SkAndroidSDKCanvas virtuals

Catch Android Framework-only code up to a change made in the
SkCanvas signature.

R=scroggo@google.com,reed@google.com

Committed: https://skia.googlesource.com/skia/+/b97e9091510ec4bb174bc8bae25a9796aa70c1e2

[tomhudson, 2015-05-26 20:21:09]

PTAL; since the signature is flip-flopping back and forth it's not quite
trivial.

[scroggo, 2015-05-26 20:29:29]

lgtm

On 2015/05/26 20:21:09, tomhudson wrote:
> PTAL; since the signature is flip-flopping back and forth it's not quite
> trivial.

What is not trivial? This CL seems fairly straightforward (or is it
flip-flopping in time?)

https://codereview.chromium.org/1151673004/diff/20001/src/utils/android/SkAnd...
File src/utils/android/SkAndroidSDKCanvas.cpp (right):

https://codereview.chromium.org/1151673004/diff/20001/src/utils/android/SkAnd...
src/utils/android/SkAndroidSDKCanvas.cpp:276: bool
SkAndroidSDKCanvas::onPeekPixels(SkPixmap* data) {
nit: data seems a little vague. Why not "pmap"?

https://codereview.chromium.org/1151673004/diff/20001/src/utils/android/SkAnd...
src/utils/android/SkAndroidSDKCanvas.cpp:280: if (data) {
I think the pixmap will always be non-null?

https://codereview.chromium.org/1151673004/diff/20001/src/utils/android/SkAnd...
src/utils/android/SkAndroidSDKCanvas.cpp:289: bool
SkAndroidSDKCanvas::onAccessTopLayerPixels(SkPixmap* data) {
Same comments for this method.

[reed1, 2015-05-26 20:53:22]

https://codereview.chromium.org/1151673004/diff/20001/src/utils/android/SkAnd...
File src/utils/android/SkAndroidSDKCanvas.cpp (right):

https://codereview.chromium.org/1151673004/diff/20001/src/utils/android/SkAnd...
src/utils/android/SkAndroidSDKCanvas.cpp:280: if (data) {
should be 

if (addr) {

https://codereview.chromium.org/1151673004/diff/20001/src/utils/android/SkAnd...
src/utils/android/SkAndroidSDKCanvas.cpp:282: if (addr) {
this check of addr is unneeded

[tomhudson, 2015-05-26 21:00:47]

The CQ bit was checked by tomhudson@google.com

[tomhudson, 2015-05-26 21:00:47]

The patchset sent to the CQ was uploaded after l-g-t-m from scroggo@google.com
Link to the patchset: https://codereview.chromium.org/1151673004/#ps40001
(title: "Reviews")

[scroggo, 2015-05-26 21:00:53]

LGTM, patch set 2

[commit-bot: I haz the power, 2015-05-26 21:01:01]

CQ is trying da patch. Follow status at
 https://chromium-cq-status.appspot.com/patch-status/1151673004/40001

[commit-bot: I haz the power, 2015-05-26 21:12:29]

Committed patchset #3 (id:40001) as
https://skia.googlesource.com/skia/+/b97e9091510ec4bb174bc8bae25a9796aa70c1e2