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

11137 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
commit-bot@chromium.org
f23910b8e9 New baselines for perspective switch 
BUG=skia:2245
R=epoger@google.com, bsalomon@google.com

Author: borenet@google.com

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

git-svn-id: http://skia.googlecode.com/svn/trunk@13652 2bbb7eff-a529-9590-31e7-b0007b416f81
 2014-03-04 14:41:52 +00:00
skia.committer@gmail.com
ade9a3485e Sanitizing source files in Housekeeper-Nightly 
git-svn-id: http://skia.googlecode.com/svn/trunk@13651 2bbb7eff-a529-9590-31e7-b0007b416f81
 2014-03-04 03:02:32 +00:00
commit-bot@chromium.org
3b98759529 rebaseline_server: keep going on exception in ImagePair.__init__() 
BUG=skia:2247
NOTREECHECKS=True
NOTRY=True
R=borenet@google.com
TBR=borenet

Author: epoger@google.com

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

git-svn-id: http://skia.googlecode.com/svn/trunk@13650 2bbb7eff-a529-9590-31e7-b0007b416f81
 2014-03-04 00:58:21 +00:00
commit-bot@chromium.org
1643b2c9bc This adds cull rect visualization to the debugger's "mega" visualization mode. 
R=fmalita@google.com, fmalita@chromium.org

Author: robertphillips@google.com

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

git-svn-id: http://skia.googlecode.com/svn/trunk@13649 2bbb7eff-a529-9590-31e7-b0007b416f81
 2014-03-03 23:25:41 +00:00
commit-bot@chromium.org
5f6ac03b00 Don't emit declaration of gl_FragPos unless also changing the origin. 
R=jvanverth@google.com

Author: bsalomon@google.com

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

git-svn-id: http://skia.googlecode.com/svn/trunk@13648 2bbb7eff-a529-9590-31e7-b0007b416f81
 2014-03-03 23:25:26 +00:00
commit-bot@chromium.org
b83ec64dde bench rebase after skp update. 
BUG=skia:2163
NOTRY=true
R=rmistry@google.com
TBR=rmistry@google.com

Author: bensong@google.com

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

git-svn-id: http://skia.googlecode.com/svn/trunk@13647 2bbb7eff-a529-9590-31e7-b0007b416f81
 2014-03-03 22:50:13 +00:00
senorblanco@chromium.org
6aa6fec0e3 Cleanup patch to move all of SkImageFilterUtils into SkImageFilter. 
This was a utility class that dates from before GPU code was allowed
in core. Now that it is, there's no reason not to have this
functionality in SkImageFilter.

Covered by existing tests.

R=reed@google.com

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

git-svn-id: http://skia.googlecode.com/svn/trunk@13646 2bbb7eff-a529-9590-31e7-b0007b416f81
 2014-03-03 22:13:56 +00:00
commit-bot@chromium.org
94e43ffae1 Baselines for skia:2146 
BUG=skia:2146
R=epoger@google.com, bsalomon@google.com

Author: borenet@google.com

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

git-svn-id: http://skia.googlecode.com/svn/trunk@13645 2bbb7eff-a529-9590-31e7-b0007b416f81
 2014-03-03 19:31:08 +00:00
commit-bot@chromium.org
085a6e476b Rename test files to end with Test.cpp. 
DM builds all of {bench,gm,test}/*.cpp.  A Windows build warned us that we were
trying to link typeface.obj twice.  This must have something to do with there
existing gm/typeface.cpp and tests/Typeface.cpp.  To be safe, make sure tests
have a Test.cpp suffix to disambiguate.

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

Author: mtklein@chromium.org

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

git-svn-id: http://skia.googlecode.com/svn/trunk@13644 2bbb7eff-a529-9590-31e7-b0007b416f81
 2014-03-03 19:23:28 +00:00
commit-bot@chromium.org
6f4fb0f129 Generating the 1M skps frequently yields truncated skps. This tool is intended to help automate weeding these out. 
Please see skbug:1057

rmistry for tools, gyp
mtklein for src\core & include\core

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

Author: robertphillips@google.com

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

git-svn-id: http://skia.googlecode.com/svn/trunk@13643 2bbb7eff-a529-9590-31e7-b0007b416f81
 2014-03-03 19:18:39 +00:00
commit-bot@chromium.org
1b94819fcb roll_deps: Return a tuple even when returning early 
This fixes the bot going red when DEPS is already up-to-date.

BUG=skia:
R=halcanary@google.com

Author: borenet@google.com

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

git-svn-id: http://skia.googlecode.com/svn/trunk@13642 2bbb7eff-a529-9590-31e7-b0007b416f81
 2014-03-03 17:57:41 +00:00
commit-bot@chromium.org
450d9ef4ac Add the ability to select bbh type, and include quadtree support. 
This is a breaking change to tileGridSize flag added in 184543003, as it now defaults to a sensible value but does not implicitly turn on the tile grid bbh.

BUG=skia:2242
R=tomhudson@google.com, mtklein@google.com, skyostil@chromium.org, skyostil@google.com

Author: iancottrell@google.com

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

git-svn-id: http://skia.googlecode.com/svn/trunk@13641 2bbb7eff-a529-9590-31e7-b0007b416f81
 2014-03-03 17:51:12 +00:00
commit-bot@chromium.org
768ac85655 The new "mega" viz mode both adds visualization and forces all drawing to the visible canvas (by replacing the active saveLayers with saves). 
R=bsalomon@google.com

Author: robertphillips@google.com

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

git-svn-id: http://skia.googlecode.com/svn/trunk@13640 2bbb7eff-a529-9590-31e7-b0007b416f81
 2014-03-03 16:32:17 +00:00
commit-bot@chromium.org
a39874b636 DM: tweak output. 
Show task name in verbose mode only, and add task runtime.

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

Author: mtklein@chromium.org

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

git-svn-id: http://skia.googlecode.com/svn/trunk@13639 2bbb7eff-a529-9590-31e7-b0007b416f81
 2014-03-03 15:44:56 +00:00
commit-bot@chromium.org
1426c1e9b6 DM: fix -w/-r problems stemming from PM/UPM conversions. 
DM will now read and write a custom image format, which begins first with a
normal PNG, but also includes the bitmap's raw pixels.  Most tools (file
browser, Preview, Chrome, Skia image decoder) will read the file as PNG.  DM
skips the encoded PNG and reads the raw pixels instead.

This scheme allows perfect pixel comparisons that never go through PM -> UPM or
UPM -> PM conversions, as long as you compare on a machine with the same native
pixel format as the machine which generated the images.  Since we've only ever
used this to do same-machine comparisons, that's more than good enough for now.
We could convert as needed to a standardized PM pixel format if we find we want
these files to be portable.

DM -w output now does increase to ~1.3G.  If that turns out to be annoyingly
big, I'm sure I can come up with a simple pixelwise RLE instead of writing
uncompressed pixels.

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

Author: mtklein@chromium.org

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

git-svn-id: http://skia.googlecode.com/svn/trunk@13638 2bbb7eff-a529-9590-31e7-b0007b416f81
 2014-03-03 15:43:56 +00:00
senorblanco@chromium.org
47d98c8e85 Fix CTM scaling and clipping of SkRectShaderImageFilter. 
Pass the CTM as part of the local matrix passed by
SkRectShaderImageFilter. Teach SkPerlinNoiseShader to respect the local
matrix. Embiggen imagefiltersscaled GM size to accommodate the new test
cases.

Note: will require rebaselines of imagefiltersscaled and imagefiltersclipped

R=sugoi@chromium.org
BUG=skia:

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

git-svn-id: http://skia.googlecode.com/svn/trunk@13637 2bbb7eff-a529-9590-31e7-b0007b416f81
 2014-03-03 14:58:09 +00:00
commit-bot@chromium.org
c9b2c885be New approach for GPU font atlas 
In the previous code, each GrTextStrike had exclusive access to one or more GrPlots in the texture atlas. This led to poor packing when only a few glyphs were used. This change allows GrTextStrikes to share GrPlots, thereby getting much better utilization of the entire texture.

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

Author: jvanverth@google.com

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

git-svn-id: http://skia.googlecode.com/svn/trunk@13636 2bbb7eff-a529-9590-31e7-b0007b416f81
 2014-03-03 14:30:25 +00:00
commit-bot@chromium.org
0bc406df48 Adding code to calculate Underline Thickness from Font Metrics, this will be useful when Skia is used with Blink/Chrome. Blink changes are uploaded with code change in patch https://codereview.chromium.org/147703002/ 
BUG=skia:
R=reed@android.com, edisonn@google.com, reed@google.com, mtklein@google.com, mtklein@chromium.org, bungeman@google.com

Author: h.joshi@samsung.com

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

git-svn-id: http://skia.googlecode.com/svn/trunk@13635 2bbb7eff-a529-9590-31e7-b0007b416f81
 2014-03-01 20:12:26 +00:00
skia.committer@gmail.com
370a89980b Sanitizing source files in Housekeeper-Nightly 
git-svn-id: http://skia.googlecode.com/svn/trunk@13634 2bbb7eff-a529-9590-31e7-b0007b416f81
 2014-03-01 03:02:09 +00:00
bsalomon@google.com
f4c06531dc Rebaseline convexclip2_aa gpu on win7 
Review URL: https://codereview.chromium.org/184993004

git-svn-id: http://skia.googlecode.com/svn/trunk@13633 2bbb7eff-a529-9590-31e7-b0007b416f81
 2014-02-28 22:21:29 +00:00
commit-bot@chromium.org
ef57b7e653 DM: make GPU tasks multithreaded again. Big refactor. 
The main meat of things is in SkThreadPool.  We can now give SkThreadPool a
type for each thread to create and destroy on its local stack.  It's TLS
without going through SkTLS.

I've split the DM tasks into CpuTasks that run on threads with no TLS, and
GpuTasks that run on threads with a thread local GrContextFactory.

The old CpuTask and GpuTask have been renamed to CpuGMTask and GpuGMTask.

Upshot: default run of out/Debug/dm goes from ~45 seconds to ~20 seconds.

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

Author: mtklein@chromium.org

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

git-svn-id: http://skia.googlecode.com/svn/trunk@13632 2bbb7eff-a529-9590-31e7-b0007b416f81
 2014-02-28 20:31:31 +00:00
commit-bot@chromium.org
d1a7e2ec6f DM: don't crash on Mac. 
BUG=skia:
R=reed@google.com, mtklein@google.com

Author: mtklein@chromium.org

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

git-svn-id: http://skia.googlecode.com/svn/trunk@13631 2bbb7eff-a529-9590-31e7-b0007b416f81
 2014-02-28 20:28:59 +00:00
commit-bot@chromium.org
f535561b3b Cleanup GrGLInterface after Chromium changes 
Depends on landing https://codereview.chromium.org/143263014

R=robertphillips@google.com

Author: bsalomon@google.com

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

git-svn-id: http://skia.googlecode.com/svn/trunk@13630 2bbb7eff-a529-9590-31e7-b0007b416f81
 2014-02-28 20:28:50 +00:00
robertphillips@google.com
ad4bcb71c9 Image rebaselines for r13627 (add new onClip* methods to SkCanvas) 
https://codereview.chromium.org/179123006/



git-svn-id: http://skia.googlecode.com/svn/trunk@13629 2bbb7eff-a529-9590-31e7-b0007b416f81
 2014-02-28 20:02:20 +00:00
commit-bot@chromium.org
e892615292 Adding flag to switch bench_record into tilegrid mode 
BUG=skia:
R=tomhudson@google.com, mtklein@google.com, skyostil@google.com, skyostil@chromium.org

Author: iancottrell@google.com

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

git-svn-id: http://skia.googlecode.com/svn/trunk@13628 2bbb7eff-a529-9590-31e7-b0007b416f81
 2014-02-28 19:25:11 +00:00
robertphillips@google.com
8f90a892c5 add new onClip* methods to SkCanvas 
https://codereview.chromium.org/183453002/



git-svn-id: http://skia.googlecode.com/svn/trunk@13627 2bbb7eff-a529-9590-31e7-b0007b416f81
 2014-02-28 18:19:39 +00:00
commit-bot@chromium.org
069c2a46ba Updates to the Android.mk writer. 
Keeping up with changes made to the Android.mk file that is
currently checked in.

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

Author: scroggo@google.com

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

git-svn-id: http://skia.googlecode.com/svn/trunk@13626 2bbb7eff-a529-9590-31e7-b0007b416f81
 2014-02-28 17:24:32 +00:00
reed@google.com
6c50cd31ed remove SK_SUPPORT_DEEPCOPYTO_CONFIG 
git-svn-id: http://skia.googlecode.com/svn/trunk@13625 2bbb7eff-a529-9590-31e7-b0007b416f81
 2014-02-28 16:30:45 +00:00
commit-bot@chromium.org
e72a408359 Updates to gyp files for building Android.mk 
R=djsollen@google.com

Author: scroggo@google.com

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

git-svn-id: http://skia.googlecode.com/svn/trunk@13624 2bbb7eff-a529-9590-31e7-b0007b416f81
 2014-02-28 16:07:39 +00:00
reed@google.com
842292f10f remove SK_SUPPORT_LEGACY_LAYERDRAWLOOPER_PAINTFLAGS -- not needed 
BUG=skia:
R=scroggo@google.com

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

git-svn-id: http://skia.googlecode.com/svn/trunk@13623 2bbb7eff-a529-9590-31e7-b0007b416f81
 2014-02-28 15:38:22 +00:00
robertphillips@google.com
03fc3b4f67 Revert of r13620 (add new onClip* methods to SkCanvas - https://codereview.chromium.org/183453002/) due to broken Chrome Canary and failing tests. 
git-svn-id: http://skia.googlecode.com/svn/trunk@13622 2bbb7eff-a529-9590-31e7-b0007b416f81
 2014-02-28 15:28:02 +00:00
commit-bot@chromium.org
d85f32ca40 Make GrConvexPolyEffect support inverse fills and non-AA rects 
BUG=skia:2151
R=robertphillips@google.com

Author: bsalomon@google.com

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

git-svn-id: http://skia.googlecode.com/svn/trunk@13621 2bbb7eff-a529-9590-31e7-b0007b416f81
 2014-02-28 14:43:26 +00:00
robertphillips@google.com
392c9be344 add new onClip* methods to SkCanvas 
https://codereview.chromium.org/183453002/



git-svn-id: http://skia.googlecode.com/svn/trunk@13620 2bbb7eff-a529-9590-31e7-b0007b416f81
 2014-02-28 14:35:45 +00:00
skia.committer@gmail.com
0e530754d3 Sanitizing source files in Housekeeper-Nightly 
git-svn-id: http://skia.googlecode.com/svn/trunk@13619 2bbb7eff-a529-9590-31e7-b0007b416f81
 2014-02-28 03:02:05 +00:00
commit-bot@chromium.org
9d0ecf48c4 Modify how gpu.gyp includes angle.gyp. 
Instead of including dependencies on angle.gyp and then removing
them if skia_angle is not true, only include angle.gyp to begin
with skia_angle is true.

This allows gyp_to_android.py to work when run in the Android tree,
where we don't have third_party/externals (since we do only a git
merge, and no gclient sync.

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

Author: scroggo@google.com

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

git-svn-id: http://skia.googlecode.com/svn/trunk@13618 2bbb7eff-a529-9590-31e7-b0007b416f81
 2014-02-27 20:40:31 +00:00
commit-bot@chromium.org
3107b6a85e add SkCanvas::NewRaster factory -- a very common use-case in chrome 
BUG=skia:
R=scroggo@google.com

Author: reed@google.com

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

git-svn-id: http://skia.googlecode.com/svn/trunk@13617 2bbb7eff-a529-9590-31e7-b0007b416f81
 2014-02-27 20:32:51 +00:00
commit-bot@chromium.org
4fcc3ca411 Add GrSet class built on top of RedBlackTree 
BUG=skia:
R=bsalomon@google.com

Author: egdaniel@google.com

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

git-svn-id: http://skia.googlecode.com/svn/trunk@13616 2bbb7eff-a529-9590-31e7-b0007b416f81
 2014-02-27 20:23:22 +00:00
commit-bot@chromium.org
f679d1bf38 Rename Path to Path2D 
BUG=skia:
R=robertphillips@google.com

Author: jcgregorio@google.com

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

git-svn-id: http://skia.googlecode.com/svn/trunk@13615 2bbb7eff-a529-9590-31e7-b0007b416f81
 2014-02-27 20:20:21 +00:00
commit-bot@chromium.org
64ca10287a Use chromium's gyp if third_party is not available. 
This is for building Android.mk inside an Android tree where there
is no third_party directory.

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

Author: scroggo@google.com

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

git-svn-id: http://skia.googlecode.com/svn/trunk@13614 2bbb7eff-a529-9590-31e7-b0007b416f81
 2014-02-27 18:58:51 +00:00
commit-bot@chromium.org
2b3a204bf6 replace gm_fprintf() calls with SkDebugf() 
BUG=skia:1221
R=bsalomon@google.com

Author: epoger@google.com

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

git-svn-id: http://skia.googlecode.com/svn/trunk@13613 2bbb7eff-a529-9590-31e7-b0007b416f81
 2014-02-27 18:45:26 +00:00
commit-bot@chromium.org
8dab8ecc93 rebaseline_server: fix "Results current as of <timestamp>" banner 
(SkipBuildbotRuns)
BUG=skia:2232
NOTREECHECKS=True
NOTRY=True
R=rmistry@google.com
TBR=rmistry

Author: epoger@google.com

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

git-svn-id: http://skia.googlecode.com/svn/trunk@13612 2bbb7eff-a529-9590-31e7-b0007b416f81
 2014-02-27 18:13:07 +00:00
commit-bot@chromium.org
210ae2a426 Culling API 
*** SKP format breaking change ***

Adding a couple of culling primitives: pushCull(SkRect) & popCull().

These are currently only plumbed for SKP playback quickreject.

At record time, we perform a couple of optimizations to trim down the
number of redundant culls:

  * collapse empty pushCull/popCull pairs
  * skip pushCull/popCull pairs nested within an identical cull rect

Things still missing/to consider:

  * use an inlineable, simplified quickreject (Mike's old prototype)
  * debugger visualization for cull boxes
  * BBH integration: the initial prototype had some minimal BBH support,
    but since the optimizations required expensive rewinds and culling
    is expected to be a BBH alternative, it got dropped.

R=bsalomon@google.com, reed@google.com, robertphillips@google.com, caryclark@google.com, tomhudson@google.com, iancottrell@google.com

Author: fmalita@chromium.org

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

git-svn-id: http://skia.googlecode.com/svn/trunk@13611 2bbb7eff-a529-9590-31e7-b0007b416f81
 2014-02-27 17:40:13 +00:00
commit-bot@chromium.org
6f954b956f Use SkTLazy to hold path in SkClipStack::Element 
R=reed@google.com, robertphillips@google.com

Author: bsalomon@google.com

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

git-svn-id: http://skia.googlecode.com/svn/trunk@13610 2bbb7eff-a529-9590-31e7-b0007b416f81
 2014-02-27 17:39:46 +00:00
commit-bot@chromium.org
939560b87a Move SkV8Example to SkSurface 
BUG=skia:
R=robertphillips@google.com

Author: jcgregorio@google.com

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

git-svn-id: http://skia.googlecode.com/svn/trunk@13609 2bbb7eff-a529-9590-31e7-b0007b416f81
 2014-02-27 17:39:40 +00:00
commit-bot@chromium.org
5e16ef74db Whitespace change to verify build fix 
R=rmistry@google.com
TBR=rmistry
NOTREECHECKS=true
NOTRY=true

Author: borenet@google.com

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

git-svn-id: http://skia.googlecode.com/svn/trunk@13608 2bbb7eff-a529-9590-31e7-b0007b416f81
 2014-02-27 15:24:06 +00:00
reed@google.com
48f31bdbb3 try to deprecate fFlagsMask from SkLayerDrawLooper 
We think we want to move around how flags/fields like linearText and strikeThru
are specified. SkPaint has helpers for nearly all of these, but LayerInfo in
the draw looper just exposes the raw bitfield.

On survey of chrome/android, it appears that no one uses those, so it may be
safe to just remove the feature entirely from the looper.

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

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

git-svn-id: http://skia.googlecode.com/svn/trunk@13607 2bbb7eff-a529-9590-31e7-b0007b416f81
 2014-02-27 14:27:44 +00:00
commit-bot@chromium.org
0b1afcc4ec Whitespace change to test CQ 
(SkipBuildbotRuns)
TBR=
BUG=skia:
NOTRY=true

Author: rmistry@google.com

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

git-svn-id: http://skia.googlecode.com/svn/trunk@13606 2bbb7eff-a529-9590-31e7-b0007b416f81
 2014-02-27 12:29:36 +00:00
commit-bot@chromium.org
d957984c1e Factory methods for heap-allocated SkAnnotation 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 SkAnnotation non-public and instead
provides factory methods for creating these objects on the heap.

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

Author: dominikg@chromium.org

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

git-svn-id: http://skia.googlecode.com/svn/trunk@13605 2bbb7eff-a529-9590-31e7-b0007b416f81
 2014-02-27 11:47:36 +00:00
skia.committer@gmail.com
4472301607 Sanitizing source files in Housekeeper-Nightly 
git-svn-id: http://skia.googlecode.com/svn/trunk@13604 2bbb7eff-a529-9590-31e7-b0007b416f81
 2014-02-27 03:02:34 +00:00
commit-bot@chromium.org
38aeb0fd7a DM: also run benches once. 
Also:
  - make GrMemoryPoolBenches threadsafe
  - some tweaks to various DM code
  - rename GM::shortName() to getName() to match benches and tests

On my desktop, (289 GMs, 617 benches) x 4 configs, 227 tests takes 46s in Debug, 14s in Release.  (Still minutes faster than running tests && bench && gm.)  GPU singlethreading is definitely the limiting factor again; going to reexamine whether that's helpful to thread it again.

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

Author: mtklein@chromium.org

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

git-svn-id: http://skia.googlecode.com/svn/trunk@13603 2bbb7eff-a529-9590-31e7-b0007b416f81
 2014-02-26 23:01:57 +00:00