AuroraMiddleware/skia2
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
12,732 Commits 1 Branch 0 Tags 544 MiB
40d9c0e331
Commit Graph

189 Commits

Author SHA1 Message Date
bsalomon
da07a08367 Make LTCG optional on windows builds. 
R=mtklein@google.com

Author: bsalomon@google.com

Review URL: https://codereview.chromium.org/335123010
 2014-06-26 12:56:28 -07:00
reed
6518eaaefa remove legacy moz flags 
NOTRY=True
R=george@mozilla.com, scroggo@google.com

Author: reed@google.com

Review URL: https://codereview.chromium.org/342803002
 2014-06-18 14:05:22 -07:00
scroggo
f01a6c3663 In Android framework, make tools depend on jsoncpp 
Always build the tools with JSON, but either build our own
or use the system's.

Rename skia_build_json_writer to skia_use_system_jsoncpp,
since we now always build with JSON.

Remove SK_BUILD_JSON_WRITER, which was only there so
we could build without JSON it in the framework.

BUG=skia:2448
R=djsollen@google.com, reed@google.com

Author: scroggo@google.com

Review URL: https://codereview.chromium.org/303913002
 2014-06-18 10:31:40 -07:00
Brian Salomon
08fe01362d Try to roll angle again. 
BUG=skia:2272

NOTRY=True
NOTREECHECKS=True
R=reed@google.com

Review URL: https://codereview.chromium.org/306483014
 2014-06-17 17:28:17 -04:00
mtklein
24ad096540 Silence warnings about using offsetof on near-POD structs. 
This is coming up with SkMatrix, which is POD according to GCC >= 4.6
but not before (specifically, not at GCC 4.4).

BUG=skia:
R=reed@google.com, mtklein@google.com, bungeman@google.com

Author: mtklein@chromium.org

Review URL: https://codereview.chromium.org/339193002
 2014-06-17 11:47:40 -07:00
reed
0349864b75 remove SK_SUPPORT_LEGACY_BLURMASKFILTER_STYLE -- not needed 
BUG=skia:
R=scroggo@google.com

Author: reed@google.com

Review URL: https://codereview.chromium.org/332163005
 2014-06-16 15:18:25 -07:00
reed
4585144956 remove SK_SUPPORT_LEGACY_DEVICE_CONFIG code 
BUG=skia:
R=djsollen@google.com

Author: reed@google.com

Review URL: https://codereview.chromium.org/327263002
 2014-06-11 07:17:11 -07:00
djordje.pesut
632a4546b0 MIPS: added optimization for functions from SkBlitRow. 
gain is ~40%

following function are optimized:
  S32_D565_Blend
  S32A_D565_Opaque_Dither
  S32_D565_Opaque_Dither
  S32_D565_Blend_Dither
  S32A_D565_Opaque
  S32A_D565_Blend
  S32_Blend_BlitRow32

R=djsollen@google.com, teodora.petrovic@gmail.com

Author: djordje.pesut@imgtec.com

Review URL: https://codereview.chromium.org/326913004
 2014-06-11 06:56:10 -07:00
djordje.pesut
aaf1df632d MIPS: modified gypi files to support build 
R=teodora.petrovic@gmail.com, djsollen@google.com

Author: djordje.pesut@imgtec.com

Review URL: https://codereview.chromium.org/304903003
 2014-06-06 14:09:12 -07:00
mtklein
59ef7704f1 Revert of Try TSAN blacklist for SkGLContextHelper::init. (https://codereview.chromium.org/309823004/) 
Reason for revert:
the bot's clang doesn't know -fsanitize-blacklist

Original issue's description:
> Try TSAN blacklist for SkGLContextHelper::init.
>
> Submitting to test this; this particular problem only happens on the bot.
>
> BUG=skia:
>
> Committed: https://skia.googlesource.com/skia/+/ab2ec19b975a898d4ee2278ddad7d4268f134478

R=mtklein@chromium.org
TBR=mtklein@chromium.org
NOTREECHECKS=true
NOTRY=true
BUG=skia:

Author: mtklein@google.com

Review URL: https://codereview.chromium.org/314543002
 2014-06-02 19:34:20 -07:00
mtklein
ab2ec19b97 Try TSAN blacklist for SkGLContextHelper::init. 
Submitting to test this; this particular problem only happens on the bot.

BUG=skia:
R=mtklein@google.com

Author: mtklein@chromium.org

Review URL: https://codereview.chromium.org/309823004
 2014-06-02 19:11:06 -07:00
krajcevski
8c111f783f Change #def to be opt-out 
R=jvanverth@google.com, robertphillips@google.com

Author: krajcevski@google.com

Review URL: https://codereview.chromium.org/308143008
 2014-06-02 13:51:34 -07:00
jvanverth
1940df968d Allow access to device config for Moz2d. 
BUG=skia:2633
R=robertphillips@google.com, borenet@google.com, george@mozilla.com

Author: jvanverth@google.com

Review URL: https://codereview.chromium.org/304273009
 2014-06-02 12:27:26 -07:00
robertphillips
a2551ffbc7 Remove legacy Picture-recording flags from Android build 
R=scroggo@google.com

Author: robertphillips@google.com

Review URL: https://codereview.chromium.org/304333002
 2014-06-02 12:09:30 -07:00
krajcevski
9c0e629c64 Initial work to get ETC1 data up to the GPU 
Committed: http://code.google.com/p/skia/source/detail?r=15001

R=bsalomon@google.com, robertphillips@google.com

Author: krajcevski@google.com

Review URL: https://codereview.chromium.org/302783002
 2014-06-02 07:38:15 -07:00
commit-bot@chromium.org
22a1d96ca3 New file for simpler updating of Android defines. 
When building Skia for the Android framework, we will now read a
file which only includes defines. This will make it easier for
people deprecating APIs to add the guard to Android.

R=reed@google.com, djsollen@google.com, bungeman@google.com

Author: scroggo@google.com

Review URL: https://codereview.chromium.org/305193002

git-svn-id: http://skia.googlecode.com/svn/trunk@15013 2bbb7eff-a529-9590-31e7-b0007b416f81
 2014-05-30 21:53:01 +00:00
commit-bot@chromium.org
a3264e53ee Revert "Revert of setConfig -> setInfo (https://codereview.chromium.org/308683005/)" 
This reverts commit eecaea4148805834f223681f70b6488ceba12d09.

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

Author: reed@google.com

Review URL: https://codereview.chromium.org/301283003

git-svn-id: http://skia.googlecode.com/svn/trunk@14989 2bbb7eff-a529-9590-31e7-b0007b416f81
 2014-05-30 13:26:10 +00:00
commit-bot@chromium.org
e3c400f1bd Set the default discardable pool size for Android framework. 
BUG=skia:2389
R=halcanary@google.com

Author: scroggo@google.com

Review URL: https://codereview.chromium.org/303893002

git-svn-id: http://skia.googlecode.com/svn/trunk@14939 2bbb7eff-a529-9590-31e7-b0007b416f81
 2014-05-28 21:44:05 +00:00
commit-bot@chromium.org
64f6d15451 Use SkAtomics_sync on Android 
Every doc I've found about using Android's atomics says, "stop".

"* A handful of basic atomic operations.  The appropriate pthread
 * functions should be used instead of these whenever possible."

"... we recommend stopping from using these functions entirely. Very fortunately, GCC provides handy intrinsics functions that work with very reasonable performance and always provide a full barrier."

As far as I can tell, there's no code generation change here: both the __sync atomics and the android_ atomics use full memory barriers.  (And now with this all unified, it'll be easier to get the real wins by switching everything to __atomic atomics, which are like __sync atomics but allow control over memory barriers.)

BUG=skia:
R=bungeman@google.com, djsollen@google.com, mtklein@google.com, reed@google.com

Author: mtklein@chromium.org

Review URL: https://codereview.chromium.org/305593002

git-svn-id: http://skia.googlecode.com/svn/trunk@14896 2bbb7eff-a529-9590-31e7-b0007b416f81
 2014-05-27 15:55:35 +00:00
commit-bot@chromium.org
815d3600e9 Remove -mfpmath=sse for clang, which does it automatically and sometimes is annoyed by it. 
BUG=skia:

NOTREECHECKS=true
R=mtklein@google.com

Author: mtklein@chromium.org

Review URL: https://codereview.chromium.org/296793003

git-svn-id: http://skia.googlecode.com/svn/trunk@14812 2bbb7eff-a529-9590-31e7-b0007b416f81
 2014-05-20 19:42:03 +00:00
commit-bot@chromium.org
6a106ce251 SSE2 everywhere. 
As of M35, Chrome will require SSE2 on Linux (it already did on Windows, and
requires SSSE3 on Macs).  Android already requires SSE2 for x86 chips.

This effectively just forces it on for 32-bit Linux builds; everyone else already had it.

BUG=skia:

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

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

Author: mtklein@chromium.org

Review URL: https://codereview.chromium.org/294963002

git-svn-id: http://skia.googlecode.com/svn/trunk@14811 2bbb7eff-a529-9590-31e7-b0007b416f81
 2014-05-20 19:02:55 +00:00
commit-bot@chromium.org
6379129229 Revert of SSE2 everywhere. (https://codereview.chromium.org/294963002/) 
Reason for revert:
Making GM run fewer tests than expected?

Original issue's description:
> SSE2 everywhere.
>
> As of M35, Chrome will require SSE2 on Linux (it already did on Windows, and
> requires SSSE3 on Macs).  Android already requires SSE2 for x86 chips.
>
> This effectively just forces it on for 32-bit Linux builds; everyone else already had it.
>
> BUG=skia:
>
> Committed: http://code.google.com/p/skia/source/detail?r=14800

R=reed@google.com, mtklein@chromium.org
TBR=mtklein@chromium.org, reed@google.com
NOTREECHECKS=true
NOTRY=true
BUG=skia:

Author: mtklein@google.com

Review URL: https://codereview.chromium.org/282093015

git-svn-id: http://skia.googlecode.com/svn/trunk@14803 2bbb7eff-a529-9590-31e7-b0007b416f81
 2014-05-20 15:27:35 +00:00
commit-bot@chromium.org
28f070d2a4 SSE2 everywhere. 
As of M35, Chrome will require SSE2 on Linux (it already did on Windows, and
requires SSSE3 on Macs).  Android already requires SSE2 for x86 chips.

This effectively just forces it on for 32-bit Linux builds; everyone else already had it.

BUG=skia:
R=reed@google.com, mtklein@google.com

Author: mtklein@chromium.org

Review URL: https://codereview.chromium.org/294963002

git-svn-id: http://skia.googlecode.com/svn/trunk@14800 2bbb7eff-a529-9590-31e7-b0007b416f81
 2014-05-20 14:54:09 +00:00
commit-bot@chromium.org
941ff78d79 Remove legacy constructor for blur draw looper. 
Now that Android no longer uses the constructor, remove it, along
with the flag.

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

Author: scroggo@google.com

Review URL: https://codereview.chromium.org/299683002

git-svn-id: http://skia.googlecode.com/svn/trunk@14797 2bbb7eff-a529-9590-31e7-b0007b416f81
 2014-05-20 14:53:32 +00:00
commit-bot@chromium.org
61744ec1d2 Generate bench/Android.mk from gyp. 
For now, remove json functionality and do not depend on json. This
allows us to build and run until solving skbug.com/2448.

bench/DeferredSurfaceCopyBench.cpp:
Include GrRenderTarget last, so SK_SUPPORT_GPU will be set properly.

bench/ResultsWriter.h:
bench/benchmain.cpp:
Remove JSONResultsWriter when SK_BUILD_JSON_WRITER is not defined,
which is the case for the Android framework build.

gyp/bench.gyp:
Depend on skia and cutils (for android_atomic_inc etc).

gyp/common_conditions.gypi:
Define SK_BUILD_JSON_WRITER when skia_build_json_writer is set.

gyp/common_variables.gypi:
Add a flag for skia_build_json_writer, and set it only when
skia_android_framework is not set.

gyp/jsoncpp.gyp:
Do not build jsoncpp when skia_build_json_writer is not defined.
include/utils/SkJSONCPP.h:
Do not include json headers when SK_BUILD_JSON_WRITER is not defined.

platform_tools/android/bin/gyp_to_android.py:
Generate bench/Android.mk.

platform_tools/android/gyp_gen/gypd_parser.py:
Skip dest_dir when checking for include_dirs.

platform_tools/android/gyp_gen/makefile_writer.py:
Build bench/Android.mk when building external/skia.

platform_tools/android/gyp_gen/tool_makefile_writer.py:
Add a parameter for putting the binary into /data/local/tmp.

BUG=skia:2447
BUG=skia:2448
R=halcanary@google.com, reed@google.com

Author: scroggo@google.com

Review URL: https://codereview.chromium.org/282053002

git-svn-id: http://skia.googlecode.com/svn/trunk@14760 2bbb7eff-a529-9590-31e7-b0007b416f81
 2014-05-16 13:15:41 +00:00
commit-bot@chromium.org
92cea277d7 Remove legacy SkLayerRasterizer flag for Android. 
Android's uses of SkLayerRasterizer have been cleaned up and no longer require
the legacy API. Remove the flag for Android.
We still have to keep the legacy API around until Mozilla have cleaned up their
uses.

BUG=skia:2187
R=reed@google.com, djsollen@google.com

Author: dominikg@chromium.org

Review URL: https://codereview.chromium.org/279383006

git-svn-id: http://skia.googlecode.com/svn/trunk@14710 2bbb7eff-a529-9590-31e7-b0007b416f81
 2014-05-13 14:47:17 +00:00
djsollen@google.com
7e9fedade8 Fix the android framework build as it still uses mutable local matrices. 
R=reed@google.com

Review URL: https://codereview.chromium.org/284663004

git-svn-id: http://skia.googlecode.com/svn/trunk@14706 2bbb7eff-a529-9590-31e7-b0007b416f81
 2014-05-13 13:35:04 +00:00
commit-bot@chromium.org
199cf69575 Fix Moz2D build 
BUG=skia:2221
R=george@mozilla.com, reed@google.com

Author: borenet@google.com

Review URL: https://codereview.chromium.org/277593003

git-svn-id: http://skia.googlecode.com/svn/trunk@14647 2bbb7eff-a529-9590-31e7-b0007b416f81
 2014-05-08 15:29:57 +00:00
commit-bot@chromium.org
50ca12be56 Statically initialize those zero-size singletons. 
This way GCC/Clang don't generate the magic static code to call the
pointless T::T() once in a threadsafe way.  = {} is plenty initialized.

BUG=skia:2378

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

R=bungeman@google.com, mtklein@google.com

Author: mtklein@chromium.org

Review URL: https://codereview.chromium.org/270353003

git-svn-id: http://skia.googlecode.com/svn/trunk@14626 2bbb7eff-a529-9590-31e7-b0007b416f81
 2014-05-07 19:56:27 +00:00
commit-bot@chromium.org
6e8f64cc91 Disallow Android from calling getTotalClip. 
Remove the define that lets the function live on.

R=reed@google.com

Author: scroggo@google.com

Review URL: https://codereview.chromium.org/268333002

git-svn-id: http://skia.googlecode.com/svn/trunk@14612 2bbb7eff-a529-9590-31e7-b0007b416f81
 2014-05-07 15:08:48 +00:00
commit-bot@chromium.org
1d146d431a Revert of Roll ANGLE. (https://codereview.chromium.org/237173002/) 
Reason for revert:
breaking the buildbots (see http://108.170.220.76:10117/builders/Build-Win7-VS2010-x86-Release-ANGLE/builds/3198).

NOTRY=true

Original issue's description:
> Roll ANGLE.
>
> BUG=skia:2272
>
> Committed: http://code.google.com/p/skia/source/detail?r=14243
>
> Committed: http://code.google.com/p/skia/source/detail?r=14509

R=bsalomon@chromium.org, bsalomon@google.com, geofflang@chromium.org, djsollen@google.com, mtklein@google.com

Author: djsollen@google.com

Review URL: https://codereview.chromium.org/264733006

git-svn-id: http://skia.googlecode.com/svn/trunk@14517 2bbb7eff-a529-9590-31e7-b0007b416f81
 2014-05-01 20:20:50 +00:00
commit-bot@chromium.org
05b1b53b12 gyp rules for ubsan 
BUG=skia:2481
R=bungeman@google.com, mtklein@google.com

Author: mtklein@chromium.org

Review URL: https://codereview.chromium.org/258393004

git-svn-id: http://skia.googlecode.com/svn/trunk@14511 2bbb7eff-a529-9590-31e7-b0007b416f81
 2014-05-01 19:29:46 +00:00
commit-bot@chromium.org
1267219c53 Roll ANGLE. 
BUG=skia:2272

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

R=bsalomon@chromium.org, bsalomon@google.com

Author: geofflang@chromium.org

Review URL: https://codereview.chromium.org/237173002

git-svn-id: http://skia.googlecode.com/svn/trunk@14509 2bbb7eff-a529-9590-31e7-b0007b416f81
 2014-05-01 19:22:22 +00:00
commit-bot@chromium.org
4521add17d try /LARGEADDRESSAWARE to give Windows 32-bit builds access to more RAM. 
BUG=skia:2478
R=borenet@google.com, robertphillips@google.com, mtklein@google.com

Author: mtklein@chromium.org

Review URL: https://codereview.chromium.org/258403006

git-svn-id: http://skia.googlecode.com/svn/trunk@14485 2bbb7eff-a529-9590-31e7-b0007b416f81
 2014-04-30 20:47:22 +00:00
commit-bot@chromium.org
e396455d2d move common blur types into central header 
BUG=skia:
R=scroggo@google.com, djsollen@google.com

Author: reed@google.com

Review URL: https://codereview.chromium.org/253833002

git-svn-id: http://skia.googlecode.com/svn/trunk@14411 2bbb7eff-a529-9590-31e7-b0007b416f81
 2014-04-28 16:25:35 +00:00
commit-bot@chromium.org
d70fa2013a Deprecate SaveFlags use in the public SkCanvas API. 
Because we still have internal users for now (to support the deprecated
mode), this CL introduces an external-only variant of deprecation.

Chromium is no longer using the deprecated methods, but Android may need
to suppress SK_ATTR_EXTERNALLY_DEPRECATED warnings.

R=reed@google.com, robertphillips@google.com, scroggo@google.com, bungeman@google.com, mtklein@google.com

Author: fmalita@chromium.org

Review URL: https://codereview.chromium.org/246023008

git-svn-id: http://skia.googlecode.com/svn/trunk@14367 2bbb7eff-a529-9590-31e7-b0007b416f81
 2014-04-24 21:51:58 +00:00
commit-bot@chromium.org
d10ec40031 gyp: only include windows *_x64 targets if GYP_GENERATORS includes ninja 
BUG=skia:2442
R=caryclark@google.com

Author: epoger@google.com

Review URL: https://codereview.chromium.org/247143003

git-svn-id: http://skia.googlecode.com/svn/trunk@14313 2bbb7eff-a529-9590-31e7-b0007b416f81
 2014-04-22 20:05:35 +00:00
commit-bot@chromium.org
1d0b68c495 Support clip to layer flag on Android framework. 
This flag is being transitioned out, but the Android framework
still needs it.

R=reed@google.com, fmalita@google.com, robertphillips@google.com

Author: scroggo@google.com

Review URL: https://codereview.chromium.org/243843002

git-svn-id: http://skia.googlecode.com/svn/trunk@14272 2bbb7eff-a529-9590-31e7-b0007b416f81
 2014-04-21 14:42:38 +00:00
robertphillips@google.com
770963f23f Staging for cleanup of SkPicture-related headers 
https://codereview.chromium.org/243173002



git-svn-id: http://skia.googlecode.com/svn/trunk@14258 2bbb7eff-a529-9590-31e7-b0007b416f81
 2014-04-18 18:04:41 +00:00
commit-bot@chromium.org
5fb2ce38b3 Staged removal of SkPicture-derived classes 
This CL removes the SkPicture-derived classes (with a flag to keeps clients working). In the process it also lightens the recording factory function so it is no longer ref counted).

The only interesting bits are in SkPicture* and Sk*Picture.*

R=reed@google.com

Author: robertphillips@google.com

Review URL: https://codereview.chromium.org/238273012

git-svn-id: http://skia.googlecode.com/svn/trunk@14251 2bbb7eff-a529-9590-31e7-b0007b416f81
 2014-04-17 23:35:06 +00:00
commit-bot@chromium.org
0b17feaa64 Revert of Roll ANGLE. (https://codereview.chromium.org/237173002/) 
Reason for revert:
http://skbug.com/2437

Original issue's description:
> Roll ANGLE.
>
> BUG=skia:2272
>
> Committed: http://code.google.com/p/skia/source/detail?r=14243

R=bsalomon@chromium.org, geofflang@chromium.org
TBR=bsalomon@chromium.org, geofflang@chromium.org
NOTREECHECKS=true
NOTRY=true
BUG=skia:2272

Author: bsalomon@google.com

Review URL: https://codereview.chromium.org/238863006

git-svn-id: http://skia.googlecode.com/svn/trunk@14248 2bbb7eff-a529-9590-31e7-b0007b416f81
 2014-04-17 21:31:32 +00:00
commit-bot@chromium.org
cd66af0ae0 Roll ANGLE. 
BUG=skia:2272
R=bsalomon@chromium.org, bsalomon@google.com

Author: geofflang@chromium.org

Review URL: https://codereview.chromium.org/237173002

git-svn-id: http://skia.googlecode.com/svn/trunk@14243 2bbb7eff-a529-9590-31e7-b0007b416f81
 2014-04-17 18:29:06 +00:00
commit-bot@chromium.org
03f2f81054 More flags needed to build Android framework. 
R=djsollen@google.com
TBR=djsollen@google.com
NOTREECHECKS=true
NOTRY=true

Author: scroggo@google.com

Review URL: https://codereview.chromium.org/240563005

git-svn-id: http://skia.googlecode.com/svn/trunk@14233 2bbb7eff-a529-9590-31e7-b0007b416f81
 2014-04-16 23:06:29 +00:00
commit-bot@chromium.org
04f6c4c657 Support picture recording in Android framework. 
Fixes master-skia build.

R=djsollen@google.com
TBR=djsollen@google.com
NOTREECHECKS=true
NOTRY=true

Author: scroggo@google.com

Review URL: https://codereview.chromium.org/240093007

git-svn-id: http://skia.googlecode.com/svn/trunk@14230 2bbb7eff-a529-9590-31e7-b0007b416f81
 2014-04-16 22:08:32 +00:00
commit-bot@chromium.org
94cf9fad38 More removal of duplicate framework defines. 
BUG=skia:1975
R=djsollen@google.com

Author: scroggo@google.com

Review URL: https://codereview.chromium.org/228343003

git-svn-id: http://skia.googlecode.com/svn/trunk@14174 2bbb7eff-a529-9590-31e7-b0007b416f81
 2014-04-14 14:53:58 +00:00
commit-bot@chromium.org
8f3cc773c4 Remove duplicate skia_android_framework defines. 
BUG=skia:1975
R=djsollen@google.com

Author: scroggo@google.com

Review URL: https://codereview.chromium.org/225283022

git-svn-id: http://skia.googlecode.com/svn/trunk@14173 2bbb7eff-a529-9590-31e7-b0007b416f81
 2014-04-14 14:53:53 +00:00
commit-bot@chromium.org
28fcae2ec7 Revert of Revert of Rename kPMColor_SkColorType to kN32_SkColorType. (https://codereview.chromium.org/234243002/) 
Reason for revert:
Want to reland the original CL.

Original issue's description:
> Revert of Rename kPMColor_SkColorType to kN32_SkColorType. (https://codereview.chromium.org/227433009/)
>
> Reason for revert:
> breaking the Chrome deps roll.
> http://build.chromium.org/p/chromium.linux/builders/Linux%20GN%20%28dbg%29/builds/839/steps/compile/logs/stdio
>
> Original issue's description:
> > Rename kPMColor_SkColorType to kN32_SkColorType.
> >
> > The new name better represents what this flag means.
> >
> > BUG=skia:2384
> >
> > Committed: http://code.google.com/p/skia/source/detail?r=14117
>
> TBR=reed@google.com,scroggo@google.com
> NOTREECHECKS=true
> NOTRY=true
> BUG=skia:2384
>
> Committed: http://code.google.com/p/skia/source/detail?r=14144

R=reed@google.com, bensong@google.com
TBR=bensong@google.com, reed@google.com
NOTREECHECKS=true
NOTRY=true
BUG=skia:2384

Author: scroggo@google.com

Review URL: https://codereview.chromium.org/235523003

git-svn-id: http://skia.googlecode.com/svn/trunk@14156 2bbb7eff-a529-9590-31e7-b0007b416f81
 2014-04-11 17:15:40 +00:00
commit-bot@chromium.org
96edc24598 Revert of Rename kPMColor_SkColorType to kN32_SkColorType. (https://codereview.chromium.org/227433009/) 
Reason for revert:
Chrome's side of define changes not easy to figure out quickly. Reverting this for DEPS roll for now.

Original issue's description:
> Rename kPMColor_SkColorType to kN32_SkColorType.
>
> The new name better represents what this flag means.
>
> BUG=skia:2384
>
> Committed: http://code.google.com/p/skia/source/detail?r=14117

R=reed@google.com, scroggo@google.com
TBR=reed@google.com, scroggo@google.com
NOTREECHECKS=true
NOTRY=true
BUG=skia:2384

Author: bensong@google.com

Review URL: https://codereview.chromium.org/234833003

git-svn-id: http://skia.googlecode.com/svn/trunk@14149 2bbb7eff-a529-9590-31e7-b0007b416f81
 2014-04-11 13:47:30 +00:00
djsollen@google.com
968757e17d Disable SK_GAMMA_SRGB on android builds. 
R=bungeman@google.com, scroggo@google.com

Review URL: https://codereview.chromium.org/229133003

git-svn-id: http://skia.googlecode.com/svn/trunk@14148 2bbb7eff-a529-9590-31e7-b0007b416f81
 2014-04-11 13:09:21 +00:00
commit-bot@chromium.org
d923288e50 Revert of Revert of Rename kPMColor_SkColorType to kN32_SkColorType. (https://codereview.chromium.org/234243002/) 
Reason for revert:
fixes on the chrome side are landing (brettw), keep fingers crossed.

Original issue's description:
> Revert of Rename kPMColor_SkColorType to kN32_SkColorType. (https://codereview.chromium.org/227433009/)
>
> Reason for revert:
> breaking the Chrome deps roll.
> http://build.chromium.org/p/chromium.linux/builders/Linux%20GN%20%28dbg%29/builds/839/steps/compile/logs/stdio
>
> Original issue's description:
> > Rename kPMColor_SkColorType to kN32_SkColorType.
> >
> > The new name better represents what this flag means.
> >
> > BUG=skia:2384
> >
> > Committed: http://code.google.com/p/skia/source/detail?r=14117
>
> TBR=reed@google.com,scroggo@google.com
> NOTREECHECKS=true
> NOTRY=true
> BUG=skia:2384
>
> Committed: http://code.google.com/p/skia/source/detail?r=14144

R=reed@google.com, scroggo@google.com
TBR=reed@google.com, scroggo@google.com
NOTREECHECKS=true
NOTRY=true
BUG=skia:2384

Author: bensong@google.com

Review URL: https://codereview.chromium.org/233813004

git-svn-id: http://skia.googlecode.com/svn/trunk@14145 2bbb7eff-a529-9590-31e7-b0007b416f81
 2014-04-10 22:49:20 +00:00