API modifications needed to upstream Android font changes.

API modifications needed to upstream Android font changes.

Committed: http://code.google.com/p/skia/source/detail?r=9083

Committed: http://code.google.com/p/skia/source/detail?r=9107

[reed1, 2013-05-09 20:35:38]

https://codereview.chromium.org/14761003/diff/2001/include/core/SkPaint.h
File include/core/SkPaint.h (right):

https://codereview.chromium.org/14761003/diff/2001/include/core/SkPaint.h#new...
include/core/SkPaint.h:644: #ifdef SK_BUILD_FOR_ANDROID
can we move the getter (do we have one?) for genreationID() inside this #ifdef?

https://codereview.chromium.org/14761003/diff/2001/include/core/SkPaint.h#new...
include/core/SkPaint.h:645: const SkPaintOptionsAndroid&
getPaintOptionsAndroid() const { return fPaintOptionsAndroid; }
nit: 80 for this file.

getPaintOptionsANdorid() const {
    reutrn ...
}

[reed1, 2013-05-09 20:41:19]

lgtm w/ my prev nits

https://codereview.chromium.org/14761003/diff/6010/src/core/SkPaintOptionsAnd...
File src/core/SkPaintOptionsAndroid.cpp (right):

https://codereview.chromium.org/14761003/diff/6010/src/core/SkPaintOptionsAnd...
src/core/SkPaintOptionsAndroid.cpp:60: char* tag = buffer.readString();
(unrelated to this cl)

Ick. Can we change buffer.readString to take an SkString as an argument, so we
don't have to malloc twice?

[commit-bot: I haz the power, 2013-05-09 20:47:37]

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

[commit-bot: I haz the power, 2013-05-09 20:54:23]

Change committed as 9083

[djsollen, 2013-05-10 17:09:11]

mike can you take another look at this now that I've updated it to fix the test
errors.

[reed1, 2013-05-10 17:14:43]

https://codereview.chromium.org/14761003/diff/18001/src/core/SkPaint.cpp
File src/core/SkPaint.cpp (right):

https://codereview.chromium.org/14761003/diff/18001/src/core/SkPaint.cpp#newc...
src/core/SkPaint.cpp:86: new (&fPaintOptionsAndroid) SkPaintOptionsAndroid();
I *think* you don't want/need the () at the end... need to try.

https://codereview.chromium.org/14761003/diff/18001/src/core/SkPaint.cpp#newc...
src/core/SkPaint.cpp:196: if(!memcmp(&fPaintOptionsAndroid, &options,
sizeof(SkPaintOptionsAndroid))) {
I think you want 

if (fPaintOptionsAndroid != options) {
    ...
}

instead of memcmp

[djsollen, 2013-05-10 17:29:40]

https://codereview.chromium.org/14761003/diff/18001/src/core/SkPaint.cpp
File src/core/SkPaint.cpp (right):

https://codereview.chromium.org/14761003/diff/18001/src/core/SkPaint.cpp#newc...
src/core/SkPaint.cpp:86: new (&fPaintOptionsAndroid) SkPaintOptionsAndroid();
On 2013/05/10 17:14:43, reed1 wrote:
> I *think* you don't want/need the () at the end... need to try.

Done.

https://codereview.chromium.org/14761003/diff/18001/src/core/SkPaint.cpp#newc...
src/core/SkPaint.cpp:196: if(!memcmp(&fPaintOptionsAndroid, &options,
sizeof(SkPaintOptionsAndroid))) {
On 2013/05/10 17:14:43, reed1 wrote:
> I think you want 
> 
> if (fPaintOptionsAndroid != options) {
>     ...
> }
> 
> instead of memcmp

Done.

[commit-bot: I haz the power, 2013-05-13 11:56:17]

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

[commit-bot: I haz the power, 2013-05-13 12:01:17]

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

[commit-bot: I haz the power, 2013-05-13 14:09:19]

Change committed as 9107