Move SkGLContext and some GrGLInterface implementations to skgputest module

Move SkGLContext and some GrGLInterface implementations to skgputest module

BUG=skia:
GOLD_TRYBOT_URL= https://gold.skia.org/search2?unt=true&query=source_type%3Dgm&master=false&issue=1815823002
CQ_EXTRA_TRYBOTS=client.skia.compile:Build-Ubuntu-GCC-x86_64-Release-CMake-Trybot,Build-Mac-Clang-x86_64-Release-CMake-Trybot

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

Committed: https://skia.googlesource.com/skia/+/3724e574a744491b7cfb8187ac865a70ef3d4528

[bsalomon, 2016-03-18 21:58:58]

Description was changed from

==========
codemove

BUG=skia:
==========

to

==========
codemove

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

[bsalomon, 2016-03-28 17:32:28]

Description was changed from

==========
codemove

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

to

==========
Move SkGLContext and some GrGLInterface implementations to skgputest module

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

[bsalomon, 2016-03-28 17:32:28]

bsalomon@google.com changed reviewers:
+ jvanverth@google.com

[jvanverth1, 2016-03-28 20:26:35]

Still going through it, but here are some preliminary comments.

https://codereview.chromium.org/1815823002/diff/100001/samplecode/SampleApp.cpp
File samplecode/SampleApp.cpp (right):

https://codereview.chromium.org/1815823002/diff/100001/samplecode/SampleApp.c...
samplecode/SampleApp.cpp:41: #include "gl/angle/GLContext_angle.h"
Place inside #if SK_ANGLE block?

https://codereview.chromium.org/1815823002/diff/100001/tests/TextureStorageAl...
File tests/TextureStorageAllocator.cpp (right):

https://codereview.chromium.org/1815823002/diff/100001/tests/TextureStorageAl...
tests/TextureStorageAllocator.cpp:11: #include "gl/GLContext.h"
One thing about the renaming is that it's not clear that GLContext is a
tools-only thing. #include "tools/gpu/gl/GLContext.h" would make it clearer but
that's a lot of typing. I don't have a good answer other than renaming GLContext
to maybe GLTestContext -- which is also an unpleasant amount of code changes.

https://codereview.chromium.org/1815823002/diff/100001/tools/gpu/GrContextFac...
File tools/gpu/GrContextFactory.cpp.rej (right):

https://codereview.chromium.org/1815823002/diff/100001/tools/gpu/GrContextFac...
tools/gpu/GrContextFactory.cpp.rej:4: 
This file doesn't appear to belong here.

[bsalomon, 2016-03-28 20:46:25]

https://codereview.chromium.org/1815823002/diff/100001/samplecode/SampleApp.cpp
File samplecode/SampleApp.cpp (right):

https://codereview.chromium.org/1815823002/diff/100001/samplecode/SampleApp.c...
samplecode/SampleApp.cpp:41: #include "gl/angle/GLContext_angle.h"
On 2016/03/28 20:26:35, jvanverth1 wrote:
> Place inside #if SK_ANGLE block?

Will do

https://codereview.chromium.org/1815823002/diff/100001/tests/TextureStorageAl...
File tests/TextureStorageAllocator.cpp (right):

https://codereview.chromium.org/1815823002/diff/100001/tests/TextureStorageAl...
tests/TextureStorageAllocator.cpp:11: #include "gl/GLContext.h"
On 2016/03/28 20:26:35, jvanverth1 wrote:
> One thing about the renaming is that it's not clear that GLContext is a
> tools-only thing. #include "tools/gpu/gl/GLContext.h" would make it clearer
but
> that's a lot of typing. I don't have a good answer other than renaming
GLContext
> to maybe GLTestContext -- which is also an unpleasant amount of code changes.

I like that and don't mind doing it. Maybe as a follow-up standalone change?

https://codereview.chromium.org/1815823002/diff/100001/tools/gpu/GrContextFac...
File tools/gpu/GrContextFactory.cpp.rej (right):

https://codereview.chromium.org/1815823002/diff/100001/tools/gpu/GrContextFac...
tools/gpu/GrContextFactory.cpp.rej:4: 
On 2016/03/28 20:26:35, jvanverth1 wrote:
> This file doesn't appear to belong here.

D'oh forgot to add a filename filter to my git add.

[jvanverth1, 2016-03-29 13:39:15]

https://codereview.chromium.org/1815823002/diff/100001/tests/TextureStorageAl...
File tests/TextureStorageAllocator.cpp (right):

https://codereview.chromium.org/1815823002/diff/100001/tests/TextureStorageAl...
tests/TextureStorageAllocator.cpp:11: #include "gl/GLContext.h"
On 2016/03/28 20:46:25, bsalomon wrote:
> On 2016/03/28 20:26:35, jvanverth1 wrote:
> > One thing about the renaming is that it's not clear that GLContext is a
> > tools-only thing. #include "tools/gpu/gl/GLContext.h" would make it clearer
> but
> > that's a lot of typing. I don't have a good answer other than renaming
> GLContext
> > to maybe GLTestContext -- which is also an unpleasant amount of code
changes.
> 
> I like that and don't mind doing it. Maybe as a follow-up standalone change?

A followup would be better -- there's a lot to look at here already.

[jvanverth1, 2016-03-29 14:45:09]

A few more comments:

https://codereview.chromium.org/1815823002/diff/100001/src/views/win/SkOSWind...
File src/views/win/SkOSWindow_win.cpp (right):

https://codereview.chromium.org/1815823002/diff/100001/src/views/win/SkOSWind...
src/views/win/SkOSWindow_win.cpp:399: void* get_angle_egl_display(void*
nativeDisplay) {
Where is this used?

https://codereview.chromium.org/1815823002/diff/100001/tools/gpu/gl/GLContext.h
File tools/gpu/gl/GLContext.h (right):

https://codereview.chromium.org/1815823002/diff/100001/tools/gpu/gl/GLContext...
tools/gpu/gl/GLContext.h:17: * Create an offscreen Oppengl context. Provides a
GrGLInterface struct of function pointers for
OpenGL

https://codereview.chromium.org/1815823002/diff/100001/tools/gpu/gl/GLContext...
tools/gpu/gl/GLContext.h:26: const GrGLInterface *gl() const { return fGL.get();
}
Not a big deal, but why did you change this to a C-style pointer?

[bsalomon, 2016-03-29 17:07:59]

https://codereview.chromium.org/1815823002/diff/100001/src/views/win/SkOSWind...
File src/views/win/SkOSWindow_win.cpp (right):

https://codereview.chromium.org/1815823002/diff/100001/src/views/win/SkOSWind...
src/views/win/SkOSWindow_win.cpp:399: void* get_angle_egl_display(void*
nativeDisplay) {
On 2016/03/29 14:45:09, jvanverth1 wrote:
> Where is this used?

I think something got lost when rebasing. I added a caller below.

https://codereview.chromium.org/1815823002/diff/100001/tools/gpu/gl/GLContext.h
File tools/gpu/gl/GLContext.h (right):

https://codereview.chromium.org/1815823002/diff/100001/tools/gpu/gl/GLContext...
tools/gpu/gl/GLContext.h:17: * Create an offscreen Oppengl context. Provides a
GrGLInterface struct of function pointers for
On 2016/03/29 14:45:09, jvanverth1 wrote:
> OpenGL

Done.

https://codereview.chromium.org/1815823002/diff/100001/tools/gpu/gl/GLContext...
tools/gpu/gl/GLContext.h:26: const GrGLInterface *gl() const { return fGL.get();
}
On 2016/03/29 14:45:09, jvanverth1 wrote:
> Not a big deal, but why did you change this to a C-style pointer?

Stupid IDE not remembering my code style prefs.

[jvanverth1, 2016-03-29 17:21:15]

lgtm + comments

https://codereview.chromium.org/1815823002/diff/120001/samplecode/SampleApp.cpp
File samplecode/SampleApp.cpp (right):

https://codereview.chromium.org/1815823002/diff/120001/samplecode/SampleApp.c...
samplecode/SampleApp.cpp:36: #   include "gl/GrGLInterface.h"
Not sure if you intended this indenting.

[bsalomon, 2016-03-29 17:32:04]

https://codereview.chromium.org/1815823002/diff/120001/samplecode/SampleApp.cpp
File samplecode/SampleApp.cpp (right):

https://codereview.chromium.org/1815823002/diff/120001/samplecode/SampleApp.c...
samplecode/SampleApp.cpp:36: #   include "gl/GrGLInterface.h"
On 2016/03/29 17:21:15, jvanverth1 wrote:
> Not sure if you intended this indenting.

I did, but can revert it. DM (or some other tool code) uses this style and I
found it easier to track nested conditionals.

[jvanverth1, 2016-03-29 17:34:40]

On 2016/03/29 17:32:04, bsalomon wrote:
>
https://codereview.chromium.org/1815823002/diff/120001/samplecode/SampleApp.cpp
> File samplecode/SampleApp.cpp (right):
> 
>
https://codereview.chromium.org/1815823002/diff/120001/samplecode/SampleApp.c...
> samplecode/SampleApp.cpp:36: #   include "gl/GrGLInterface.h"
> On 2016/03/29 17:21:15, jvanverth1 wrote:
> > Not sure if you intended this indenting.
> 
> I did, but can revert it. DM (or some other tool code) uses this style and I
> found it easier to track nested conditionals.

I'm fine with it, just making sure your editor wasn't playing tricks on you.

[bsalomon, 2016-03-29 18:26:27]

The CQ bit was checked by bsalomon@google.com

[commit-bot: I haz the power, 2016-03-29 18:26:36]

CQ is trying da patch. Follow status at
 https://chromium-cq-status.appspot.com/patch-status/1815823002/120001
View timeline at
 https://chromium-cq-status.appspot.com/patch-timeline/1815823002/120001

[commit-bot: I haz the power, 2016-03-29 18:27:45]

The CQ bit was unchecked by commit-bot@chromium.org

[commit-bot: I haz the power, 2016-03-29 18:27:47]

Try jobs failed on following builders:
  Build-Ubuntu-GCC-Arm64-Debug-Android-Trybot on client.skia.compile
(JOB_FAILED,
http://build.chromium.org/p/client.skia.compile/builders/Build-Ubuntu-GCC-Arm...)

[bsalomon, 2016-03-29 19:02:26]

The CQ bit was checked by bsalomon@google.com

[bsalomon, 2016-03-29 19:02:27]

The patchset sent to the CQ was uploaded after l-g-t-m from jvanverth@google.com
Link to the patchset: https://codereview.chromium.org/1815823002/#ps140001
(title: "rebase again")

[commit-bot: I haz the power, 2016-03-29 19:02:29]

CQ is trying da patch. Follow status at
 https://chromium-cq-status.appspot.com/patch-status/1815823002/140001
View timeline at
 https://chromium-cq-status.appspot.com/patch-timeline/1815823002/140001

[commit-bot: I haz the power, 2016-03-29 19:06:58]

The CQ bit was unchecked by commit-bot@chromium.org

[commit-bot: I haz the power, 2016-03-29 19:07:00]

Try jobs failed on following builders:
  Build-Ubuntu-GCC-x86_64-Release-CMake-Trybot on client.skia.compile
(JOB_FAILED,
http://build.chromium.org/p/client.skia.compile/builders/Build-Ubuntu-GCC-x86...)

[bsalomon, 2016-03-29 19:22:18]

The CQ bit was checked by bsalomon@google.com

[commit-bot: I haz the power, 2016-03-29 19:22:29]

CQ is trying da patch. Follow status at
 https://chromium-cq-status.appspot.com/patch-status/1815823002/140001
View timeline at
 https://chromium-cq-status.appspot.com/patch-timeline/1815823002/140001

[commit-bot: I haz the power, 2016-03-29 19:24:19]

The CQ bit was unchecked by commit-bot@chromium.org

[commit-bot: I haz the power, 2016-03-29 19:24:20]

Try jobs failed on following builders:
  Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Release-Shared-Trybot on client.skia
(JOB_FAILED,
http://build.chromium.org/p/client.skia/builders/Test-Ubuntu-GCC-GCE-CPU-AVX2...)

[bsalomon, 2016-03-29 20:18:05]

The CQ bit was checked by bsalomon@google.com

[bsalomon, 2016-03-29 20:18:06]

The patchset sent to the CQ was uploaded after l-g-t-m from jvanverth@google.com
Link to the patchset: https://codereview.chromium.org/1815823002/#ps160001
(title: "fix build")

[commit-bot: I haz the power, 2016-03-29 20:18:14]

CQ is trying da patch. Follow status at
 https://chromium-cq-status.appspot.com/patch-status/1815823002/160001
View timeline at
 https://chromium-cq-status.appspot.com/patch-timeline/1815823002/160001

[commit-bot: I haz the power, 2016-03-29 20:21:03]

The CQ bit was unchecked by commit-bot@chromium.org

[commit-bot: I haz the power, 2016-03-29 20:21:04]

Try jobs failed on following builders:
  Build-Ubuntu-GCC-x86_64-Release-CMake-Trybot on client.skia.compile
(JOB_FAILED,
http://build.chromium.org/p/client.skia.compile/builders/Build-Ubuntu-GCC-x86...)

[bsalomon, 2016-03-30 01:53:24]

The CQ bit was checked by bsalomon@google.com

[bsalomon, 2016-03-30 01:53:24]

The patchset sent to the CQ was uploaded after l-g-t-m from jvanverth@google.com
Link to the patchset: https://codereview.chromium.org/1815823002/#ps180001
(title: "re-remove files")

[commit-bot: I haz the power, 2016-03-30 01:53:35]

CQ is trying da patch. Follow status at
 https://chromium-cq-status.appspot.com/patch-status/1815823002/180001
View timeline at
 https://chromium-cq-status.appspot.com/patch-timeline/1815823002/180001

[commit-bot: I haz the power, 2016-03-30 01:55:25]

The CQ bit was unchecked by commit-bot@chromium.org

[commit-bot: I haz the power, 2016-03-30 01:55:26]

Try jobs failed on following builders:
  Build-Mac-Clang-x86_64-Release-Trybot on client.skia.compile (JOB_FAILED,
http://build.chromium.org/p/client.skia.compile/builders/Build-Mac-Clang-x86_...)
  Build-Ubuntu-GCC-Arm7-Debug-Android-Trybot on client.skia.compile (JOB_FAILED,
http://build.chromium.org/p/client.skia.compile/builders/Build-Ubuntu-GCC-Arm...)

[bsalomon, 2016-03-30 13:21:02]

Description was changed from

==========
Move SkGLContext and some GrGLInterface implementations to skgputest module

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

to

==========
Move SkGLContext and some GrGLInterface implementations to skgputest module

BUG=skia:
GOLD_TRYBOT_URL=
https://gold.skia.org/search2?unt=true&query=source_type%3Dgm&master=false&is...
CQ_EXTRA_TRYBOTS=client.skia.compile:Build-Ubuntu-GCC-x86_64-Release-CMake-Trybot,Build-Mac-Clang-x86_64-Release-CMake-Trybot
==========

[bsalomon, 2016-03-30 13:21:23]

The CQ bit was checked by bsalomon@google.com

[bsalomon, 2016-03-30 13:21:24]

The patchset sent to the CQ was uploaded after l-g-t-m from jvanverth@google.com
Link to the patchset: https://codereview.chromium.org/1815823002/#ps200001
(title: "more little fixes")

[commit-bot: I haz the power, 2016-03-30 13:21:32]

CQ is trying da patch. Follow status at
 https://chromium-cq-status.appspot.com/patch-status/1815823002/200001
View timeline at
 https://chromium-cq-status.appspot.com/patch-timeline/1815823002/200001

[commit-bot: I haz the power, 2016-03-30 13:24:22]

The CQ bit was unchecked by commit-bot@chromium.org

[commit-bot: I haz the power, 2016-03-30 13:24:23]

Try jobs failed on following builders:
  Build-Ubuntu-GCC-x86_64-Release-Trybot on client.skia.compile (JOB_FAILED,
http://build.chromium.org/p/client.skia.compile/builders/Build-Ubuntu-GCC-x86...)

[bsalomon, 2016-03-30 14:06:50]

The CQ bit was checked by bsalomon@google.com

[bsalomon, 2016-03-30 14:06:51]

The patchset sent to the CQ was uploaded after l-g-t-m from jvanverth@google.com
Link to the patchset: https://codereview.chromium.org/1815823002/#ps240001
(title: "update CMakeLists.txt")

[commit-bot: I haz the power, 2016-03-30 14:06:57]

CQ is trying da patch. Follow status at
 https://chromium-cq-status.appspot.com/patch-status/1815823002/240001
View timeline at
 https://chromium-cq-status.appspot.com/patch-timeline/1815823002/240001

[commit-bot: I haz the power, 2016-03-30 14:08:47]

The CQ bit was unchecked by commit-bot@chromium.org

[commit-bot: I haz the power, 2016-03-30 14:08:48]

Try jobs failed on following builders:
  Build-Mac-Clang-x86_64-Release-Trybot on client.skia.compile (JOB_FAILED,
http://build.chromium.org/p/client.skia.compile/builders/Build-Mac-Clang-x86_...)

[bsalomon, 2016-03-30 14:54:19]

The CQ bit was checked by bsalomon@google.com

[commit-bot: I haz the power, 2016-03-30 14:54:28]

CQ is trying da patch. Follow status at
 https://chromium-cq-status.appspot.com/patch-status/1815823002/240001
View timeline at
 https://chromium-cq-status.appspot.com/patch-timeline/1815823002/240001

[commit-bot: I haz the power, 2016-03-30 14:55:58]

The CQ bit was unchecked by commit-bot@chromium.org

[commit-bot: I haz the power, 2016-03-30 14:55:59]

Try jobs failed on following builders:
  Build-Mac-Clang-x86_64-Release-Trybot on client.skia.compile (JOB_FAILED,
http://build.chromium.org/p/client.skia.compile/builders/Build-Mac-Clang-x86_...)

[bsalomon, 2016-03-30 15:31:28]

The CQ bit was checked by bsalomon@google.com

[commit-bot: I haz the power, 2016-03-30 15:31:34]

CQ is trying da patch. Follow status at
 https://chromium-cq-status.appspot.com/patch-status/1815823002/240001
View timeline at
 https://chromium-cq-status.appspot.com/patch-timeline/1815823002/240001

[commit-bot: I haz the power, 2016-03-30 15:35:12]

Description was changed from

==========
Move SkGLContext and some GrGLInterface implementations to skgputest module

BUG=skia:
GOLD_TRYBOT_URL=
https://gold.skia.org/search2?unt=true&query=source_type%3Dgm&master=false&is...
CQ_EXTRA_TRYBOTS=client.skia.compile:Build-Ubuntu-GCC-x86_64-Release-CMake-Trybot,Build-Mac-Clang-x86_64-Release-CMake-Trybot
==========

to

==========
Move SkGLContext and some GrGLInterface implementations to skgputest module

BUG=skia:
GOLD_TRYBOT_URL=
https://gold.skia.org/search2?unt=true&query=source_type%3Dgm&master=false&is...
CQ_EXTRA_TRYBOTS=client.skia.compile:Build-Ubuntu-GCC-x86_64-Release-CMake-Trybot,Build-Mac-Clang-x86_64-Release-CMake-Trybot

Committed:
https://skia.googlesource.com/skia/+/fe3456cb006110d045b26ff3f8681b893a757b58
==========

[commit-bot: I haz the power, 2016-03-30 15:35:14]

Committed patchset #13 (id:240001) as
https://skia.googlesource.com/skia/+/fe3456cb006110d045b26ff3f8681b893a757b58

[jvanverth1, 2016-03-30 15:40:44]

On 2016/03/30 15:35:14, commit-bot: I haz the power wrote:
> Committed patchset #13 (id:240001) as
> https://skia.googlesource.com/skia/+/fe3456cb006110d045b26ff3f8681b893a757b58

*whew*

[robertphillips, 2016-03-30 16:25:48]

A revert of this CL (patchset #13 id:240001) has been created in
https://codereview.chromium.org/1845473004/ by robertphillips@google.com.

The reason for reverting is: red bots.

[robertphillips, 2016-03-30 16:38:42]

In case of bit rot, here is the error:

In file included from ../../../../../tools/gpu/GrTest.cpp:8:0:
../../../../../tools/gpu/GrTest.h:11:23: fatal error: GrContext.h: No such file
or directory
compilation terminated.

[bsalomon, 2016-03-30 17:11:05]

Description was changed from

==========
Move SkGLContext and some GrGLInterface implementations to skgputest module

BUG=skia:
GOLD_TRYBOT_URL=
https://gold.skia.org/search2?unt=true&query=source_type%3Dgm&master=false&is...
CQ_EXTRA_TRYBOTS=client.skia.compile:Build-Ubuntu-GCC-x86_64-Release-CMake-Trybot,Build-Mac-Clang-x86_64-Release-CMake-Trybot

Committed:
https://skia.googlesource.com/skia/+/fe3456cb006110d045b26ff3f8681b893a757b58
==========

to

==========
Move SkGLContext and some GrGLInterface implementations to skgputest module

BUG=skia:
GOLD_TRYBOT_URL=
https://gold.skia.org/search2?unt=true&query=source_type%3Dgm&master=false&is...
CQ_EXTRA_TRYBOTS=client.skia.compile:Build-Ubuntu-GCC-x86_64-Release-CMake-Trybot,Build-Mac-Clang-x86_64-Release-CMake-Trybot

Committed:
https://skia.googlesource.com/skia/+/fe3456cb006110d045b26ff3f8681b893a757b58
==========

[bsalomon, 2016-03-30 22:12:16]

The CQ bit was checked by bsalomon@google.com to run a CQ dry run

[commit-bot: I haz the power, 2016-03-30 22:12:26]

Dry run: CQ is trying da patch. Follow status at
 https://chromium-cq-status.appspot.com/patch-status/1815823002/320001
View timeline at
 https://chromium-cq-status.appspot.com/patch-timeline/1815823002/320001

[commit-bot: I haz the power, 2016-03-30 22:29:36]

The CQ bit was unchecked by commit-bot@chromium.org

[commit-bot: I haz the power, 2016-03-30 22:29:38]

Dry run: This issue passed the CQ dry run.

[bsalomon, 2016-03-31 01:45:22]

The CQ bit was checked by bsalomon@google.com

[bsalomon, 2016-03-31 01:45:23]

The patchset sent to the CQ was uploaded after l-g-t-m from jvanverth@google.com
Link to the patchset: https://codereview.chromium.org/1815823002/#ps340001
(title: "fix windows and android?")

[commit-bot: I haz the power, 2016-03-31 01:45:29]

CQ is trying da patch. Follow status at
 https://chromium-cq-status.appspot.com/patch-status/1815823002/340001
View timeline at
 https://chromium-cq-status.appspot.com/patch-timeline/1815823002/340001

[commit-bot: I haz the power, 2016-03-31 01:56:22]

Description was changed from

==========
Move SkGLContext and some GrGLInterface implementations to skgputest module

BUG=skia:
GOLD_TRYBOT_URL=
https://gold.skia.org/search2?unt=true&query=source_type%3Dgm&master=false&is...
CQ_EXTRA_TRYBOTS=client.skia.compile:Build-Ubuntu-GCC-x86_64-Release-CMake-Trybot,Build-Mac-Clang-x86_64-Release-CMake-Trybot

Committed:
https://skia.googlesource.com/skia/+/fe3456cb006110d045b26ff3f8681b893a757b58
==========

to

==========
Move SkGLContext and some GrGLInterface implementations to skgputest module

BUG=skia:
GOLD_TRYBOT_URL=
https://gold.skia.org/search2?unt=true&query=source_type%3Dgm&master=false&is...
CQ_EXTRA_TRYBOTS=client.skia.compile:Build-Ubuntu-GCC-x86_64-Release-CMake-Trybot,Build-Mac-Clang-x86_64-Release-CMake-Trybot

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

Committed:
https://skia.googlesource.com/skia/+/3724e574a744491b7cfb8187ac865a70ef3d4528
==========

[commit-bot: I haz the power, 2016-03-31 01:56:24]

Committed patchset #18 (id:340001) as
https://skia.googlesource.com/skia/+/3724e574a744491b7cfb8187ac865a70ef3d4528