Upstream changes from Android.

Upstream changes from Android.

Committed: https://code.google.com/p/skia/source/detail?r=8045

[djsollen, 2013-03-08 15:46:57]

separated the core changes from the images ones.

[reed1, 2013-03-08 16:00:39]

looking very close. adding ben for scalercontext change.

https://codereview.chromium.org/12699002/diff/1/include/core/SkBitmap.h
File include/core/SkBitmap.h (right):

https://codereview.chromium.org/12699002/diff/1/include/core/SkBitmap.h#newco...
include/core/SkBitmap.h:549: 
A comment about what the heck this is would be nice, but not required (if you
don't know)

https://codereview.chromium.org/12699002/diff/1/include/core/SkBitmap.h#newco...
include/core/SkBitmap.h:665: #ifdef SK_BUILD_FOR_ANDROID
Can this just be an added bit to Flags, so we don't have to add another field?
Should make updating operator== and operator= easier too.

https://codereview.chromium.org/12699002/diff/1/include/core/SkRRect.h
File include/core/SkRRect.h (right):

https://codereview.chromium.org/12699002/diff/1/include/core/SkRRect.h#newcod...
include/core/SkRRect.h:190: return a.fRect == b.fRect &&
use asScalars() instead of the casts.

[robertphillips, 2013-03-08 16:20:15]

nits

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

https://codereview.chromium.org/12699002/diff/1/src/core/SkScalerContext.cpp#...
src/core/SkScalerContext.cpp:201: SkFontID
SkScalerContext::findTypefaceIdForChar(SkUnichar uni) {
Indentation

https://codereview.chromium.org/12699002/diff/1/src/core/SkScalerContext.cpp#...
src/core/SkScalerContext.cpp:202: SkScalerContext* ctx =
this->getContextFromChar(uni, NULL);
NULL !=

https://codereview.chromium.org/12699002/diff/1/src/core/SkScalerContext.cpp#...
src/core/SkScalerContext.cpp:217: SkScalerContext* ctx =
this->getContextFromChar(uni, NULL);
NULL != ctx

https://codereview.chromium.org/12699002/diff/1/src/core/SkScalerContext.cpp#...
src/core/SkScalerContext.cpp:233: SkScalerContext* ctx =
this->getContextFromChar(uni, &tempID);
NULL ==

https://codereview.chromium.org/12699002/diff/1/src/core/SkScalerContext.h
File src/core/SkScalerContext.h (right):

https://codereview.chromium.org/12699002/diff/1/src/core/SkScalerContext.h#ne...
src/core/SkScalerContext.h:238: 
not -> no

[djsollen, 2013-03-08 16:25:37]

https://codereview.chromium.org/12699002/diff/1/include/core/SkBitmap.h
File include/core/SkBitmap.h (right):

https://codereview.chromium.org/12699002/diff/1/include/core/SkBitmap.h#newco...
include/core/SkBitmap.h:549: 
On 2013/03/08 16:00:39, reed1 wrote:
> A comment about what the heck this is would be nice, but not required (if you
> don't know)

Done.

https://codereview.chromium.org/12699002/diff/1/include/core/SkBitmap.h#newco...
include/core/SkBitmap.h:665: #ifdef SK_BUILD_FOR_ANDROID
On 2013/03/08 16:00:39, reed1 wrote:
> Can this just be an added bit to Flags, so we don't have to add another field?
> Should make updating operator== and operator= easier too.

Done.

https://codereview.chromium.org/12699002/diff/1/include/core/SkRRect.h
File include/core/SkRRect.h (right):

https://codereview.chromium.org/12699002/diff/1/include/core/SkRRect.h#newcod...
include/core/SkRRect.h:190: return a.fRect == b.fRect &&
On 2013/03/08 16:00:39, reed1 wrote:
> use asScalars() instead of the casts.

Done.

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

https://codereview.chromium.org/12699002/diff/1/src/core/SkScalerContext.cpp#...
src/core/SkScalerContext.cpp:201: SkFontID
SkScalerContext::findTypefaceIdForChar(SkUnichar uni) {
On 2013/03/08 16:20:15, robertphillips wrote:
> Indentation

Done.

https://codereview.chromium.org/12699002/diff/1/src/core/SkScalerContext.cpp#...
src/core/SkScalerContext.cpp:202: SkScalerContext* ctx =
this->getContextFromChar(uni, NULL);
On 2013/03/08 16:20:15, robertphillips wrote:
> NULL !=

Done.

https://codereview.chromium.org/12699002/diff/1/src/core/SkScalerContext.cpp#...
src/core/SkScalerContext.cpp:217: SkScalerContext* ctx =
this->getContextFromChar(uni, NULL);
On 2013/03/08 16:20:15, robertphillips wrote:
> NULL != ctx

Done.

https://codereview.chromium.org/12699002/diff/1/src/core/SkScalerContext.cpp#...
src/core/SkScalerContext.cpp:233: SkScalerContext* ctx =
this->getContextFromChar(uni, &tempID);
On 2013/03/08 16:20:15, robertphillips wrote:
> NULL ==

Done.

https://codereview.chromium.org/12699002/diff/1/src/core/SkScalerContext.h
File src/core/SkScalerContext.h (right):

https://codereview.chromium.org/12699002/diff/1/src/core/SkScalerContext.h#ne...
src/core/SkScalerContext.h:238: 
On 2013/03/08 16:20:15, robertphillips wrote:
> not -> no

Done.

[robertphillips, 2013-03-08 18:27:49]

lgtm

[commit-bot: I haz the power, 2013-03-08 18:31:58]

CQ is trying da patch. Follow status at
https://skia-tree-status.appspot.com/cq/djsollen@google.com/12699002/12001

[commit-bot: I haz the power, 2013-03-08 18:32:07]

Presubmit check for 12699002-12001 failed and returned exit status 1.

INFO:root:Found 11 file(s).
Running presubmit commit checks ...
Running /b/commit-queue/workdir/skia/PRESUBMIT.py

** Presubmit Warnings **
Tree state is: caution

***************
Tree is caution : Letting bench bots (hopefully) cycle green
http://skia-tree-status.appspot.com/banner-status?format=json
***************

[commit-bot: I haz the power, 2013-03-08 18:32:19]

CQ is trying da patch. Follow status at
https://skia-tree-status.appspot.com/cq/djsollen@google.com/12699002/12001

[commit-bot: I haz the power, 2013-03-08 18:32:22]

Presubmit check for 12699002-12001 failed and returned exit status 1.

INFO:root:Found 11 file(s).
Running presubmit commit checks ...
Running /b/commit-queue/workdir/skia/PRESUBMIT.py

** Presubmit Warnings **
Tree state is: caution

***************
Tree is caution : Letting bench bots (hopefully) cycle green
http://skia-tree-status.appspot.com/banner-status?format=json
***************

[commit-bot: I haz the power, 2013-03-08 18:33:04]

CQ is trying da patch. Follow status at
https://skia-tree-status.appspot.com/cq/djsollen@google.com/12699002/12001

[commit-bot: I haz the power, 2013-03-08 18:33:14]

Presubmit check for 12699002-12001 failed and returned exit status 1.

INFO:root:Found 11 file(s).
Running presubmit commit checks ...
Running /b/commit-queue/workdir/skia/PRESUBMIT.py

** Presubmit Warnings **
Tree state is: caution

***************
Tree is caution : Letting bench bots (hopefully) cycle green
http://skia-tree-status.appspot.com/banner-status?format=json
***************

Was the presubmit check useful? Please send feedback & hate mail to
maruel@chromium.org!

[djsollen, 2013-03-08 18:35:23]

Committed patchset #3 manually as r8045 (presubmit successful).