Commit Graph

239 Commits

Author SHA1 Message Date
borenet
b979933e48 Roll common DEPS
BUG=skia:
NOTRY=true
NOTREECHECKS=true
GOLD_TRYBOT_URL= https://gold.skia.org/search?issue=2435333002

Review-Url: https://chromiumcodereview.appspot.com/2435333002
2016-10-21 12:01:12 -07:00
Mike Klein
12b2193fcc Remove shaderc DEPS.
Was just perusing DEPS and I realized shaderc is probably no longer needed.

BUG=skia:

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

Change-Id: I054a424b26e51dbfee77dbe79e1e175399627902
Reviewed-on: https://skia-review.googlesource.com/3561
Commit-Queue: Mike Klein <mtklein@chromium.org>
Reviewed-by: Mike Klein <mtklein@chromium.org>
Reviewed-by: Greg Daniel <egdaniel@google.com>
2016-10-19 16:51:02 +00:00
Mike Klein
f3c874a984 There are no more cmake bots, so clean up their old scripts.
BUG=skia:

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

Change-Id: Ieb94788182b35d8fd3197ce090d5f28a65903204
Reviewed-on: https://skia-review.googlesource.com/2854
Reviewed-by: Ben Wagner <bungeman@google.com>
Commit-Queue: Mike Klein <mtklein@chromium.org>
2016-09-30 22:19:20 +00:00
brianosman
f8d2c8df47 Latest ANGLE as of September 27, 2016
Includes a fix for ES3 texture reuse that solves many of the problems
we saw using ES3. (There are still issues with some YUV planes).

Also includes a fix for anglebug.com/1478, so half-float formats are
allowed again.

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

Review-Url: https://codereview.chromium.org/2302993004
2016-09-28 14:01:51 -07:00
Ben Wagner
2384cfaa5d Roll buildtools adb8bf4e8fc..5fd66957f08bb7
adb8bf4e8f..5fd66957f0

Primarily to pick up
https://chromium.googlesource.com/chromium/src/+/d51d3527da33

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

Change-Id: I3f9ac18c8946fa28effcf8c8cff3bbd1120a86df
Reviewed-on: https://skia-review.googlesource.com/2749
Reviewed-by: Mike Klein <mtklein@chromium.org>
Commit-Queue: Ben Wagner <bungeman@google.com>
2016-09-28 18:42:53 +00:00
mtklein
e19c179281 Clean up target_os=llvm now that it does nothing.
BUG=skia:
GOLD_TRYBOT_URL= https://gold.skia.org/search?issue=2317373004

Review-Url: https://codereview.chromium.org/2317373004
2016-09-08 09:19:00 -07:00
mtklein
2b3c2a3ff9 GN: add sanitize arg
Attempt to take over all *SAN builds.

MSAN has a lot of coordination required between gn/BUILD.gn and gn_flavor.py.
I'd like to follow up to move more of this into gn/BUILD.gn, to make it easier
to use locally.

The compile steps should be much faster now.  We no longer build CMake
and Clang for every run, instead using the clang_linux CIPD package.  This
removes the need for all the third_party/externals/llvm/... dependencies.

Similarly, since we're using the clang_linux package, we no longer depend
on Chrome's Clang, and thus no longer need to sync chromium on these bots.

Instead of packaging up MSAN libraries and llvm-symbolizer in the compile
output, I have the test / perf bots also depend on the clang_linux package.
These do not vary from build to build.

No more need for the xsan.blacklist -include hack: Clang, GN, and Ninja
all track changes to xsan.blacklist without our help.

This has the incidental effect of upgrading the compiler used by *SAN
bots from Clang 3.8 to Clang 3.9.

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

Review-Url: https://codereview.chromium.org/2289343002
2016-09-08 08:39:34 -07:00
bungeman
41a8f323f7 Update FreeType dependency from 2.6.1 to 2.6.5.
- 6a19a7d332c5446542196e5aeda0ede109ef097b
+ 4d3f7ca8cedbddad40b9e93a82926618e3fb4265

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

Review-Url: https://codereview.chromium.org/2302493002
2016-08-31 12:48:18 -07:00
mtklein
a28e263d42 Roll GN
This picks up efc976e502, which means we don't need to create a link_pool any more.  The default behavior is unlimited linking, what we were asking for explicitly.

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

Review-Url: https://codereview.chromium.org/2288253002
2016-08-29 07:14:28 -07:00
mtklein
cdc8942fd6 cleanup dead nanomsg and build_overrides
BUG=skia:
GOLD_TRYBOT_URL= https://gold.skia.org/search?issue=2287013003
TBR=

Review-Url: https://codereview.chromium.org/2287013003
2016-08-27 06:50:11 -07:00
brianosman
e3031b607c Update ANGLE to latest as of August 25, 2016
With this version, it's now exposing GL_EXT_color_buffer_half_float, but
it's (incorrectly) using GL_HALF_FLOAT rather than GL_HALF_FLOAT_OES.
In addition, release builds were crashing in EGLImageTest due to an
apparent disagreement about calling convention on function-pointer to
exported symbol. There is a proper typedef for that in one of their
headers, but I can't seem to include it without creating more problems,
so I just fixed the decoration on our local typedef.

With those changes, all tests pass, and (on my Windows machine), all
GMs and SKPs produce identical results vs. master in angle and angle-gl.

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

Review-Url: https://codereview.chromium.org/2282733003
2016-08-26 10:37:57 -07:00
mtklein
d434b01c7e Roll GN: gn format is --in-place by default
As usual, might as well roll, and this new behavior is a small convenience.

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

Review-Url: https://codereview.chromium.org/2231833002
2016-08-10 07:30:58 -07:00
mtklein
8e522e4fa1 Roll GN
No major new features... just good to keep up.

60f7f9a..9c6ad6f

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

Review-Url: https://codereview.chromium.org/2218063002
2016-08-05 08:40:03 -07:00
halcanary
95860ad400 DEPS: sfntly 468cad5 → b18b09b
SfntlyWrapper::SubsetFont now takes TTC index, needed for SkPDF.

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

Review-Url: https://codereview.chromium.org/2186103002
2016-07-27 12:28:56 -07:00
halcanary
89da693035 DEPS: ICU c291cde → ec9c113
BUG=skia:
GOLD_TRYBOT_URL= https://gold.skia.org/search?issue=2189643003

Review-Url: https://codereview.chromium.org/2189643003
2016-07-27 10:13:25 -07:00
halcanary
aa7f67c76b DEPS: harfbuzz 1.2.7 → 1.3.0
BUG=skia:
GOLD_TRYBOT_URL= https://gold.skia.org/search?issue=2179963005

Review-Url: https://codereview.chromium.org/2179963005
2016-07-27 10:08:39 -07:00
halcanary
81a9ce1944 DEPS: sfntly 130f832 → 468cad5
BUG=skia:
GOLD_TRYBOT_URL= https://gold.skia.org/search?issue=2189643002

Review-Url: https://codereview.chromium.org/2189643002
2016-07-27 10:08:18 -07:00
mtklein
901257a3ba GN: remove hooks again
NOTRY=true

TBR=jcgregorio@google.com

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

Review-Url: https://codereview.chromium.org/2168933004
2016-07-21 13:54:39 -07:00
mtklein
43d707ca93 No symlink. The bots are not running hooks anyway.
BUG=skia:
GOLD_TRYBOT_URL= https://gold.skia.org/search?issue=2170663003

Review-Url: https://codereview.chromium.org/2170663003
2016-07-21 13:43:48 -07:00
mtklein
4eaa320d57 GN: add missing .exe
BUG=skia:
GOLD_TRYBOT_URL= https://gold.skia.org/search?issue=2168763005

NOTRY=true

Review-Url: https://codereview.chromium.org/2168763005
2016-07-21 13:01:08 -07:00
mtklein
7fbfbbe8f4 Basic standalone GN configs.
This sketches out what a world without Chrome's GN configs would look like.

Instead of DEPSing in build/, we now host our own gypi_to_gn.py.

The symlink from skia/ to . lets us run gclient hooks when the .gclient file is in the directory above skia/ or inside skia/.  That means we don't need gn.py anymore.

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

Review-Url: https://codereview.chromium.org/2167163002
2016-07-21 12:25:45 -07:00
mtklein
9b43094bf2 Roll buildtools for latest GN binary.
This GN binary has a JSON backend that's meant to be parsed to seed other
build configurations (e.g. CMake, Android, Google3).

You will need to re-run ./gn.py to fetch the newest binary.

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

Review-Url: https://codereview.chromium.org/2164263002
2016-07-21 06:29:01 -07:00
fmalita
771a190a00 Build Expat on all platforms
* bump version to @android-6.0.1_r55 (2.1.1)

* add as a dependency to the 'xml' target (for upcoming http://crrev.com/2142893006)

* tweak build for Mac, Win:

  - define HAVE_EXPAT_CONFIG_H (same as in Android.mk)
  - use -Wno-missing-field-initializers (same as in Android.mk)
  - suppress MSVS warning 4244 (same as ..cmake/Utilities/cmexpat/expatConfig.h.in)

GOLD_TRYBOT_URL= https://gold.skia.org/search?issue=2150603004
R=mtklein@google.com

Review-Url: https://codereview.chromium.org/2150603004
2016-07-14 14:02:24 -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
scroggo
3965825b97 Check libpng directly into third_party/
With this change, the CMake build, which does not use DEPS to sync
external projects, is able to build and use the same version of libpng
that is used in other builds.

This will allow all platforms (including Google3 CMake build) to test on
the same version of libpng, so we do not need to make SkPngCodec support
all versions of libpng.

- Update CMakeLists.txt to use the checked in libpng.
- Check in libpng version 1.6.22rc01
- Update README.google
- Replace our old LICENSE file with the latest one from libpng
GOLD_TRYBOT_URL= https://gold.skia.org/search?issue=2033063003
CQ_EXTRA_TRYBOTS=client.skia.compile:Build-Ubuntu-GCC-x86_64-Release-CMake-Trybot,Build-Mac-Clang-x86_64-Release-CMake-Trybot

Review-Url: https://codereview.chromium.org/2033063003
2016-06-02 12:59:59 -07:00
halcanary
3d5942e8a4 gyp: clean up warnings with clang-3.8
Also: update zlib DEPS.

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

Review-Url: https://codereview.chromium.org/2002233002
2016-05-23 14:02:54 -07:00
msarett
8fe89ab9b2 Update libpng to 1.6.22rc01
If there are no issues, this version will be released May 26.

Let's start testing with it, so we are ready to update Chrome when
it is available.

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

Review-Url: https://codereview.chromium.org/1983853002
2016-05-17 09:31:04 -07:00
halcanary
7a223f5825 DEPS: update icu + sfntly
GOLD_TRYBOT_URL= https://gold.skia.org/search2?unt=true&query=source_type%3Dgm&master=false&issue=1960153002

Review-Url: https://codereview.chromium.org/1960153002
2016-05-09 08:00:26 -07:00
halcanary
00d44e014c Start building HarfBuzz+Skia example
(prevent bitrot in example code)

tools/using_skia_and_harfbuzz.cpp was written by aam@:
  https://github.com/aam/skiaex

update HarfBuzz to latest release: 1.2.7

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

Review-Url: https://codereview.chromium.org/1940393002
2016-05-03 15:09:52 -07:00
msarett
b917e04d51 Update libjpeg-turbo to 1.4.90
Google3, Chrome, and Android are considering updates.  Let's start
testing Skia on the newest version.
https://critique.corp.google.com/#review/116667446
https://codereview.chromium.org/1934113002
https://buganizer.corp.google.com/u/0/issues/28268702

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

Committed: https://skia.googlesource.com/skia/+/3994c161ec5a2b83e8f6bab4d9c469eec2668d92

Review-Url: https://codereview.chromium.org/1940903002
2016-05-02 10:43:22 -07:00
msarett
a13efa6906 Revert of Update libjpeg-turbo to 1.4.90 (patchset #1 id:20001 of https://codereview.chromium.org/1940903002/ )
Reason for revert:
Clang wants "strbeq" and gcc wants "streqb".  Uggh.

https://build.chromium.org/p/client.skia.compile/builders/Build-Mac-Clang-Arm7-Debug-Android/builds/1766/steps/compile_skia%20on%20Mac/logs/stdio

Original issue's description:
> Update libjpeg-turbo to 1.4.90
>
> Google3, Chrome, and Android are considering updates.  Let's start
> testing Skia on the newest version.
> https://critique.corp.google.com/#review/116667446
> https://codereview.chromium.org/1934113002
> https://buganizer.corp.google.com/u/0/issues/28268702
>
> BUG=skia:
> GOLD_TRYBOT_URL= https://gold.skia.org/search2?unt=true&query=source_type%3Dgm&master=false&issue=1940903002
>
> Committed: https://skia.googlesource.com/skia/+/3994c161ec5a2b83e8f6bab4d9c469eec2668d92

TBR=scroggo@google.com,djsollen@google.com
# 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/1937143002
2016-05-02 09:14:23 -07:00
msarett
3994c161ec Update libjpeg-turbo to 1.4.90
Google3, Chrome, and Android are considering updates.  Let's start
testing Skia on the newest version.
https://critique.corp.google.com/#review/116667446
https://codereview.chromium.org/1934113002
https://buganizer.corp.google.com/u/0/issues/28268702

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

Review-Url: https://codereview.chromium.org/1940903002
2016-05-02 07:48:59 -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
djsollen
affacce4c6 Require Android SDK copy of CMake to build Vulkan on Android.
GOLD_TRYBOT_URL= https://gold.skia.org/search2?unt=true&query=source_type%3Dgm&master=false&issue=1930423002

Review-Url: https://codereview.chromium.org/1930423002
2016-04-29 08:09:43 -07:00
yujieqin
97920b4092 Update DNG SDK version
* Add PATENTS file

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

Review URL: https://codereview.chromium.org/1897773003
2016-04-24 08:14:57 -07:00
djsollen
12d62a7d51 VulkanViewer on Android
GOLD_TRYBOT_URL= https://gold.skia.org/search2?unt=true&query=source_type%3Dgm&master=false&issue=1903253003

Review URL: https://codereview.chromium.org/1903253003
2016-04-21 07:59:44 -07:00
egdaniel
cd07bedbe6 Update to ToT shaderc
BUG=skia:
GOLD_TRYBOT_URL= https://gold.skia.org/search2?unt=true&query=source_type%3Dgm&master=false&issue=1898863002

Review URL: https://codereview.chromium.org/1898863002
2016-04-18 13:42:02 -07:00
mtklein
fbcfd6d060 mojo -> nojo
BUG=skia:4891
GOLD_TRYBOT_URL= https://gold.skia.org/search2?unt=true&query=source_type%3Dgm&master=false&issue=1889543003

Review URL: https://codereview.chromium.org/1889543003
2016-04-14 09:42:34 -07:00
yujieqin
e34635dee1 Since PIEX can now return an uncompressed RGB thumbnail, check the type of the image before treating it as a JPEG.
Highlights of new PIEX:
* PIEX can now return JPEG compressed image or uncompressed RGB image
* Add IsOfType() and GEtNumberofBytesForIsOfType() to image_type_recognition_lite
* Add GetDngInformation() and GetOrientation() to piex
* Remove deprecated data entries from piex_types

BUG=b/27214608, b/28119810
GOLD_TRYBOT_URL= https://gold.skia.org/search2?unt=true&query=source_type%3Dgm&master=false&issue=1883783002

Review URL: https://codereview.chromium.org/1883783002
2016-04-14 07:04:00 -07:00
yujieqin
4334ff29b4 Enable RAW codec for Windows
BUG=skia:4890 b/26973157
GOLD_TRYBOT_URL= https://gold.skia.org/search2?unt=true&query=source_type%3Dgm&master=false&issue=1853093002

Review URL: https://codereview.chromium.org/1853093002
2016-04-06 06:47:15 -07:00
mtklein
77304a5b76 Get back on mainline libpng 1.6 now that 3bpp perf patches are merged.
Checked manually in Instruments that we're still running our SSE filters for both RGB and RGBA PNGs.

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

Review URL: https://codereview.chromium.org/1865633002
2016-04-05 13:46:00 -07:00
mtklein
c19201f315 Roll up to use >=4.
d0513638e7

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

Review URL: https://codereview.chromium.org/1854293002
2016-04-04 13:48:41 -07:00
mtklein
85ad730113 Point libpng at upstream libpng 1.6 + my new perf patch.
BUG=skia:
GOLD_TRYBOT_URL= https://gold.skia.org/search2?unt=true&query=source_type%3Dgm&master=false&issue=1852363002

Review URL: https://codereview.chromium.org/1852363002
2016-04-04 12:08:46 -07:00
egdaniel
b90e67f8ea Update shaderc to ToT.
BUG=skia:
GOLD_TRYBOT_URL= https://gold.skia.org/search2?unt=true&query=source_type%3Dgm&master=false&issue=1847643002

Review URL: https://codereview.chromium.org/1847643002
2016-03-31 06:16:32 -07:00
yujieqin
246723f7e7 Update to new DNG SDK: Integrate integer overflow fixes
BUG=b/26535130
GOLD_TRYBOT_URL= https://gold.skia.org/search2?unt=true&query=source_type%3Dgm&master=false&issue=1801063002

Review URL: https://codereview.chromium.org/1801063002
2016-03-16 05:57:38 -07:00
msarett
6b563156eb Update libjpeg-turbo with security fixes from upstream
This includes:
0463f7c9aa
a572622dd6

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

Review URL: https://codereview.chromium.org/1789693002
2016-03-11 09:24:21 -08:00
borenet
51b56c9041 Move llvm from deps to deps_os
Re-upload of https://codereview.chromium.org/1721943003/

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

Review URL: https://codereview.chromium.org/1782793003
2016-03-10 05:49:48 -08:00
yujieqin
412f534563 Update DNG SDK version.
* Integrate integer overflow changes from security branch

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

Committed: https://skia.googlesource.com/skia/+/be2924ad17d47f4ed49666894d87571a28f89567

Committed: https://skia.googlesource.com/skia/+/62c0f75159674087079140e09ef1396316577754

Review URL: https://codereview.chromium.org/1748363004
2016-03-08 11:47:31 -08:00