Commit Graph

52 Commits

Author SHA1 Message Date
ziadb
bceddbcb72 SkAR: drawing text, shapes, rotation modes enabled, translating objects
To run this app, you need to create an out directory as such:
bin/gn gen out/arm64 --args='ndk="NDK_PATH" target_cpu="ABI"'

For now, the only supported ABI is arm64

Change-Id: I012f0c6a0550d80a0028f42177d5ca72974d848d
Bug: skia:
Reviewed-on: https://skia-review.googlesource.com/130980
Reviewed-by: Mike Reed <reed@google.com>
Reviewed-by: Mike Klein <mtklein@google.com>
Commit-Queue: Ziad Ben Hadj-Alouane <ziadb@google.com>
2018-06-19 19:10:54 +00:00
Brian Osman
63b3bfb711 Reland "Remove old references to SampleApp"
This reverts commit 3ff2b20057.

Reason for revert: Infra fires are out.

Original change's description:
> Revert "Remove old references to SampleApp"
> 
> This reverts commit 1c477fc263.
> 
> Reason for revert: Botpocalypse.
> Original change's description:
> > Remove old references to SampleApp
> > 
> > Docs-Preview: https://skia.org/?cl=135570
> > Change-Id: I330ffa964c2d90ca8d3cd844aabcd8616ccd0540
> > Reviewed-on: https://skia-review.googlesource.com/135570
> > Reviewed-by: Cary Clark <caryclark@google.com>
> > Commit-Queue: Brian Osman <brianosman@google.com>
> 
> TBR=halcanary@google.com,brianosman@google.com,caryclark@google.com
> 
> Change-Id: I514e2c7bca8a1ebd311593573a94e8a078695785
> No-Presubmit: true
> No-Tree-Checks: true
> No-Try: true
> Reviewed-on: https://skia-review.googlesource.com/135600
> Reviewed-by: Brian Osman <brianosman@google.com>
> Commit-Queue: Brian Osman <brianosman@google.com>

TBR=halcanary@google.com,brianosman@google.com,caryclark@google.com

Change-Id: I660482ef32acecf5b1bf24d2dec919bc68fde97e
No-Presubmit: true
No-Tree-Checks: true
No-Try: true
Reviewed-on: https://skia-review.googlesource.com/135660
Reviewed-by: Brian Osman <brianosman@google.com>
Commit-Queue: Brian Osman <brianosman@google.com>
2018-06-18 21:09:09 +00:00
Brian Osman
3ff2b20057 Revert "Remove old references to SampleApp"
This reverts commit 1c477fc263.

Reason for revert: Botpocalypse.
Original change's description:
> Remove old references to SampleApp
> 
> Docs-Preview: https://skia.org/?cl=135570
> Change-Id: I330ffa964c2d90ca8d3cd844aabcd8616ccd0540
> Reviewed-on: https://skia-review.googlesource.com/135570
> Reviewed-by: Cary Clark <caryclark@google.com>
> Commit-Queue: Brian Osman <brianosman@google.com>

TBR=halcanary@google.com,brianosman@google.com,caryclark@google.com

Change-Id: I514e2c7bca8a1ebd311593573a94e8a078695785
No-Presubmit: true
No-Tree-Checks: true
No-Try: true
Reviewed-on: https://skia-review.googlesource.com/135600
Reviewed-by: Brian Osman <brianosman@google.com>
Commit-Queue: Brian Osman <brianosman@google.com>
2018-06-18 19:32:09 +00:00
Brian Osman
1c477fc263 Remove old references to SampleApp
Docs-Preview: https://skia.org/?cl=135570
Change-Id: I330ffa964c2d90ca8d3cd844aabcd8616ccd0540
Reviewed-on: https://skia-review.googlesource.com/135570
Reviewed-by: Cary Clark <caryclark@google.com>
Commit-Queue: Brian Osman <brianosman@google.com>
2018-06-18 19:15:48 +00:00
Joe Gregorio
0060c3394c [lottiecap] Moved over from buildbot repo.
Command line application to build a 5x5 filmstrip
from a Lottie file in Chrome headless and then export
that filmstrip in a 1000x1000 PNG.

Bug: skia:
Change-Id: I38decac363f2d592fddc28b3f4ca9450c5851ac6
Reviewed-on: https://skia-review.googlesource.com/115100
Commit-Queue: Mike Klein <mtklein@google.com>
Reviewed-by: Mike Klein <mtklein@google.com>
2018-03-20 13:25:23 +00:00
Ben Wagner
bb7e8e3072 Ignore generated README.recipes.md
No-Try: true
Change-Id: I9ecabb4e2427bf84d81d9f0f3250038e8162bea7
Reviewed-on: https://skia-review.googlesource.com/64220
Reviewed-by: Eric Boren <borenet@google.com>
Commit-Queue: Ben Wagner <benjaminwagner@google.com>
2017-10-26 18:07:27 +00:00
Mike Klein
c722f79b6c clang on windows support
1) Run python bin/fetch-clang-win
2) Set clang_win = "../bin/clang_win"
3) ???
4) Profit

Most changes here are to pass the right -mfoo flags to Clang
to enable advanced instruction sets, or fixed warning-as-errors.

BUG=skia:2679

Change-Id: Ieed145d35c209131c7c16fdd3ee11a3de4a1a921
Reviewed-on: https://skia-review.googlesource.com/28740
Reviewed-by: Ben Wagner <bungeman@google.com>
Commit-Queue: Mike Klein <mtklein@chromium.org>
2017-07-31 18:39:23 +00:00
Ben Wagner
3d2a2f7220 [infra] Move Android and GPU maps into gen_tasks.go.
Bug: skia:6637
No-Try: true
Change-Id: I1aa47be9d039e8396f8bbf4e1c7e134fe258a1ce
Reviewed-on: https://skia-review.googlesource.com/19095
Reviewed-by: Eric Boren <borenet@google.com>
Commit-Queue: Ben Wagner <benjaminwagner@google.com>
2017-06-14 13:17:43 +00:00
Michael Jurka
3251ed8405 Refactor Vulkan support to support Fuchsia
- Refactor runtime lookup of Vulkan functions
- Support Magma surfaces
- Add build flags to toggle Vulkan support

BUG=skia:

Change-Id: Ic71965c453507882521443006c4155c7481a9a3f
Reviewed-on: https://skia-review.googlesource.com/9342
Commit-Queue: Greg Daniel <egdaniel@google.com>
Commit-Queue: Mike Klein <mtklein@google.com>
Reviewed-by: Mike Klein <mtklein@google.com>
Reviewed-by: Greg Daniel <egdaniel@google.com>
Reviewed-by: Michael Jurka <mikejurka@google.com>
Reviewed-by: Mike Klein <mtklein@chromium.org>
2017-04-05 17:32:09 +00:00
Hal Canary
b357dea546 bin/fetch-clang-format
Change-Id: I7deb9b49b4a3a361888a6afc07b4c6341a4b16cf
Reviewed-on: https://skia-review.googlesource.com/9410
Reviewed-by: Mike Klein <mtklein@chromium.org>
Commit-Queue: Hal Canary <halcanary@google.com>
2017-03-08 16:43:49 +00:00
Brian Osman
52d3e8da67 Add imgui.ini to .gitignore
This file is auto-generated by viewer's GUI library (to remember size and
position of windows).

BUG=skia:

Change-Id: Id363301d71d3df1d665c4e495a0d5062cdbc472b
Reviewed-on: https://skia-review.googlesource.com/9095
Reviewed-by: Brian Osman <brianosman@google.com>
2017-03-01 15:24:02 +00:00
Mike Klein
160907f8de Clean up more references to GYP.
Delete files only used by GYP, and files that used GYP.  Neither can
possibly be actively used.  Beyond that, just a couple doc tweaks.

Change-Id: I0220d7226e7bb9ed7c54a7d8f2906a718313c521
Reviewed-on: https://skia-review.googlesource.com/8062
Commit-Queue: Mike Klein <mtklein@chromium.org>
Reviewed-by: Hal Canary <halcanary@google.com>
2017-02-06 17:55:35 +00:00
Mike Klein
b621a35b43 drop depot_tools dependency in bin/fetch-gn
... and copy gn to bin/ when done to make it easy to find.

Change-Id: I1ec405b4c45efb828626ff7d904a417f69b39cb2
Reviewed-on: https://skia-review.googlesource.com/6962
Reviewed-by: Ben Wagner <bungeman@google.com>
Commit-Queue: Mike Klein <mtklein@chromium.org>
2017-01-12 19:54:50 +00:00
Brian Osman
b8c48c0c55 Remove skia.conf from .gitignore
BUG=skia:

GOLD_TRYBOT_URL= https://gold.skia.org/search?issue=3962

Change-Id: I2b4d9afda4a5cb393a52f34070ede03da170ee74
Reviewed-on: https://skia-review.googlesource.com/3962
Reviewed-by: Brian Salomon <bsalomon@google.com>
Commit-Queue: Brian Osman <brianosman@google.com>
2016-10-26 14:50:09 +00:00
borenet
1ed2ae45f5 Move Skia recipes from build repo
BUG=skia:5563
GOLD_TRYBOT_URL= https://gold.skia.org/search?issue=2175373002

Review-Url: https://codereview.chromium.org/2175373002
2016-07-26 11:52:17 -07:00
borenet
f9bd9da14a Add CIPD support for bot assets
BUG=skia:
GOLD_TRYBOT_URL= https://gold.skia.org/search?issue=2085473002

Review-Url: https://codereview.chromium.org/2085473002
2016-06-28 04:41:49 -07:00
mtklein
c04ff4788c GN
What we've got here is a little GN MVP.  It's lacking any knobs and doesn't yet build anything but libskia, zlib, libpng, and libjpeg-turbo.  I've been hopping back and forth between Linux at work and Mac at home.  These seem to be at least partially working, enough to build and run cmake/example.cpp.

The xcode backend seems to work.  From here, we can start exploring how to handle other backends (cmake,Android make, Google3).  There are a couple things I want to try:
  - add another backend like vs or xcode to GN directly
  - intercept via a custom toolchain
  - reverse from ninja -t commands
That last option seems kind of fun.

This tries to piggyback on Chrome's GN setup as much as possible.  Chrome's got quite a lot figured out, and we're basically required to do this if we want to have a single GN build system shareable by Chrome, our bots, and other clients.

This pulls in some new DEPS:
   - build: Chrome's GN configuration, and much more
   - buildtools: hashes for gn binary, pulled via hooks
   - tools/clang: hashes for Chrome's clang, pulled via hooks into third_party/llvm-build
It additionally symlinks tools/gyp to third_party/externals/gyp.  GN pulls some stuff from tools/gyp on Mac.

Have not yet tried building for Windows, Android, or iOS.

BUG=skia:
GOLD_TRYBOT_URL= https://gold.skia.org/search?issue=2087593002

Committed: https://skia.googlesource.com/skia/+/1d8de594f126b9a80bd8f8fa2005e90faf3b5b17
Review-Url: https://codereview.chromium.org/2087593002
2016-06-23 10:29:30 -07:00
mtklein
e4a712b665 GN: just new deps
These just are the DEPS changes from the previous GN CL, each rolled up to head.

I've removed the hooks to fetch GN and Clang... will have to figure out how to
deal with .gclient files in different places later.

BUG=skia:5452
GOLD_TRYBOT_URL= https://gold.skia.org/search?issue=2087403002

Review-Url: https://codereview.chromium.org/2087403002
2016-06-23 05:56:18 -07:00
mtklein
3917cf4ef7 Revert of GN (patchset #12 id:220001 of https://codereview.chromium.org/2087593002/ )
Reason for revert:
gclient not happy on some bots

Original issue's description:
> GN
>
> What we've got here is a little GN MVP.  It's lacking any knobs and doesn't yet build anything but libskia, zlib, libpng, and libjpeg-turbo.  I've been hopping back and forth between Linux at work and Mac at home.  These seem to be at least partially working, enough to build and run cmake/example.cpp.
>
> The xcode backend seems to work.  From here, we can start exploring how to handle other backends (cmake,Android make, Google3).  There are a couple things I want to try:
>   - add another backend like vs or xcode to GN directly
>   - intercept via a custom toolchain
>   - reverse from ninja -t commands
> That last option seems kind of fun.
>
> This tries to piggyback on Chrome's GN setup as much as possible.  Chrome's got quite a lot figured out, and we're basically required to do this if we want to have a single GN build system shareable by Chrome, our bots, and other clients.
>
> This pulls in some new DEPS:
>    - build: Chrome's GN configuration, and much more
>    - buildtools: hashes for gn binary, pulled via hooks
>    - tools/clang: hashes for Chrome's clang, pulled via hooks into third_party/llvm-build
> It additionally symlinks tools/gyp to third_party/externals/gyp.  GN pulls some stuff from tools/gyp on Mac.
>
> Have not yet tried building for Windows, Android, or iOS.
>
> BUG=skia:
> GOLD_TRYBOT_URL= https://gold.skia.org/search?issue=2087593002
>
> Committed: https://skia.googlesource.com/skia/+/1d8de594f126b9a80bd8f8fa2005e90faf3b5b17

TBR=bsalomon@google.com,mtklein@chromium.org
# Skipping CQ checks because original CL landed less than 1 days ago.
NOPRESUBMIT=true
NOTREECHECKS=true
NOTRY=true
BUG=skia:

Review-Url: https://codereview.chromium.org/2088253002
2016-06-22 10:07:07 -07:00
mtklein
1d8de594f1 GN
What we've got here is a little GN MVP.  It's lacking any knobs and doesn't yet build anything but libskia, zlib, libpng, and libjpeg-turbo.  I've been hopping back and forth between Linux at work and Mac at home.  These seem to be at least partially working, enough to build and run cmake/example.cpp.

The xcode backend seems to work.  From here, we can start exploring how to handle other backends (cmake,Android make, Google3).  There are a couple things I want to try:
  - add another backend like vs or xcode to GN directly
  - intercept via a custom toolchain
  - reverse from ninja -t commands
That last option seems kind of fun.

This tries to piggyback on Chrome's GN setup as much as possible.  Chrome's got quite a lot figured out, and we're basically required to do this if we want to have a single GN build system shareable by Chrome, our bots, and other clients.

This pulls in some new DEPS:
   - build: Chrome's GN configuration, and much more
   - buildtools: hashes for gn binary, pulled via hooks
   - tools/clang: hashes for Chrome's clang, pulled via hooks into third_party/llvm-build
It additionally symlinks tools/gyp to third_party/externals/gyp.  GN pulls some stuff from tools/gyp on Mac.

Have not yet tried building for Windows, Android, or iOS.

BUG=skia:
GOLD_TRYBOT_URL= https://gold.skia.org/search?issue=2087593002

Review-Url: https://codereview.chromium.org/2087593002
2016-06-22 09:52:13 -07:00
borenet
1346c25071 isolate_android_sdk: Find or download isolate binary, fix infra path
BUG=skia:
GOLD_TRYBOT_URL= https://gold.skia.org/search?issue=2016353003

Review-Url: https://codereview.chromium.org/2016353003
2016-05-27 11:11:22 -07:00
borenet
43bf511ead Delete ChromeOS code
BUG=skia:
GOLD_TRYBOT_URL= https://gold.skia.org/search2?unt=true&query=source_type%3Dgm&master=false&issue=1926163002

Review-Url: https://codereview.chromium.org/1926163002
2016-04-29 14:01:34 -07:00
brianosman
2b6f13c76c Ignore sampleapp_prefs.txt in git.
BUG=skia:
GOLD_TRYBOT_URL= https://gold.skia.org/search2?unt=true&query=source_type%3Dgm&master=false&issue=1834743002

Review URL: https://codereview.chromium.org/1834743002
2016-03-24 12:20:02 -07:00
brianosman
fbe355208d Add skia.conf (configuration file that supports printShaders, etc...) to .gitignore
BUG=skia:
GOLD_TRYBOT_URL= https://gold.skia.org/search2?unt=true&query=source_type%3Dgm&master=false&issue=1734563003

Review URL: https://codereview.chromium.org/1734563003
2016-02-24 15:38:48 -08:00
halcanary
2362c476ef bin/sync-and-gyp: start using gclient
stop using hard-to-maintain git-sync-deps

BUG=skia:4885

GOLD_TRYBOT_URL= https://gold.skia.org/search2?unt=true&query=source_type%3Dgm&master=false&issue=1693963005

Review URL: https://codereview.chromium.org/1693963005
2016-02-16 11:48:06 -08:00
halcanary
ab26a9b427 android/apps: Add CanvasProof App;
Compare Ganesh and HWUI canvas rendering of SKPs on android.

Put SKP files in .../canvasproof/src/main/assets/skps

Run on a Marshmallow device.

NOTREECHECKS=true

Review URL: https://codereview.chromium.org/1258123004
2015-09-23 12:40:34 -07:00
djsollen
d18b861061 Update Android Apps to use gradle
This CL replaces ant with gradle for the task of building APKs.
The primary driver of this change is that it now allow us to
develop and test our apps using Android Studio.
DOCS_PREVIEW= https://skia.org/?cl=1215023017

Committed: https://skia.googlesource.com/skia/+/425535f1626932e4e22f61a2571f9c3c2b1c5977

Review URL: https://codereview.chromium.org/1215023017
2015-07-24 13:15:59 -07:00
joshualitt
9efef7b56f Revert "Update Android Apps to use gradle"
This reverts commit 425535f162.

NOTRY=true
NOTREECHECKS=true
TBR=djsollen@google.com
BUG=skia:
DOCS_PREVIEW= https://skia.org/?cl=1250233002

Review URL: https://codereview.chromium.org/1250233002
2015-07-23 08:00:33 -07:00
djsollen
425535f162 Update Android Apps to use gradle
This CL replaces ant with gradle for the task of building APKs.
The primary driver of this change is that it now allow us to
develop and test our apps using Android Studio.
DOCS_PREVIEW= https://skia.org/?cl=1215023017

Review URL: https://codereview.chromium.org/1215023017
2015-07-22 11:33:25 -07:00
halcanary
f6f8050837 git: add skps to .gitignore
NOTRY=true

Review URL: https://codereview.chromium.org/924163003
2015-02-13 18:57:33 -08:00
tfarina
0674fc7caf Cleanup: Remove bug_chomper entry from .gitignore.
This is not necessary anymore, now that bug_chomper was moved into
skia.googlesource.com/buildbot.git

BUG=None
TBR=borenet@google.com

Review URL: https://codereview.chromium.org/748363002
2014-11-24 17:53:55 -08:00
tfarina
60b24d0df7 Cleanup: Delete webtry.gyp
Looks like this was left over when we moved it into buildbot.

Also remove a few other, now unnecessary, references to webtry.

BUG=None
R=humper@google.com

Review URL: https://codereview.chromium.org/726833004
2014-11-20 18:20:06 -08:00
borenet
dc89ca56e6 Add recreate_skps script
BUG=skia:3008

Review URL: https://codereview.chromium.org/655313003
2014-10-17 07:37:05 -07:00
tfarina
0ad24bee47 Add template.cpp to gitignore.
It is generated experimental/webtry/build script, not checked-in the
source tree.

BUG=None
TEST=git status do not show it anymore as untracked file.
R=humper@google.com

Review URL: https://codereview.chromium.org/647633002
2014-10-10 05:20:52 -07:00
tfarina
f16cd28a04 Restart webtry to pick up changes.
Also add webtry.db to gitignore so it does not polute `git status`.

BUG=None
TEST=None
R=humper@google.com

Review URL: https://codereview.chromium.org/626703002
2014-10-03 21:05:00 -07:00
stephana
03e844a0bc Refactored frontend for the rebaseline server.
This is going to serve as the starting point for the new front-end once the backend is rewritten.

BUG=skia:
NOTRY=true
R=jcgregorio@google.com

Author: stephana@google.com

Review URL: https://codereview.chromium.org/538613002
2014-09-05 13:51:24 -07:00
joshualitt
30ba436f04 Initial refactor of shaderbuilder to prepare for geometry shaders
gitignore for eclipse

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

Author: joshualitt@chromium.org

Review URL: https://codereview.chromium.org/491673002
2014-08-21 20:18:45 -07:00
borenet
a535b7beec Add common/ to .gitignore
BUG=skia:2682
NOTRY=true
R=rmistry@google.com

Author: borenet@google.com

Review URL: https://codereview.chromium.org/342353002
2014-06-20 07:47:36 -07:00
commit-bot@chromium.org
44d4210146 BugChomper: Get the oauth_client_secret from GS
BUG=skia:
NOTRY=true
(SkipBuildbotRuns)

R=jcgregorio@google.com

Author: borenet@google.com

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

git-svn-id: http://skia.googlecode.com/svn/trunk@14718 2bbb7eff-a529-9590-31e7-b0007b416f81
2014-05-13 19:18:55 +00:00
commit-bot@chromium.org
3b0bcb874e clean up gitignore; sort, add chromeos/externals, remove trailing /.
R=mtklein@google.com, epoger@google.com

Author: halcanary@google.com

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

git-svn-id: http://skia.googlecode.com/svn/trunk@14249 2bbb7eff-a529-9590-31e7-b0007b416f81
2014-04-17 22:56:46 +00:00
commit-bot@chromium.org
1f75ab9c66 add some .gitignores related to gm and tools
NOTREECHECKS=True
NOTRY=True
R=scroggo@google.com
TBR=scroggo

Author: epoger@google.com

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

git-svn-id: http://skia.googlecode.com/svn/trunk@14150 2bbb7eff-a529-9590-31e7-b0007b416f81
2014-04-11 14:49:50 +00:00
commit-bot@chromium.org
9fcd012f8c Ignore out even if it's a symlink.
R=halcanary@google.com
BUG=

Author: mtklein@google.com

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

git-svn-id: http://skia.googlecode.com/svn/trunk@13089 2bbb7eff-a529-9590-31e7-b0007b416f81
2014-01-15 16:55:04 +00:00
commit-bot@chromium.org
9bde13c1b2 Add a canvas object with drawRect() and inval().
BUG=
R=robertphillips@google.com

Author: jcgregorio@google.com

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

git-svn-id: http://skia.googlecode.com/svn/trunk@12595 2bbb7eff-a529-9590-31e7-b0007b416f81
2013-12-10 14:13:03 +00:00
commit-bot@chromium.org
2d859346dd leading slash confuses non-git tools that read .gitignore, like ag
BUG=
R=scroggo@google.com

Author: mtklein@google.com

Review URL: https://chromiumcodereview.appspot.com/21055005

git-svn-id: http://skia.googlecode.com/svn/trunk@10439 2bbb7eff-a529-9590-31e7-b0007b416f81
2013-07-30 17:23:01 +00:00
bsalomon@google.com
d4a2b63cfa ignore pyc files.
R=bungeman@google.com

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

git-svn-id: http://skia.googlecode.com/svn/trunk@9778 2bbb7eff-a529-9590-31e7-b0007b416f81
2013-06-26 20:38:39 +00:00
scroggo@google.com
f1ee5b5c53 Add .swp files to gitignore.
Make git ignore .swp files (generated while editing in vim).

Review URL: https://codereview.appspot.com/7309059

git-svn-id: http://skia.googlecode.com/svn/trunk@7669 2bbb7eff-a529-9590-31e7-b0007b416f81
2013-02-08 16:59:59 +00:00
scroggo@google.com
b79103a954 Set git to ignore .android_config
Review URL: https://codereview.appspot.com/6863056

git-svn-id: http://skia.googlecode.com/svn/trunk@6772 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-12-12 21:21:29 +00:00
scroggo@google.com
a3970ff4be Do not git ignore files like /debugger/QT/moc_*.
Prior to r5953, gyp_skia would generate files for QT in
debugger/QT. A line in .gitignore was added so these
files did not show up in git status. Now that the
generated files are in the out directory, the line is no
longer necessary.

Review URL: https://codereview.appspot.com/6702043

git-svn-id: http://skia.googlecode.com/svn/trunk@5966 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-10-16 17:25:36 +00:00
tfarina@chromium.org
0ab7c77a2c Add moc generated files to .gitignore.
So that git status is clean again.

R=tomhudson@google.com

Review URL: https://codereview.appspot.com/6591045

git-svn-id: http://skia.googlecode.com/svn/trunk@5750 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-10-01 16:39:06 +00:00
scroggo@google.com
69fbc52e95 Keep the entries in .gitignore sorted in alphabetical order.
Signed-off-by: Thiago Farina <tfarina@chromium.org>

Review URL: https://codereview.appspot.com/6506107

git-svn-id: http://skia.googlecode.com/svn/trunk@5522 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-09-13 15:26:51 +00:00