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

11238 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
commit-bot@chromium.org
3fcab54c7f remove SK_SUPPORT_LEGACY_COMPATIBLEDEVICE_CONFIG 
NOTRY=True
TBR=bsalomon

Author: reed@google.com

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

git-svn-id: http://skia.googlecode.com/svn/trunk@13954 2bbb7eff-a529-9590-31e7-b0007b416f81
 2014-03-26 15:55:50 +00:00
commit-bot@chromium.org
30ab09be42 Updated baselines for Ubuntu12-GTX660 
I think I may have committed incorrect baselines (left over from ATI5770) in
https://codereview.chromium.org/204983016/ due to https://code.google.com/p/skia/issues/detail?id=2247

BUG=skia:2325
R=epoger@google.com

Author: borenet@google.com

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

git-svn-id: http://skia.googlecode.com/svn/trunk@13953 2bbb7eff-a529-9590-31e7-b0007b416f81
 2014-03-26 15:32:23 +00:00
reed@google.com
f20fc24a7d remove all references to legacy Config8888 
BUG=skia:
R=bsalomon@google.com

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

git-svn-id: http://skia.googlecode.com/svn/trunk@13952 2bbb7eff-a529-9590-31e7-b0007b416f81
 2014-03-26 13:44:58 +00:00
commit-bot@chromium.org
da0ceb2299 rebaseline_server: delete invalid image files from local disk cache 
BUG=skia:2247
NOTREECHECKS=True
NOTRY=True
R=borenet@google.com

Author: epoger@google.com

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

git-svn-id: http://skia.googlecode.com/svn/trunk@13951 2bbb7eff-a529-9590-31e7-b0007b416f81
 2014-03-26 13:38:29 +00:00
commit-bot@chromium.org
57f74e0aa9 Debugger improvements 
This CL:
  improves the 'SaveAs' functionality
  allows switching between # and offset indexing in the command list
  minor nit cleanup

R=bsalomon@google.com

Author: robertphillips@google.com

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

git-svn-id: http://skia.googlecode.com/svn/trunk@13950 2bbb7eff-a529-9590-31e7-b0007b416f81
 2014-03-25 23:31:33 +00:00
commit-bot@chromium.org
2b290cec98 Minor cleanup (moved out of main CL) 
R=bsalomon@google.com

Author: robertphillips@google.com

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

git-svn-id: http://skia.googlecode.com/svn/trunk@13949 2bbb7eff-a529-9590-31e7-b0007b416f81
 2014-03-25 23:29:53 +00:00
commit-bot@chromium.org
13e6576424 Remove forceRenderTargetFlush (unused) 
R=robertphillips@google.com

Author: bsalomon@google.com

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

git-svn-id: http://skia.googlecode.com/svn/trunk@13948 2bbb7eff-a529-9590-31e7-b0007b416f81
 2014-03-25 22:07:24 +00:00
senorblanco@chromium.org
6aeabb1694 Speculative Mac 10.6 fix: disable medium & high filter quality tests. 
BUG=skia:
TBR=mtklein@google.com

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

git-svn-id: http://skia.googlecode.com/svn/trunk@13947 2bbb7eff-a529-9590-31e7-b0007b416f81
 2014-03-25 21:12:18 +00:00
commit-bot@chromium.org
711d6f397b Fix bug on android with GL_EXT_debug_marker 
A device was finding the extension string, but was returning NULL
when getting the proc addresses

BUG=skia:
R=bsalomon@google.com

Author: egdaniel@google.com

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

git-svn-id: http://skia.googlecode.com/svn/trunk@13946 2bbb7eff-a529-9590-31e7-b0007b416f81
 2014-03-25 21:01:13 +00:00
commit-bot@chromium.org
ffc224f802 Add a minimal --undefok to SkCommandLineFlags. 
Similar in spirit to gflags' undefok, I'd like to be able to ignore
specific unknown flags.  This lets me run the same command line on, say,
a branch that's got a new flag and on a clean branch tracking
origin/master.  This is handy for performance comparison, etc.

It's not essential, and if you hate this I can find another way.

As an example, I want to compare the runtime of SKP recording with my new code.  I've added a flag --skr to bench_record to help this.  So I want to compare

origin/master: out/Release/bench_record
my patch:      out/Release/bench_record --skr

This lets me run both as out/Release/bench_record --undefok skr --skr, which is handy for scripts and things.

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

Author: mtklein@chromium.org

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

git-svn-id: http://skia.googlecode.com/svn/trunk@13945 2bbb7eff-a529-9590-31e7-b0007b416f81
 2014-03-25 21:00:02 +00:00
senorblanco@chromium.org
afb26eef13 Speculative Mac 10.6 fix: remove useless code from matriximagefilter GM. 
TBR=mtklein@google.com
BUG=skia:

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

git-svn-id: http://skia.googlecode.com/svn/trunk@13944 2bbb7eff-a529-9590-31e7-b0007b416f81
 2014-03-25 20:47:29 +00:00
fmalita@google.com
f41e93b06a Suppress failing GMs for rebaseline. 
https://codereview.chromium.org/203203004 caused a couple of minor GM
diffs:

fontscaler
bleed

TBR=mtklein@google.com

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

git-svn-id: http://skia.googlecode.com/svn/trunk@13943 2bbb7eff-a529-9590-31e7-b0007b416f81
 2014-03-25 19:36:20 +00:00
commit-bot@chromium.org
2a1704f362 Further tweak compare_codereview.py. 
- only show details for bots where at least one side failed
- dedup identical failures

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

Author: mtklein@chromium.org

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

git-svn-id: http://skia.googlecode.com/svn/trunk@13942 2bbb7eff-a529-9590-31e7-b0007b416f81
 2014-03-25 18:02:17 +00:00
senorblanco@chromium.org
fd0ec2c76a Implement a generic matrix transform image filter. 
This will be used in Blink to accommodate matrices that contain
rotation or shearing. This is a generalization of SkResizeImageFilter,
so I've replaced all uses of SkResizeImageFilter in Skia. (It might be
easier to review by diffing it with SkResizeImageFilter, too.)

R=reed@google.com

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

git-svn-id: http://skia.googlecode.com/svn/trunk@13941 2bbb7eff-a529-9590-31e7-b0007b416f81
 2014-03-25 17:35:10 +00:00
commit-bot@chromium.org
d9ea09e1f2 Consolidate SkCanvas matrix virtuals. 
Remove didTranslate, didScale, didRotate & didSkew, and rely on
didConcat instead. Subclasses can sniff the matrix type if they want to
differentiate.

(work in progress)

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

Author: fmalita@chromium.org

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

git-svn-id: http://skia.googlecode.com/svn/trunk@13940 2bbb7eff-a529-9590-31e7-b0007b416f81
 2014-03-25 17:32:26 +00:00
reed@google.com
7111d463ce Revert "Revert of implement readPixels and writePixels natively, w/o using the (deprecated) (https://codereview.chromium.org/199733016/)" 
This reverts commit 9a90bd16dc6756395c422adf0f24560d033ed9ea.

BUG=skia:
R=bsalomon@google.com

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

git-svn-id: http://skia.googlecode.com/svn/trunk@13939 2bbb7eff-a529-9590-31e7-b0007b416f81
 2014-03-25 16:20:24 +00:00
commit-bot@chromium.org
e6984a8c5e Fix for int to bool in GrInOrderDrawBuffer 
NOTREECHECK=True
NOTRY=True
R=bsalomon@google.com
TBR=bsalomon@google.com
BUG=skia:

Author: egdaniel@google.com

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

git-svn-id: http://skia.googlecode.com/svn/trunk@13938 2bbb7eff-a529-9590-31e7-b0007b416f81
 2014-03-25 15:49:59 +00:00
commit-bot@chromium.org
b0a6578c7f platform_tools/barelinux/bin/arm64_make script 
Motivation: an upcoming CL will change the Gyp variables.
That CL can change this script and the deps roll bot will
pick up those changes.
NOTRY=true
R=borenet@google.com, djsollen@google.com

Author: halcanary@google.com

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

git-svn-id: http://skia.googlecode.com/svn/trunk@13937 2bbb7eff-a529-9590-31e7-b0007b416f81
 2014-03-25 15:37:36 +00:00
commit-bot@chromium.org
2a05de0c04 Add Gpu Tracing to Ganesh 
BUG=skia:2316
R=bsalomon@google.com, tomhudson@google.com

Author: egdaniel@google.com

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

git-svn-id: http://skia.googlecode.com/svn/trunk@13936 2bbb7eff-a529-9590-31e7-b0007b416f81
 2014-03-25 15:17:32 +00:00
commit-bot@chromium.org
f2ef1587e4 Tweak compare_codereview.py. 
- summary at end so I don't have to scroll back up
  - tweak the diff markers a bit
  - strip the test runtimes

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

Author: mtklein@chromium.org

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

git-svn-id: http://skia.googlecode.com/svn/trunk@13935 2bbb7eff-a529-9590-31e7-b0007b416f81
 2014-03-25 15:16:27 +00:00
commit-bot@chromium.org
2fe641b9f0 Remove more flags not needed by android framework. 
R=djsollen@google.com, reed@google.com

Author: scroggo@google.com

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

git-svn-id: http://skia.googlecode.com/svn/trunk@13934 2bbb7eff-a529-9590-31e7-b0007b416f81
 2014-03-25 15:14:18 +00:00
commit-bot@chromium.org
26632630fd Add GM that tests GrTextureDomain and fix bug where kDecal_Mode gets incorrectly ignored. 
R=robertphillips@google.com

Author: bsalomon@google.com

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

git-svn-id: http://skia.googlecode.com/svn/trunk@13933 2bbb7eff-a529-9590-31e7-b0007b416f81
 2014-03-25 15:13:18 +00:00
commit-bot@chromium.org
231f6b81c2 Revert of implement readPixels and writePixels natively, w/o using the (deprecated) (https://codereview.chromium.org/199733016/) 
Reason for revert:
Android bots segfaulting in tests.

Original issue's description:
> implement readPixels and writePixels natively, w/o using the (deprecated)
> SkCanvas::Config8888 enum.
>
> Revert "Revert "hide Config8888 entirely". Broke a bunch of builds."
>
> This reverts commit 763277ba157fef0f651004bb98a189e9f1ac730b.
>
> Needs chrome to remove the READPIXELS guard from skia's .gyp
>
> Committed: https://code.google.com/p/skia/source/detail?r=13931

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

Author: mtklein@google.com

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

git-svn-id: http://skia.googlecode.com/svn/trunk@13932 2bbb7eff-a529-9590-31e7-b0007b416f81
 2014-03-25 13:38:44 +00:00
reed@google.com
1121170477 implement readPixels and writePixels natively, w/o using the (deprecated) 
SkCanvas::Config8888 enum.

Revert "Revert "hide Config8888 entirely". Broke a bunch of builds."

This reverts commit 763277ba157fef0f651004bb98a189e9f1ac730b.

Needs chrome to remove the READPIXELS guard from skia's .gyp

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

git-svn-id: http://skia.googlecode.com/svn/trunk@13931 2bbb7eff-a529-9590-31e7-b0007b416f81
 2014-03-25 12:00:30 +00:00
commit-bot@chromium.org
9b62aa156b Make it possible to draw multiple paths at once to a draw target 
Add interface to draw multiple paths in a single "command" to a draw
target. Implement this interface in GrGpuGL with NVPR "instanced"
calls.

The instanced calls accept list of paths and list of transformations as
their parameters. The transformations are at this moment expected to be
2d affine transformations, as the functions are called only for text
rendering.

This will be used when drawing fonts. Later it can be maybe be used in
GrInOrderDrawBuffer to aggregate many draw calls into one instanced draw
call, similar to drawing rects.

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

Author: kkinnunen@nvidia.com

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

git-svn-id: http://skia.googlecode.com/svn/trunk@13930 2bbb7eff-a529-9590-31e7-b0007b416f81
 2014-03-25 11:59:40 +00:00
commit-bot@chromium.org
5c260f41af Whitespace change to trigger builds for new GCE compile bots 
NOTREECHECKS=true
BUG=skia:2323
TBR=

Author: rmistry@google.com

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

git-svn-id: http://skia.googlecode.com/svn/trunk@13929 2bbb7eff-a529-9590-31e7-b0007b416f81
 2014-03-25 11:45:49 +00:00
skia.committer@gmail.com
6e4eb21d9c Sanitizing source files in Housekeeper-Nightly 
git-svn-id: http://skia.googlecode.com/svn/trunk@13928 2bbb7eff-a529-9590-31e7-b0007b416f81
 2014-03-25 03:02:32 +00:00
commit-bot@chromium.org
e8807f49ed SkPaint: eliminate some dead bytes in 64-bit build. 
+ memcpy-based copy constructor was hiding this gap -> manual copy constructor.
+ Split tests for finer-grained failures.

BUG=skia:

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

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

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

Author: mtklein@chromium.org

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

git-svn-id: http://skia.googlecode.com/svn/trunk@13927 2bbb7eff-a529-9590-31e7-b0007b416f81
 2014-03-24 23:03:11 +00:00
commit-bot@chromium.org
a2b44dc588 SkFontHost_linux - dup stream instead of ref 
R=bungeman@google.com

Author: halcanary@google.com

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

git-svn-id: http://skia.googlecode.com/svn/trunk@13926 2bbb7eff-a529-9590-31e7-b0007b416f81
 2014-03-24 21:42:01 +00:00
senorblanco@chromium.org
28ae55de3c Fix Mac Debug clang build. 
TBR=bsalomon@google.com

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

git-svn-id: http://skia.googlecode.com/svn/trunk@13925 2bbb7eff-a529-9590-31e7-b0007b416f81
 2014-03-24 21:32:28 +00:00
commit-bot@chromium.org
9a1176c53b Mark dashing_gpu and complexclip2_rect_aa_gpu as ignore-failure on Win7 perspective 
BUG=skia:2245
R=epoger@google.com

Author: borenet@google.com

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

git-svn-id: http://skia.googlecode.com/svn/trunk@13924 2bbb7eff-a529-9590-31e7-b0007b416f81
 2014-03-24 20:58:21 +00:00
senorblanco@chromium.org
09843fd5c1 Fix for crash on large image blur sigma values. 
This was crashing on the GPU path, due to a failed texture allocation.
The belt-and-suspenders fix is to:

1) Limit the GPU path to only allocate up to maxTextureSize.
2) Limit both the raster and GPU paths to reasonable blur sizes (box blur
   kernel size of 1000, resulting in a sigma limit of 532).

R=bsalomon@google.com
BUG=skia:

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

git-svn-id: http://skia.googlecode.com/svn/trunk@13923 2bbb7eff-a529-9590-31e7-b0007b416f81
 2014-03-24 20:50:59 +00:00
commit-bot@chromium.org
7b78981b4c gather GM tests which are disabled on Android 
BUG=skia:2326
R=borenet@google.com, djsollen@google.com

Author: epoger@google.com

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

git-svn-id: http://skia.googlecode.com/svn/trunk@13922 2bbb7eff-a529-9590-31e7-b0007b416f81
 2014-03-24 20:07:44 +00:00
commit-bot@chromium.org
41056232e4 fix compare_to_expectations command line launch 
(SkipBuildbotRuns)
NOTREECHECKS=True
NOTRY=True
R=rmistry@google.com
TBR=rmistry

Author: epoger@google.com

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

git-svn-id: http://skia.googlecode.com/svn/trunk@13921 2bbb7eff-a529-9590-31e7-b0007b416f81
 2014-03-24 19:51:57 +00:00
commit-bot@chromium.org
adadf7c31f Add SkASSERT's to gl/Interface validate 
BUG=skia:
R=bsalomon@google.com

Author: egdaniel@google.com

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

git-svn-id: http://skia.googlecode.com/svn/trunk@13920 2bbb7eff-a529-9590-31e7-b0007b416f81
 2014-03-24 19:43:02 +00:00
commit-bot@chromium.org
75cf29be4d Add new experimental API to SkPicture to get "id" of current op 
When gathering information about a picture (in the new SkDevice::EXPERIMENTAL_optimize entry point) it is necessary to be able to correlate the gathered information with the command in the SkPicture (so the information can later be combined with the similarly indexed information from the BBH). This entry point exposes that information to friend classes.

R=reed@google.com

Author: robertphillips@google.com

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

git-svn-id: http://skia.googlecode.com/svn/trunk@13919 2bbb7eff-a529-9590-31e7-b0007b416f81
 2014-03-24 19:40:49 +00:00
commit-bot@chromium.org
2a8be900db When clipping treat rrect corners where either the x or y radius is < 0.5 as square. 
BUG=skia:2181
R=robertphillips@google.com, jvanverth@google.com

Author: bsalomon@google.com

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

git-svn-id: http://skia.googlecode.com/svn/trunk@13918 2bbb7eff-a529-9590-31e7-b0007b416f81
 2014-03-24 19:24:59 +00:00
bungeman@google.com
1ba62629f4 Clean up SkOnce usage in SkFontMgr_Indirect. 
R=mtklein@google.com

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

git-svn-id: http://skia.googlecode.com/svn/trunk@13917 2bbb7eff-a529-9590-31e7-b0007b416f81
 2014-03-24 18:38:25 +00:00
commit-bot@chromium.org
a9dae71210 More distance field improvements: 
- Make sure we only use the 0,0 subpixel glyph
- Copy image data into outsized buffer to ensure we capture outer edges
- Change edge dump to blend better with original glyph
- Edges are detected across >128 and <128 boundaries, or when
  there are two non-zero <128 pixels next to each other

BUG=skia:
R=robertphillips@google.com

Author: jvanverth@google.com

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

git-svn-id: http://skia.googlecode.com/svn/trunk@13916 2bbb7eff-a529-9590-31e7-b0007b416f81
 2014-03-24 18:34:04 +00:00
commit-bot@chromium.org
2ac68c6892 Add tools to generated Android.mk 
Include the skia tools (bench, gm, tests) in the generated Android
make file for the framework. They are commented out, so that a tester
can include them if desired.

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

Author: scroggo@google.com

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

git-svn-id: http://skia.googlecode.com/svn/trunk@13915 2bbb7eff-a529-9590-31e7-b0007b416f81
 2014-03-24 18:26:36 +00:00
reed@google.com
46ee398e3e remove SK_SUPPORT_LEGACY_READPIXELSCONFIG 
BUG=skia:

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

git-svn-id: http://skia.googlecode.com/svn/trunk@13914 2bbb7eff-a529-9590-31e7-b0007b416f81
 2014-03-24 18:07:24 +00:00
commit-bot@chromium.org
d3ff154669 rebaseline Nexus10 results obscured by skia:2313 
BUG=skia:2313
NOTREECHECKS=True
NOTRY=True
R=bsalomon@google.com
TBR=bsalomon

Author: epoger@google.com

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

git-svn-id: http://skia.googlecode.com/svn/trunk@13913 2bbb7eff-a529-9590-31e7-b0007b416f81
 2014-03-24 17:52:28 +00:00
commit-bot@chromium.org
e812c29519 Add skimage expectations for Arm8_64 
NOTRY=true
R=djsollen@google.com, scroggo@google.com, borenet@google.com

Author: halcanary@google.com

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

git-svn-id: http://skia.googlecode.com/svn/trunk@13912 2bbb7eff-a529-9590-31e7-b0007b416f81
 2014-03-24 17:44:00 +00:00
commit-bot@chromium.org
ca2b441e3f Remove unnecessary isrect code in clip mask manager 
R=robertphillips@google.com

Author: bsalomon@google.com

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

git-svn-id: http://skia.googlecode.com/svn/trunk@13911 2bbb7eff-a529-9590-31e7-b0007b416f81
 2014-03-24 17:30:48 +00:00
commit-bot@chromium.org
175eaf62fa Update expectations for Ubuntu12-GTX660 
Move ATI5770 expectations to GTX660

BUG=skia:2325
NOTRY=true
R=epoger@google.com

Author: borenet@google.com

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

git-svn-id: http://skia.googlecode.com/svn/trunk@13910 2bbb7eff-a529-9590-31e7-b0007b416f81
 2014-03-24 16:59:09 +00:00
bungeman@google.com
d58a856418 Have SkTArray state that it default-initializes. 
The current comments in SkTArray lead one to believe that it is default
constructing all types. However, it is not calling the default
constructor for primitive types, it is actually default-initializing.

R=bsalomon@google.com

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

git-svn-id: http://skia.googlecode.com/svn/trunk@13909 2bbb7eff-a529-9590-31e7-b0007b416f81
 2014-03-24 15:55:01 +00:00
commit-bot@chromium.org
61c9b835d1 Manual memset to work around bogus compiler warning bug. 
BUG=skia:2215
R=bsalomon@google.com, mtklein@google.com

Author: mtklein@chromium.org

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

git-svn-id: http://skia.googlecode.com/svn/trunk@13908 2bbb7eff-a529-9590-31e7-b0007b416f81
 2014-03-24 15:52:33 +00:00
commit-bot@chromium.org
dc9f69fed8 Add skimage baselines for Ubuntu12-GTX660 bots 
BUG=skia:2325
R=scroggo@google.com

Author: borenet@google.com

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

git-svn-id: http://skia.googlecode.com/svn/trunk@13907 2bbb7eff-a529-9590-31e7-b0007b416f81
 2014-03-24 15:40:42 +00:00
commit-bot@chromium.org
a723feec39 Fix 10.6 build: double -> float. 
BUG=skia:
R=robertphillips@google.com, mtklein@google.com, reed@google.com

Author: mtklein@chromium.org

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

git-svn-id: http://skia.googlecode.com/svn/trunk@13906 2bbb7eff-a529-9590-31e7-b0007b416f81
 2014-03-24 14:54:04 +00:00
commit-bot@chromium.org
04eff72bf0 Add test cases for small radii to rrect GMs. 
BUG=skia:2181
R=robertphillips@google.com

Author: bsalomon@google.com

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

git-svn-id: http://skia.googlecode.com/svn/trunk@13905 2bbb7eff-a529-9590-31e7-b0007b416f81
 2014-03-24 14:53:09 +00:00