Upstream the rest of skia diff

Upstream the rest of skia diff

- Removed use-system-skia for android, as it didn't work now.
- Combined multiple android condition into one.



BUG=
TEST=


Committed: http://src.chromium.org/viewvc/chrome?view=rev&revision=148156

[Yaron, 2012-07-24 01:12:47]

lg module one comment. Adding Grace.

http://codereview.chromium.org/10806077/diff/7001/skia/ext/platform_device.h
File skia/ext/platform_device.h (right):

http://codereview.chromium.org/10806077/diff/7001/skia/ext/platform_device.h#...
skia/ext/platform_device.h:48: // TODO(tonyg): FIX TYPES!
Remove TODO. Also, copy the rest of downstream diff (this should be "#elif
defined(OS_ANDROID)" and move above linux).

[Nico, 2012-07-24 01:20:27]

Looks fine except for the use_system_skia removal.

http://codereview.chromium.org/10806077/diff/7001/skia/config/SkUserConfig.h
File skia/config/SkUserConfig.h (right):

http://codereview.chromium.org/10806077/diff/7001/skia/config/SkUserConfig.h#...
skia/config/SkUserConfig.h:189: #if !defined(ANDROID)   // On Android, we use
the skia default settings
Nit: trailing .

http://codereview.chromium.org/10806077/diff/7001/skia/config/SkUserConfig.h#...
skia/config/SkUserConfig.h:190: // All little-endian Chrome platforms agree: 
BGRA is the optimal pixel layout.
remove this comment

http://codereview.chromium.org/10806077/diff/7001/skia/ext/platform_device.h
File skia/ext/platform_device.h (right):

http://codereview.chromium.org/10806077/diff/7001/skia/ext/platform_device.h#...
skia/ext/platform_device.h:48: // TODO(tonyg): FIX TYPES!
On 2012/07/24 01:12:47, Yaron wrote:
> Remove TODO. Also, copy the rest of downstream diff (this should be "#elif
> defined(OS_ANDROID)" and move above linux).

Will PlatformSurface remain a void*?

http://codereview.chromium.org/10806077/diff/7001/skia/skia.gyp
File skia/skia.gyp (left):

http://codereview.chromium.org/10806077/diff/7001/skia/skia.gyp#oldcode1093
skia/skia.gyp:1093: ['use_system_skia==1', {
Why did this disappear?

[michaelbai, 2012-07-24 01:37:46]

PTAL

https://chromiumcodereview.appspot.com/10806077/diff/7001/skia/config/SkUserC...
File skia/config/SkUserConfig.h (right):

https://chromiumcodereview.appspot.com/10806077/diff/7001/skia/config/SkUserC...
skia/config/SkUserConfig.h:189: #if !defined(ANDROID)   // On Android, we use
the skia default settings
On 2012/07/24 01:20:27, Nico wrote:
> Nit: trailing .

Done.

https://chromiumcodereview.appspot.com/10806077/diff/7001/skia/config/SkUserC...
skia/config/SkUserConfig.h:190: // All little-endian Chrome platforms agree: 
BGRA is the optimal pixel layout.
On 2012/07/24 01:20:27, Nico wrote:
> remove this comment

Done.

https://chromiumcodereview.appspot.com/10806077/diff/7001/skia/ext/platform_d...
File skia/ext/platform_device.h (right):

https://chromiumcodereview.appspot.com/10806077/diff/7001/skia/ext/platform_d...
skia/ext/platform_device.h:48: // TODO(tonyg): FIX TYPES!
Yes

On 2012/07/24 01:20:27, Nico wrote:
> On 2012/07/24 01:12:47, Yaron wrote:
> > Remove TODO. Also, copy the rest of downstream diff (this should be "#elif
> > defined(OS_ANDROID)" and move above linux).
> 
> Will PlatformSurface remain a void*?

https://chromiumcodereview.appspot.com/10806077/diff/7001/skia/ext/platform_d...
skia/ext/platform_device.h:48: // TODO(tonyg): FIX TYPES!
On 2012/07/24 01:12:47, Yaron wrote:
> Remove TODO. Also, copy the rest of downstream diff (this should be "#elif
> defined(OS_ANDROID)" and move above linux).

Done.

https://chromiumcodereview.appspot.com/10806077/diff/7001/skia/skia.gyp
File skia/skia.gyp (left):

https://chromiumcodereview.appspot.com/10806077/diff/7001/skia/skia.gyp#oldco...
skia/skia.gyp:1093: ['use_system_skia==1', {
We didn't really use it and it didn't work, this feature might be added back if
we decide to use the system's skia, even though, if so, this part will still be
re-written.

On 2012/07/24 01:20:27, Nico wrote:
> Why did this disappear?

[Nico, 2012-07-24 01:42:55]

lgtm

https://chromiumcodereview.appspot.com/10806077/diff/7001/skia/skia.gyp
File skia/skia.gyp (left):

https://chromiumcodereview.appspot.com/10806077/diff/7001/skia/skia.gyp#oldco...
skia/skia.gyp:1093: ['use_system_skia==1', {
Oh sorry, I missed this was in an OS=="android" block

[klobag.chromium, 2012-07-24 17:09:46]

lgtm

[commit-bot: I haz the power, 2012-07-24 17:11:17]

CQ is trying da patch. Follow status at
https://chromium-status.appspot.com/cq/michaelbai@chromium.org/10806077/11002

[commit-bot: I haz the power, 2012-07-24 19:03:15]

Change committed as 148156