Граф коммитов

11809 Коммитов

Автор SHA1 Сообщение Дата
commit-bot@chromium.org 6fcd1ef244 Add flag for SkGpuSurface creation to enable distance fields.
BUG=skia:2173
R=bsalomon@google.com, reed@google.com, bungeman@google.com

Author: jvanverth@google.com

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

git-svn-id: http://skia.googlecode.com/svn/trunk@14525 2bbb7eff-a529-9590-31e7-b0007b416f81
2014-05-02 12:39:41 +00:00
skia.committer@gmail.com 9a40803f2b Sanitizing source files in Housekeeper-Nightly
git-svn-id: http://skia.googlecode.com/svn/trunk@14524 2bbb7eff-a529-9590-31e7-b0007b416f81
2014-05-02 03:03:47 +00:00
bungeman@google.com 89457e7146 Rebaselines for r14518 (Add support for kEmbeddedBitmapText_Flag to DirectWrite.)
git-svn-id: http://skia.googlecode.com/svn/trunk@14523 2bbb7eff-a529-9590-31e7-b0007b416f81
2014-05-01 22:37:56 +00:00
commit-bot@chromium.org 9d5e3f11a3 Fix image decode thrashing when drawing a very large source image to a GPU canvas
R=bsalomon@google.com

Author: junov@chromium.org

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

git-svn-id: http://skia.googlecode.com/svn/trunk@14522 2bbb7eff-a529-9590-31e7-b0007b416f81
2014-05-01 21:23:19 +00:00
commit-bot@chromium.org 90d81c9674 DM: Apply initial transform in --skr mode.
BUG=skia:2378
R=reed@google.com, mtklein@google.com

Author: mtklein@chromium.org

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

git-svn-id: http://skia.googlecode.com/svn/trunk@14521 2bbb7eff-a529-9590-31e7-b0007b416f81
2014-05-01 21:06:39 +00:00
commit-bot@chromium.org 020636350b Remove dead code.
No files reference this file.

R=reed@google.com

Author: scroggo@google.com

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

git-svn-id: http://skia.googlecode.com/svn/trunk@14520 2bbb7eff-a529-9590-31e7-b0007b416f81
2014-05-01 21:03:53 +00:00
commit-bot@chromium.org d9efd241bf Add checkerboard under the image.
BUG=skia:
R=mtklein@google.com

Author: jcgregorio@google.com

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

git-svn-id: http://skia.googlecode.com/svn/trunk@14519 2bbb7eff-a529-9590-31e7-b0007b416f81
2014-05-01 20:52:12 +00:00
bungeman@google.com 058670b1e5 Add support for kEmbeddedBitmapText_Flag to DirectWrite.
R=reed@google.com

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

git-svn-id: http://skia.googlecode.com/svn/trunk@14518 2bbb7eff-a529-9590-31e7-b0007b416f81
2014-05-01 20:39:14 +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 1e2a0cba37 Fix history on workspaces, where you couldn't click on old tries.
Also allow editing the first and last line because you might need
to do that to fix "old" tries that are already stored in the database.
By "old" I mean yesterday.

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

Author: jcgregorio@google.com

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

git-svn-id: http://skia.googlecode.com/svn/trunk@14516 2bbb7eff-a529-9590-31e7-b0007b416f81
2014-05-01 20:17:18 +00:00
commit-bot@chromium.org 70222fadf0 Run Squid as a reverse caching proxy on port 80 and proxy the requests
to the server running on port 8000.

BUG=skia:
R=mtklein@google.com

Author: jcgregorio@google.com

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

git-svn-id: http://skia.googlecode.com/svn/trunk@14515 2bbb7eff-a529-9590-31e7-b0007b416f81
2014-05-01 20:10:03 +00:00
commit-bot@chromium.org e901b6de3e create struct to hold all the params passed around for shader::context
BUG=skia:
R=scroggo@google.com, dominikg@chromium.org

Author: reed@google.com

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

git-svn-id: http://skia.googlecode.com/svn/trunk@14514 2bbb7eff-a529-9590-31e7-b0007b416f81
2014-05-01 19:31:31 +00:00
commit-bot@chromium.org 123f3d74e3 Add more detailed logging when things go wrong in android_run_skia
R=borenet@google.com, halcanary@google.com

Author: djsollen@google.com

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

git-svn-id: http://skia.googlecode.com/svn/trunk@14513 2bbb7eff-a529-9590-31e7-b0007b416f81
2014-05-01 19:30:35 +00:00
commit-bot@chromium.org 658e59507d tweaks to tab CSS for rebaseline server page; moar pretty
BUG=skia:
R=epoger@google.com

Author: humper@google.com

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

git-svn-id: http://skia.googlecode.com/svn/trunk@14512 2bbb7eff-a529-9590-31e7-b0007b416f81
2014-05-01 19:29:53 +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 f096afcd82 rebaseline simpleblurroundrect
BUG=skia:
TBR=epoger

Author: humper@google.com

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

git-svn-id: http://skia.googlecode.com/svn/trunk@14510 2bbb7eff-a529-9590-31e7-b0007b416f81
2014-05-01 19:22:41 +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 e83b9b7c20 Remove SkDEBUGFAILs that are problematic for Chromium
BUG=368107
R=egdaniel@google.com

Author: bsalomon@google.com

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

git-svn-id: http://skia.googlecode.com/svn/trunk@14508 2bbb7eff-a529-9590-31e7-b0007b416f81
2014-05-01 19:21:41 +00:00
commit-bot@chromium.org a60538e954 Move to a theme that more closely matches what was there before.
Also, since it's a variation of "default" we can drop a whole file.

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

Author: jcgregorio@google.com

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

git-svn-id: http://skia.googlecode.com/svn/trunk@14507 2bbb7eff-a529-9590-31e7-b0007b416f81
2014-05-01 19:21:33 +00:00
commit-bot@chromium.org 3f032156c8 DM: Push GPU-parent child tasks to the front of the queue.
Like yesterday's change to run CPU-parent child tasks serially in thread, this
reduces peak memory usage by improving the temporaly locality of the bitmaps we
create.

E.g. Let's say we start with tasks A B C and D
    Queue: [ A B C D ]
Running A creates A' and A", which depend on a bitmap created by A.
    Queue: [ B C D A' A" * ]
That bitmap now needs sit around in RAM while B C and D run pointlessly and can
only be destroyed at *.  If instead we do this and push dependent child tasks
to the front of the queue, the queue and bitmap lifetime looks like this:
    Queue: [ A' A" * B C D ]

This is much, much worse in practice because the queue is often several thousand
tasks long.  100s of megs of bitmaps can pile up for 10s of seconds pointlessly.

To make this work we add addNext() to SkThreadPool and its cousin DMTaskRunner.
I also took the opportunity to swap head and tail in the threadpool
implementation so it matches the comments and intuition better: we always pop
the head, add() puts it at the tail, addNext() at the head.


Before
  Debug:   49s, 1403352k peak
  Release: 16s, 2064008k peak

After
  Debug:   49s, 1234788k peak
  Release: 15s, 1903424k peak

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

Author: mtklein@chromium.org

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

git-svn-id: http://skia.googlecode.com/svn/trunk@14506 2bbb7eff-a529-9590-31e7-b0007b416f81
2014-05-01 17:41:32 +00:00
commit-bot@chromium.org 6c611940b4 Whitespace change to test the Skia CQ
(SkipBuildbotRuns)

BUG=skia:
R=fmalita@chromium.org

Author: rmistry@google.com

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

git-svn-id: http://skia.googlecode.com/svn/trunk@14505 2bbb7eff-a529-9590-31e7-b0007b416f81
2014-05-01 16:30:30 +00:00
reed@google.com 2e74f9d375 remove code behind SK_SUPPORT_LEGACY_PROCXFERMODE
BUG=skia:
R=scroggo@google.com

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

git-svn-id: http://skia.googlecode.com/svn/trunk@14504 2bbb7eff-a529-9590-31e7-b0007b416f81
2014-05-01 15:56:52 +00:00
commit-bot@chromium.org c2d6a20ef8 Improve Android gdbserver and gdb_ex scripts
- Don't complain if $GDB_TMP_DIR already exists
- Since $GDB_TMP_DIR/gdb.setup might already exist, overwrite the file.

NOTRY=true
R=djsollen@google.com

Author: halcanary@google.com

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

git-svn-id: http://skia.googlecode.com/svn/trunk@14503 2bbb7eff-a529-9590-31e7-b0007b416f81
2014-05-01 15:34:28 +00:00
commit-bot@chromium.org ae4976c9d0 reduce total number of segments in giant-dash
still exercises large coordinates, but won't kill our memory usage on 32bit bots

NOTRY=True
R=caryclark@google.com

Author: reed@google.com

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

git-svn-id: http://skia.googlecode.com/svn/trunk@14502 2bbb7eff-a529-9590-31e7-b0007b416f81
2014-05-01 15:30:52 +00:00
commit-bot@chromium.org 508022cff0 expose ConvertRadiusToSigma to aid clients in the API transition to sigma
NOTRY=True
R=robertphillips@google.com, fmalita@chromium.org

Author: reed@google.com

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

git-svn-id: http://skia.googlecode.com/svn/trunk@14501 2bbb7eff-a529-9590-31e7-b0007b416f81
2014-05-01 15:24:55 +00:00
commit-bot@chromium.org 47f9419760 Revert of re-enable simpleblurroundrect gm (https://codereview.chromium.org/263823002/)
Reason for revert:
broken rebaseline.

Original issue's description:
> re-enable simpleblurroundrect gm
>
> BUG=skia:
> TBR=caryclark
>
> Committed: http://code.google.com/p/skia/source/detail?r=14498

R=caryclark@google.com
TBR=caryclark@google.com
NOTREECHECKS=true
NOTRY=true
BUG=skia:

Author: humper@google.com

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

git-svn-id: http://skia.googlecode.com/svn/trunk@14500 2bbb7eff-a529-9590-31e7-b0007b416f81
2014-05-01 15:18:06 +00:00
fmalita@google.com 950306ccf1 Use CodeMirror for WebTry snippets.
CodeMirror (http://codemirror.net) is a rich code editor. This CL
adds the needed library and wires it with some minimal features, to
update the editor appearance to something like this:
http://codemirror.net/demo/theme.html?ambiance

We can later add Skia-customized features (custom keyword highlighting,
code completion, etc.).

(only tested locally)

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

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

git-svn-id: http://skia.googlecode.com/svn/trunk@14499 2bbb7eff-a529-9590-31e7-b0007b416f81
2014-05-01 15:14:56 +00:00
commit-bot@chromium.org 4363a66662 re-enable simpleblurroundrect gm
BUG=skia:
R=caryclark@google.com
TBR=caryclark

Author: humper@google.com

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

git-svn-id: http://skia.googlecode.com/svn/trunk@14498 2bbb7eff-a529-9590-31e7-b0007b416f81
2014-05-01 14:38:45 +00:00
senorblanco@chromium.org 9195743aac Add a fix for a spurious assert in SkMatrixConvolutionImageFilter.
When matrix convolution processes border pixels with zero width, it
asserts in getAddr32() with an invalid x coordinate. The assert is
harmless, since the returned pointer is never accessed (the next line
is a loop from left to right, which does nothing, since left == right).
However, the fix is simple: early out on an empty rect before entering
the outer loop.

R=sugoi@chromium.org

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

git-svn-id: http://skia.googlecode.com/svn/trunk@14497 2bbb7eff-a529-9590-31e7-b0007b416f81
2014-05-01 14:03:41 +00:00
fmalita@google.com 64baf926ea Add fmalita@chromium.org to CQ_COMMITTERS.
R=rmistry@google.com, reed@google.com

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

git-svn-id: http://skia.googlecode.com/svn/trunk@14496 2bbb7eff-a529-9590-31e7-b0007b416f81
2014-05-01 13:32:21 +00:00
commit-bot@chromium.org e3916bfe0e Support unknown Android target devices via environment variables.
This is useful for working with prototypes and uncommon devices.

NOTRY=true
R=djsollen@google.com, scroggo@google.com

Author: halcanary@google.com

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

git-svn-id: http://skia.googlecode.com/svn/trunk@14495 2bbb7eff-a529-9590-31e7-b0007b416f81
2014-05-01 12:56:19 +00:00
commit-bot@chromium.org 3dbcb10e75 Display the color at a point.
BUG=skia:
R=mtklein@google.com

Author: jcgregorio@google.com

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

git-svn-id: http://skia.googlecode.com/svn/trunk@14494 2bbb7eff-a529-9590-31e7-b0007b416f81
2014-05-01 12:54:25 +00:00
commit-bot@chromium.org 9be9034e64 Rename expectations for Valgrind bot: ATI5770->GTX550Ti
This will likely cause GM failures, since the GPU has changed.

BUG=skia:2506
R=caryclark@google.com

Author: borenet@google.com

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

git-svn-id: http://skia.googlecode.com/svn/trunk@14493 2bbb7eff-a529-9590-31e7-b0007b416f81
2014-05-01 12:32:39 +00:00
skia.committer@gmail.com 24f6e29fc1 Sanitizing source files in Housekeeper-Nightly
git-svn-id: http://skia.googlecode.com/svn/trunk@14492 2bbb7eff-a529-9590-31e7-b0007b416f81
2014-05-01 03:04:54 +00:00
commit-bot@chromium.org f3e505984d add default impl for context methods on shader
These are reasonable return values, since both of these methods can return a known value (0)
which means that no context can be created. This also makes it easier for chrome's subclasses
which already do not want to create a context, but having them actually overridden makes
changing the virtual signatures much harder.

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

Author: reed@google.com

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

git-svn-id: http://skia.googlecode.com/svn/trunk@14491 2bbb7eff-a529-9590-31e7-b0007b416f81
2014-04-30 23:29:02 +00:00
senorblanco@chromium.org 374a6e7427 Rebaseline tileimagefilter on IntelRhb post-r14432.
TBR=caryclark@google.com
BUG=skia:

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

git-svn-id: http://skia.googlecode.com/svn/trunk@14490 2bbb7eff-a529-9590-31e7-b0007b416f81
2014-04-30 21:46:38 +00:00
commit-bot@chromium.org 725b0822be remove unneeded SK_SUPPORT_LEGACY_PROCXFERMODE
BUG=skia:
R=fmalita@google.com, fmalita@chromium.org

Author: reed@google.com

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

git-svn-id: http://skia.googlecode.com/svn/trunk@14489 2bbb7eff-a529-9590-31e7-b0007b416f81
2014-04-30 21:34:14 +00:00
commit-bot@chromium.org 6323844cb3 rebaseline_server: ignore builders we don't have any expectations for
(SkipBuildbotRuns)
BUG=skia:2486
NOTREECHECKS=True
NOTRY=True
R=rmistry@google.com
TBR=rmistry

Author: epoger@google.com

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

git-svn-id: http://skia.googlecode.com/svn/trunk@14488 2bbb7eff-a529-9590-31e7-b0007b416f81
2014-04-30 21:32:37 +00:00
commit-bot@chromium.org 1a98a0604b one valgrind.supp to rule them all.
R=mtklein@google.com, robertphillips@google.com, borenet@google.com

Author: bsalomon@google.com

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

git-svn-id: http://skia.googlecode.com/svn/trunk@14487 2bbb7eff-a529-9590-31e7-b0007b416f81
2014-04-30 21:10:13 +00:00
commit-bot@chromium.org b0c7156d5b DM: run child tasks that are already on the CPU threadpool serially
These tasks tend to do similar things with similar sized bitmaps, so running
them serially means we tend to hold 2x bitmaps at a time (golden and
comparison) instead of (1+k)x bitmaps (golden and k concurrent comparisons).

We still migrate GPU task's children over to the main CPU thread pool,
because they'll run faster there and free up capacity on the GPU thread.

Before
  Debug: 54s, 2.9G peak
  Release: 13s, 2.4G peak

After
  Debug: 48s, 1.5G peak
  Release: 15s, 2.0G peak

BUG=skia:2478
R=borenet@google.com, mtklein@google.com

Author: mtklein@chromium.org

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

git-svn-id: http://skia.googlecode.com/svn/trunk@14486 2bbb7eff-a529-9590-31e7-b0007b416f81
2014-04-30 20:47:30 +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 b0ba9f8b1d make gitignore happy with symlinks
See https://codereview.chromium.org/139473002 for similar CL.

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

Author: halcanary@google.com

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

git-svn-id: http://skia.googlecode.com/svn/trunk@14484 2bbb7eff-a529-9590-31e7-b0007b416f81
2014-04-30 19:55:51 +00:00
commit-bot@chromium.org 89126a6eda Set ulimits for the compile stage.
BUG=skia:
R=mtklein@google.com

Author: jcgregorio@google.com

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

git-svn-id: http://skia.googlecode.com/svn/trunk@14483 2bbb7eff-a529-9590-31e7-b0007b416f81
2014-04-30 19:38:51 +00:00
commit-bot@chromium.org 901d10d87b Add Valgrind suppressions for nvidia driver.
Did we recently switch the machine Valgrind runs on from an ati card to
an nvidia one?

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

Author: mtklein@chromium.org

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

git-svn-id: http://skia.googlecode.com/svn/trunk@14482 2bbb7eff-a529-9590-31e7-b0007b416f81
2014-04-30 19:20:42 +00:00
commit-bot@chromium.org 45d1d1d9a7 Rename SK_DEBUGBREAK to SK_ALWAYSBREAK
Committed: http://code.google.com/p/skia/source/detail?r=14473

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

Author: bsalomon@google.com

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

git-svn-id: http://skia.googlecode.com/svn/trunk@14481 2bbb7eff-a529-9590-31e7-b0007b416f81
2014-04-30 18:24:16 +00:00
commit-bot@chromium.org 715d88a4e9 Fix bug with starting at the home page.
BUG=skia:
R=mtklein@google.com

Author: jcgregorio@google.com

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

git-svn-id: http://skia.googlecode.com/svn/trunk@14480 2bbb7eff-a529-9590-31e7-b0007b416f81
2014-04-30 16:54:00 +00:00
commit-bot@chromium.org 86398e5d91 Avoid undefined behavior and enable asserts in ClampTest.
The old code here wasn't being careful to avoid int32_t overflow in slow_check.  Fix that.

R_ASSERT hasn't been doing anything for a while.  As a result, there are a couple bugs in SkClampRange, marked as such and commented out.  The asserts also weren't quite passing, so I fixed them up (allowing 0xFFFF to be considered either as part of the ramp or part of V1.)

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

Author: mtklein@chromium.org

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

git-svn-id: http://skia.googlecode.com/svn/trunk@14479 2bbb7eff-a529-9590-31e7-b0007b416f81
2014-04-30 16:51:51 +00:00
commit-bot@chromium.org 2a8abc4552 Turn off warnings as errors, also allow c++11 extensions.
BUG=skia:
R=mtklein@google.com

Author: jcgregorio@google.com

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

git-svn-id: http://skia.googlecode.com/svn/trunk@14478 2bbb7eff-a529-9590-31e7-b0007b416f81
2014-04-30 16:49:34 +00:00
commit-bot@chromium.org 618bb5269f remove inverse_paths from ignored tests
new expectations have been checked in

https://codereview.chromium.org/264653003

R=reed@android.com
TBR=reed
NOTRY=true

Author: caryclark@google.com

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

git-svn-id: http://skia.googlecode.com/svn/trunk@14477 2bbb7eff-a529-9590-31e7-b0007b416f81
2014-04-30 16:34:43 +00:00
commit-bot@chromium.org 62cf26f374 Revert of Rename SK_DEBUGBREAK to SK_ALWAYSBREAK (https://codereview.chromium.org/263553012/)
Reason for revert:
Broke windows bot

Original issue's description:
> Rename SK_DEBUGBREAK to SK_ALWAYSBREAK
>
> Committed: http://code.google.com/p/skia/source/detail?r=14473

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

Author: bsalomon@google.com

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

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