AuroraMiddleware/skia2
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
11,498 Commits 1 Branch 0 Tags 544 MiB
0dd01ee5b5
Commit Graph

11498 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
commit-bot@chromium.org
6d036c2e47 Initial code for webtry, a web application for allowing users to try out Skia. 
Currently running at http://108.170.220.126:8000/

BUG=skia:
R=mtklein@google.com

Author: jcgregorio@google.com

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

git-svn-id: http://skia.googlecode.com/svn/trunk@14114 2bbb7eff-a529-9590-31e7-b0007b416f81
 2014-04-09 18:59:44 +00:00
commit-bot@chromium.org
0257ebe4ac enable developers to provide their own android toolchain 
R=halcanary@google.com, scroggo@google.com

Author: djsollen@google.com

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

git-svn-id: http://skia.googlecode.com/svn/trunk@14113 2bbb7eff-a529-9590-31e7-b0007b416f81
 2014-04-09 18:57:42 +00:00
commit-bot@chromium.org
093ed317cb Adjusts the bench expectations calculation to consider average value. 
BUG=skia:2225
NOTRY=true
R=borenet@google.com
TBR=borenet@google.com

Author: bensong@google.com

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

git-svn-id: http://skia.googlecode.com/svn/trunk@14112 2bbb7eff-a529-9590-31e7-b0007b416f81
 2014-04-09 18:57:02 +00:00
reed@google.com
a2cbced5f7 no more callers of getTotalClip -- except in android 
git-svn-id: http://skia.googlecode.com/svn/trunk@14111 2bbb7eff-a529-9590-31e7-b0007b416f81
 2014-04-09 18:47:28 +00:00
commit-bot@chromium.org
1b035d82d2 Do div-by-zero check for all gpus in ellipse/rr effects. 
R=jvanverth@google.com

Author: bsalomon@google.com

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

git-svn-id: http://skia.googlecode.com/svn/trunk@14110 2bbb7eff-a529-9590-31e7-b0007b416f81
 2014-04-09 17:11:09 +00:00
bungeman@google.com
cde171860d Rebaselines for r14106. 
git-svn-id: http://skia.googlecode.com/svn/trunk@14109 2bbb7eff-a529-9590-31e7-b0007b416f81
 2014-04-09 17:09:36 +00:00
commit-bot@chromium.org
4460e75bc7 Define SK_CPU_X86 on x86 machines. 
Use this to only register flattening for SkSSE2ProcCoeffXfermode::CreateProc when it's linked.

BUG=skia:

R=reed@google.com, mtklein@google.com, bsalomon@google.com
TBR=reed@google.com
NOTRY=true
NOTREECHECKS=true

Author: mtklein@chromium.org

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

git-svn-id: http://skia.googlecode.com/svn/trunk@14108 2bbb7eff-a529-9590-31e7-b0007b416f81
 2014-04-09 16:50:55 +00:00
commit-bot@chromium.org
c524e98f1e Xfermode: SSE2 implementation of multiply_modeproc 
This patch implements basics for Xfermode SSE optimization. Based on
these basics, SSE2 implementation of multiply_modeproc is provided. SSE2
implementation for other modes will come in future. With this patch
performance of Xfermode_Multiply will improve about 45%. Here are the
data on desktop i7-3770.
before:
Xfermode_Multiply   8888:  cmsecs =     33.30   565:  cmsecs =     45.65
after:
Xfermode_Multiply   8888:  cmsecs =     17.18   565:  cmsecs =     24.87

BUG=

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

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

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

Author: qiankun.miao@intel.com

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

git-svn-id: http://skia.googlecode.com/svn/trunk@14107 2bbb7eff-a529-9590-31e7-b0007b416f81
 2014-04-09 15:43:46 +00:00
bungeman@google.com
d715aaa33f Measure DirectWrite BW consistently with rendering. 
Also move DirectWrite glyph drawing into the scaler context, as this
reduces duplication.

R=reed@google.com

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

git-svn-id: http://skia.googlecode.com/svn/trunk@14106 2bbb7eff-a529-9590-31e7-b0007b416f81
 2014-04-09 15:35:03 +00:00
commit-bot@chromium.org
cb1926cc7a Rebaselines for https://codereview.chromium.org/181523002/ 
Signed-off-by: Kévin PETIT <kevin.petit@arm.com>

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

Author: kevin.petit@arm.com

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

git-svn-id: http://skia.googlecode.com/svn/trunk@14105 2bbb7eff-a529-9590-31e7-b0007b416f81
 2014-04-09 14:34:24 +00:00
commit-bot@chromium.org
479d1ae9b6 Fixes to Android.mk generation for arm64. 
Remove warning about no optimizations for arm64 and rebaseline the
associated test.

Exclude _opts_none.cpps when building arm64, to avoid double definitions.

BUG=skia:1975
R=halcanary@google.com, djsollen@google.com

Author: scroggo@google.com

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

git-svn-id: http://skia.googlecode.com/svn/trunk@14104 2bbb7eff-a529-9590-31e7-b0007b416f81
 2014-04-09 13:34:26 +00:00
commit-bot@chromium.org
95c2e5532b ARM Skia NEON patches - 22 - S32_D565_Blend 
BlitRow565: new NEON version of S32_D565_Blend

This new implementation brings a good speedup in most cases and
gives exact results (removes one mismatch in gm).

Here are the benchmark results (speedup vs. existing S32A_D565_Blend):

+-------+-----------+------------+
| count | Cortex-A9 | Cortex-A15 |
+-------+-----------+------------+
| 1     | -26,7%    | -27,5%     |
+-------+-----------+------------+
| 2     | 0%        | +53%       |
+-------+-----------+------------+
| 4     | +38,3%    | +26,5%     |
+-------+-----------+------------+
| 8     | +10,9%    |  -4,5%     |
+-------+-----------+------------+
| 16    | +18,2%    | +1,6%      |
+-------+-----------+------------+
| 64    | +22,3%    | +8,75%     |
+-------+-----------+------------+
| 256   | +12,3%    | +11,2%     |
+-------+-----------+------------+
| 1024  | +79,2%    | +10,9%     |
+-------+-----------+------------+

Signed-off-by: Kévin PETIT <kevin.petit@arm.com>

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

Author: kevin.petit@arm.com

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

git-svn-id: http://skia.googlecode.com/svn/trunk@14103 2bbb7eff-a529-9590-31e7-b0007b416f81
 2014-04-09 09:46:31 +00:00
skia.committer@gmail.com
e1d9443758 Sanitizing source files in Housekeeper-Nightly 
git-svn-id: http://skia.googlecode.com/svn/trunk@14102 2bbb7eff-a529-9590-31e7-b0007b416f81
 2014-04-09 03:04:11 +00:00
commit-bot@chromium.org
506db0b7d2 SkRecord: make culling work if SkRecordAnnotateCullingPairs is called. 
- Allow stateful functors; allow visit()/mutate() at a given index; add count().
  - Annotate cull push/pop pairs on the PushCull records.  (tested)
  - Use those annotations to skip ahead in SkRecordDraw.   (not yet tested beyond dm --skr)
  - Make SkRecordDraw a function, move its implementation to a .cpp.

BUG=skia:2378
R=fmalita@chromium.org, mtklein@google.com

Author: mtklein@chromium.org

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

git-svn-id: http://skia.googlecode.com/svn/trunk@14101 2bbb7eff-a529-9590-31e7-b0007b416f81
 2014-04-08 23:31:35 +00:00
commit-bot@chromium.org
9ffa52d98f More SkRecord TODOs: 
- add basic test for SkRecorder
  - rejigger GYPs so that the include dir comes along with the dependency

BUG=skia:2378

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

NOTRY=true
NOTREECHECKS=true
R=fmalita@chromium.org, mtklein@google.com

Author: mtklein@chromium.org

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

git-svn-id: http://skia.googlecode.com/svn/trunk@14100 2bbb7eff-a529-9590-31e7-b0007b416f81
 2014-04-08 21:01:17 +00:00
commit-bot@chromium.org
b73696262c More SkRecord TODOs: 
- add basic test for SkRecorder
  - rejigger GYPs so that the include dir comes along with the dependency

BUG=skia:2378
R=fmalita@chromium.org, mtklein@google.com

Author: mtklein@chromium.org

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

git-svn-id: http://skia.googlecode.com/svn/trunk@14099 2bbb7eff-a529-9590-31e7-b0007b416f81
 2014-04-08 20:17:26 +00:00
commit-bot@chromium.org
eefd8a01fc Don't try to render color fonts using distance fields. 
Adds detection of ARGB mask format, which is only used for color fonts.

BUG=skia:2173
R=bungeman@google.com, reed@google.com, bsalomon@google.com, robertphillips@google.com

Author: jvanverth@google.com

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

git-svn-id: http://skia.googlecode.com/svn/trunk@14098 2bbb7eff-a529-9590-31e7-b0007b416f81
 2014-04-08 20:14:32 +00:00
commit-bot@chromium.org
066a28d2c1 Start on some unwritten SkRecord TODOs: 
- add SK_OVERRIDE for SkCanvas methods in SkRecorder
  - start on unit tests, here just for SkRecord itself

BUG=skia:2378
R=fmalita@google.com, mtklein@google.com, fmalita@chromium.org

Author: mtklein@chromium.org

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

git-svn-id: http://skia.googlecode.com/svn/trunk@14097 2bbb7eff-a529-9590-31e7-b0007b416f81
 2014-04-08 17:31:08 +00:00
reed@google.com
6719d60485 use default to fix warning (or I will shoot myself) 
git-svn-id: http://skia.googlecode.com/svn/trunk@14096 2bbb7eff-a529-9590-31e7-b0007b416f81
 2014-04-08 16:57:05 +00:00
reed@google.com
43d6d80b49 fix warning for uninitialized count 
git-svn-id: http://skia.googlecode.com/svn/trunk@14095 2bbb7eff-a529-9590-31e7-b0007b416f81
 2014-04-08 16:02:45 +00:00
reed@google.com
efadb4b63c fix warning about uninitialized typeface_encoding by folding glyph case into switch 
git-svn-id: http://skia.googlecode.com/svn/trunk@14094 2bbb7eff-a529-9590-31e7-b0007b416f81
 2014-04-08 15:48:26 +00:00
reed@google.com
bafee11dd1 fix warning by removing padding field 
git-svn-id: http://skia.googlecode.com/svn/trunk@14093 2bbb7eff-a529-9590-31e7-b0007b416f81
 2014-04-08 15:29:10 +00:00
commit-bot@chromium.org
c5d9bb0f67 Initial picture shader implementation 
This CL adds an SkPictureShader class to support SkPicture-based
patterns.

The implementation renders the picture into an SkBitmap tile and then
delegates to SkBitmapProcShader for the actual operation.

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

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

Author: fmalita@chromium.org

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

git-svn-id: http://skia.googlecode.com/svn/trunk@14092 2bbb7eff-a529-9590-31e7-b0007b416f81
 2014-04-08 15:19:34 +00:00
commit-bot@chromium.org
03a99b8f96 Add push/pop cull to SkRecord. 
BUG=skia:2378
R=fmalita@google.com, mtklein@google.com, fmalita@chromium.org

Author: mtklein@chromium.org

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

git-svn-id: http://skia.googlecode.com/svn/trunk@14091 2bbb7eff-a529-9590-31e7-b0007b416f81
 2014-04-08 15:17:17 +00:00
reed@google.com
43c27586e8 WIP -- SkFont 
BUG=skia:
R=bungeman@google.com, fmalita@chromium.org

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

git-svn-id: http://skia.googlecode.com/svn/trunk@14090 2bbb7eff-a529-9590-31e7-b0007b416f81
 2014-04-08 15:04:29 +00:00
fmalita@google.com
667240a2e8 Relax the assert in SkReadBuffer::setPictureVersion(). 
I'm hitting this with SkPictureShader serialization because there can be
multiple pictures deserialized from the same buffer.

I think we can relax the assert to allow setting the same version
multiple times.

(Alternatively, we could guard all the callers - but since setting the
same version is a no-op, that seems overkill)

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

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

git-svn-id: http://skia.googlecode.com/svn/trunk@14089 2bbb7eff-a529-9590-31e7-b0007b416f81
 2014-04-08 14:11:26 +00:00
commit-bot@chromium.org
e6d8be080d Removes deleted files SkBitmapShader* from gyp/core.gypi. 
BUG=skia:
NOTRY=true
R=robertphillips@google.com
TBR=robertphillips@google.com

Author: bensong@google.com

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

git-svn-id: http://skia.googlecode.com/svn/trunk@14088 2bbb7eff-a529-9590-31e7-b0007b416f81
 2014-04-08 12:24:01 +00:00
commit-bot@chromium.org
8865d09cf8 Revert of Initial picture shader implementation (https://codereview.chromium.org/221923007/) 
Reason for revert:
breaking the buildbots. Subsequent CL only addressed CompareGMs but GenerateGMs are also failing.

Original issue's description:
> Initial picture shader implementation
>
> This CL adds an SkPictureShader class to support SkPicture-based
> patterns.
>
> The implementation renders the picture into an SkBitmap tile and then
> delegates to SkBitmapProcShader for the actual operation.
>
> R=reed@google.com,robertphillips@google.com,bsalomon@google.com
>
> Committed: http://code.google.com/p/skia/source/detail?r=14085

R=bsalomon@google.com, reed@google.com, robertphillips@google.com, fmalita@chromium.org
TBR=bsalomon@google.com, fmalita@chromium.org, reed@google.com, robertphillips@google.com
NOTREECHECKS=true
NOTRY=true

Author: bensong@google.com

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

git-svn-id: http://skia.googlecode.com/svn/trunk@14087 2bbb7eff-a529-9590-31e7-b0007b416f81
 2014-04-07 23:45:31 +00:00
fmalita@google.com
98f4e5cea3 Suppress pictureshader GM failures. 
Pending baselines.

TBR=bensong@google.com

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

git-svn-id: http://skia.googlecode.com/svn/trunk@14086 2bbb7eff-a529-9590-31e7-b0007b416f81
 2014-04-07 23:30:37 +00:00
commit-bot@chromium.org
592b2d13c9 Initial picture shader implementation 
This CL adds an SkPictureShader class to support SkPicture-based
patterns.

The implementation renders the picture into an SkBitmap tile and then
delegates to SkBitmapProcShader for the actual operation.

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

Author: fmalita@chromium.org

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

git-svn-id: http://skia.googlecode.com/svn/trunk@14085 2bbb7eff-a529-9590-31e7-b0007b416f81
 2014-04-07 23:11:45 +00:00
commit-bot@chromium.org
1ae492f19b Add option to SkDecodingImageGenerator to require unpremul. 
Android needs to be able to set unpremul for purgeable
pixelRefs.

Once Android switches to the new interface, we can delete SkImageRef.

Bug=skia:2389

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

Author: scroggo@google.com

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

git-svn-id: http://skia.googlecode.com/svn/trunk@14084 2bbb7eff-a529-9590-31e7-b0007b416f81
 2014-04-07 21:37:36 +00:00
commit-bot@chromium.org
fc94829337 remove SK_SUPPORT_LEGACY_COMPATIBLEDEVICE_CONFIG 
remove SK_SUPPORT_LEGACY_GETDEVICECAPABILITIES

BUG=skia:
R=robertphillips@google.com, bsalomon@google.com

Author: reed@google.com

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

git-svn-id: http://skia.googlecode.com/svn/trunk@14083 2bbb7eff-a529-9590-31e7-b0007b416f81
 2014-04-07 21:33:06 +00:00
commit-bot@chromium.org
c5713e484a clear bitmap in texture domain gm 
R=robertphillips@google.com
TBR=robertphillips@google.com

Author: bsalomon@google.com

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

git-svn-id: http://skia.googlecode.com/svn/trunk@14082 2bbb7eff-a529-9590-31e7-b0007b416f81
 2014-04-07 21:18:46 +00:00
commit-bot@chromium.org
e3beb6bd7d SkNonCopyable should be used with private inheritance. 
This is mostly s/public SkNoncopyable/SkNoncopyable/g.

Two classes (SkDrawLooper::Context and SkPicture::OperationList) don't actually work with SkNoncopyable because they introduce a virtual destructor.  I added SkNoncopyableVirtual to make them work as intended.  Sort of questionable whether they really need to be noncopyable in the first place, but I guess it doesn't hurt to keep the behavior the same.

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

Author: mtklein@chromium.org

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

git-svn-id: http://skia.googlecode.com/svn/trunk@14081 2bbb7eff-a529-9590-31e7-b0007b416f81
 2014-04-07 19:34:38 +00:00
commit-bot@chromium.org
c4df655b37 Factory methods for heap-allocated SkTypeface objects. 
This is part of an effort to ensure that all SkPaint effects can only be
allocated on the heap.

This patch makes the constructors of SkTypeface and its subclasses non-public
and instead provides factory methods for creating these objects on the heap.

BUG=skia:2187
R=scroggo@google.com, bungeman@google.com

Author: dominikg@chromium.org

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

git-svn-id: http://skia.googlecode.com/svn/trunk@14080 2bbb7eff-a529-9590-31e7-b0007b416f81
 2014-04-07 19:34:16 +00:00
commit-bot@chromium.org
2b4e370a2f Convert SkPicture's generation ID to a unique ID 
This CL addresses linger code review comments on r14037 (Add generation ID to SkPicture https://codereview.chromium.org/222683002/)

R=reed@google.com

Author: robertphillips@google.com

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

git-svn-id: http://skia.googlecode.com/svn/trunk@14079 2bbb7eff-a529-9590-31e7-b0007b416f81
 2014-04-07 18:26:22 +00:00
commit-bot@chromium.org
c96268d792 Remove SkBitmapShaderTemplate. 
Remove files that are no longer needed:
src/core/SkBitmapShaderTemplate.h
src/core/SkBitmapShader16BilerpTemplate.h

BUG=skia:1976
R=scroggo@google.com

Author: dominikg@chromium.org

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

git-svn-id: http://skia.googlecode.com/svn/trunk@14078 2bbb7eff-a529-9590-31e7-b0007b416f81
 2014-04-07 18:01:09 +00:00
commit-bot@chromium.org
94bd822801 Revert of Discard scratch render targets before reusing them. (https://codereview.chromium.org/225183012/) 
Reason for revert:
Asserts in debug.

Original issue's description:
> Discard scratch render targets before reusing them.
>
> R=robertphillips@google.com
>
> Committed: http://code.google.com/p/skia/source/detail?r=14075

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

Author: bsalomon@google.com

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

git-svn-id: http://skia.googlecode.com/svn/trunk@14077 2bbb7eff-a529-9590-31e7-b0007b416f81
 2014-04-07 17:43:01 +00:00
commit-bot@chromium.org
372a9c3f44 Fix EffectKey for XferEffect 
R=robertphillips@google.com

Author: bsalomon@google.com

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

git-svn-id: http://skia.googlecode.com/svn/trunk@14076 2bbb7eff-a529-9590-31e7-b0007b416f81
 2014-04-07 17:13:10 +00:00
commit-bot@chromium.org
0f23ff1bcc Discard scratch render targets before reusing them. 
R=robertphillips@google.com

Author: bsalomon@google.com

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

git-svn-id: http://skia.googlecode.com/svn/trunk@14075 2bbb7eff-a529-9590-31e7-b0007b416f81
 2014-04-07 17:03:00 +00:00
commit-bot@chromium.org
0d0d620bfd remove SK_SUPPORT_LEGACY_GETCLIPTYPE 
after this lands and sticks, we can remove the assocated code from skia

BUG=skia:
R=robertphillips@google.com, reed@chromium.org

Author: reed@google.com

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

git-svn-id: http://skia.googlecode.com/svn/trunk@14074 2bbb7eff-a529-9590-31e7-b0007b416f81
 2014-04-07 15:17:37 +00:00
commit-bot@chromium.org
b554440543 Remove SkResizeImageFilter. 
Its functionality has been subsumed by SkMatrixImageFilter, and it's no longer
used in Blink.

BUG=skia:
R=bsalomon@google.com

Author: senorblanco@chromium.org

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

git-svn-id: http://skia.googlecode.com/svn/trunk@14073 2bbb7eff-a529-9590-31e7-b0007b416f81
 2014-04-07 15:11:08 +00:00
commit-bot@chromium.org
622eda7373 Remove deprecated function. 
We have switched Android to call decodeSubset, so this function
is no longer necessary.

R=reed@google.com

Author: scroggo@google.com

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

git-svn-id: http://skia.googlecode.com/svn/trunk@14072 2bbb7eff-a529-9590-31e7-b0007b416f81
 2014-04-07 14:00:31 +00:00
commit-bot@chromium.org
b7fedac2d1 Fixed Skia compilation error with strict clang. 
BUG=skia:
R=reed@google.com, sergeyberezin@chromium.org, hcm@google.com

Author: kolczyk@opera.com

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

git-svn-id: http://skia.googlecode.com/svn/trunk@14071 2bbb7eff-a529-9590-31e7-b0007b416f81
 2014-04-07 13:12:47 +00:00
skia.committer@gmail.com
0f8c859fb8 Sanitizing source files in Housekeeper-Nightly 
git-svn-id: http://skia.googlecode.com/svn/trunk@14070 2bbb7eff-a529-9590-31e7-b0007b416f81
 2014-04-05 03:05:27 +00:00
commit-bot@chromium.org
ae0054e48a get iOS building again 
1) Disable SampleApp.  Seems like it's totally horked?  SkOSFile_iOS.mm is missing about half the functions needed, and SkOSFile_stdio.cpp is double-providing the others.

2) Drop armv6.

3) Switch from putting headers in sources to putting the corresponding directories in includes.

4)  Force cast the type of glShaderSource.  Something to do with GR_GL_USE_NEW_SHADER_SOURCE_SIGNATURE?

After all this,
    env CC=clang CXX=clang++ GYP_DEFINES=skia_os=ios make
builds for me.
BUG=skia:2363
R=bsalomon@google.com, epoger@google.com, mtklein@google.com

Author: mtklein@chromium.org

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

git-svn-id: http://skia.googlecode.com/svn/trunk@14069 2bbb7eff-a529-9590-31e7-b0007b416f81
 2014-04-05 01:13:43 +00:00
commit-bot@chromium.org
78842e4ad2 Rebaselining resizeimagefilter 
BUG=skia:
R=senorblanco@google.com, senorblanco@chromium.org

Author: sugoi@chromium.org

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

git-svn-id: http://skia.googlecode.com/svn/trunk@14068 2bbb7eff-a529-9590-31e7-b0007b416f81
 2014-04-04 21:23:30 +00:00
commit-bot@chromium.org
848fdb06d4 Updates to Android.mk generation. 
These defines were manually added to the last merge.

BUG=skia:1975
R=djsollen@google.com

Author: scroggo@google.com

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

git-svn-id: http://skia.googlecode.com/svn/trunk@14067 2bbb7eff-a529-9590-31e7-b0007b416f81
 2014-04-04 21:19:53 +00:00
commit-bot@chromium.org
1f2d357436 Change SkDecodingImageGenerator to hide implementation details. 
Motivation: A later CL will move SkDecodingImageGenerator into
include/ for Android to use.

R=scroggo@google.com

Author: halcanary@google.com

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

git-svn-id: http://skia.googlecode.com/svn/trunk@14066 2bbb7eff-a529-9590-31e7-b0007b416f81
 2014-04-04 20:13:05 +00:00
commit-bot@chromium.org
25595ed6e9 fix nacl build using ninja 
BUG=skia:2366
NOTREECHECKS=True
NOTRY=True
R=robertphillips@google.com
TBR=robertphillips

Author: epoger@google.com

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

git-svn-id: http://skia.googlecode.com/svn/trunk@14065 2bbb7eff-a529-9590-31e7-b0007b416f81
 2014-04-04 18:16:04 +00:00