Turned on SkSL->GLSL compiler

Turned on SkSL->GLSL compiler
GOLD_TRYBOT_URL= https://gold.skia.org/search?issue=2288033003

Committed: https://skia.googlesource.com/skia/+/9b0fe3d125f237d9884732a48414fa85fc71b4e3
Committed: https://skia.googlesource.com/skia/+/b12b3c6908c62c908b3680be01e3b5bfd30de310
Committed: https://skia.googlesource.com/skia/+/f008b0a59f45c0d4bea3e66faf3b01805009ec89
Committed: https://skia.googlesource.com/skia/+/08b2ccf398e2b81bc05d2c105837e5419899469b
Committed: https://skia.googlesource.com/skia/+/dcfe6dba4a335e50e86ff68e3252065d4197432c
Committed: https://skia.googlesource.com/skia/+/ccb1dd8f267f9d7fe7c9d0ce222ebc81b41853b3
Committed: https://skia.googlesource.com/skia/+/5961bc9278a00e56dacdd9408d0744b5a0a3b493

[ethannicholas, 2016-08-29 16:42:22]

Description was changed from

==========
Turned on SkSL->GLSL compiler
==========

to

==========
Turned on SkSL->GLSL compiler
GOLD_TRYBOT_URL= https://gold.skia.org/search?issue=2288033003
==========

[ethannicholas, 2016-08-30 14:52:14]

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

[commit-bot: I haz the power, 2016-08-30 14:52:16]

Dry run: CQ is trying da patch. Follow status at
 
https://chromium-cq-status.appspot.com/v2/patch-status/codereview.chromium.or...

[commit-bot: I haz the power, 2016-08-30 14:54:27]

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

[commit-bot: I haz the power, 2016-08-30 14:54:27]

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

[ethannicholas, 2016-08-30 16:04:18]

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

[commit-bot: I haz the power, 2016-08-30 16:04:27]

Dry run: CQ is trying da patch. Follow status at
 
https://chromium-cq-status.appspot.com/v2/patch-status/codereview.chromium.or...

[commit-bot: I haz the power, 2016-08-30 16:11:56]

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

[commit-bot: I haz the power, 2016-08-30 16:11:56]

Dry run: Try jobs failed on following builders:
  Build-Win-MSVC-x86_64-Debug-Trybot on master.client.skia.compile (JOB_FAILED,
http://build.chromium.org/p/client.skia.compile/builders/Build-Win-MSVC-x86_6...)

[ethannicholas, 2016-08-30 16:18:19]

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

[commit-bot: I haz the power, 2016-08-30 16:18:26]

Dry run: CQ is trying da patch. Follow status at
 
https://chromium-cq-status.appspot.com/v2/patch-status/codereview.chromium.or...

[commit-bot: I haz the power, 2016-08-30 16:31:58]

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

[commit-bot: I haz the power, 2016-08-30 16:31:59]

Dry run: Try jobs failed on following builders:
  mac_chromium_compile_dbg_ng on master.tryserver.chromium.mac (JOB_FAILED,
http://build.chromium.org/p/tryserver.chromium.mac/builders/mac_chromium_comp...)

[ethannicholas, 2016-09-08 19:38:05]

ethannicholas@google.com changed reviewers:
+ benjaminwagner@google.com, bsalomon@google.com, egdaniel@google.com

[bsalomon, 2016-09-08 19:51:37]

https://codereview.chromium.org/2288033003/diff/160001/src/gpu/gl/builders/Gr...
File src/gpu/gl/builders/GrGLShaderStringBuilder.cpp (right):

https://codereview.chromium.org/2288033003/diff/160001/src/gpu/gl/builders/Gr...
src/gpu/gl/builders/GrGLShaderStringBuilder.cpp:118: static SkSL::Compiler
compiler;
We only allow a single GrContext to be used on one thread (at a time). But there
can be multiple GrContexts running simultaneously on different threads.

https://codereview.chromium.org/2288033003/diff/160001/src/sksl/SkSLGLSLCodeG...
File src/sksl/SkSLGLSLCodeGenerator.cpp (right):

https://codereview.chromium.org/2288033003/diff/160001/src/sksl/SkSLGLSLCodeG...
src/sksl/SkSLGLSLCodeGenerator.cpp:136: // turns min(abs(x), y) into (abs(x) > y
? y : abs(x)) to avoid a Tegra3 compiler bug. Note that
Can we make it safe by introducing an intermediate var for y?

https://codereview.chromium.org/2288033003/diff/160001/src/sksl/SkSLGLSLCodeG...
src/sksl/SkSLGLSLCodeGenerator.cpp:155: writeMinAbsHack(*c.fArguments[0],
*c.fArguments[1]);
this->

https://codereview.chromium.org/2288033003/diff/160001/src/sksl/SkSLGLSLCodeG...
src/sksl/SkSLGLSLCodeGenerator.cpp:159: writeMinAbsHack(*c.fArguments[1],
*c.fArguments[0]);
this->

[dogben, 2016-09-08 21:48:49]

lgtm

Reviewed src/sksl/* and tests/SkSLGLSLTest.cpp.

[ethannicholas, 2016-09-09 15:50:30]

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

[ethannicholas, 2016-09-09 15:50:36]

The CQ bit was unchecked by ethannicholas@google.com

[ethannicholas, 2016-09-09 15:51:08]

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

[commit-bot: I haz the power, 2016-09-09 15:51:20]

Dry run: CQ is trying da patch. Follow status at
 
https://chromium-cq-status.appspot.com/v2/patch-status/codereview.chromium.or...

[commit-bot: I haz the power, 2016-09-09 15:54:09]

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

[commit-bot: I haz the power, 2016-09-09 15:54:10]

Dry run: Try jobs failed on following builders:
  Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Release-Shared-Trybot on
master.client.skia (JOB_FAILED,
http://build.chromium.org/p/client.skia/builders/Test-Ubuntu-GCC-GCE-CPU-AVX2...)
  Build-Mac-Clang-x86_64-Release-GN-Trybot on master.client.skia.compile
(JOB_FAILED,
http://build.chromium.org/p/client.skia.compile/builders/Build-Mac-Clang-x86_...)

[ethannicholas, 2016-09-09 16:02:21]

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

[commit-bot: I haz the power, 2016-09-09 16:02:33]

Dry run: CQ is trying da patch. Follow status at
 
https://chromium-cq-status.appspot.com/v2/patch-status/codereview.chromium.or...

[commit-bot: I haz the power, 2016-09-09 16:31:32]

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

[commit-bot: I haz the power, 2016-09-09 16:31:33]

Dry run: This issue passed the CQ dry run.

[ethannicholas, 2016-09-09 16:34:54]

https://codereview.chromium.org/2288033003/diff/160001/src/gpu/gl/builders/Gr...
File src/gpu/gl/builders/GrGLShaderStringBuilder.cpp (right):

https://codereview.chromium.org/2288033003/diff/160001/src/gpu/gl/builders/Gr...
src/gpu/gl/builders/GrGLShaderStringBuilder.cpp:118: static SkSL::Compiler
compiler;
On 2016/09/08 19:51:37, bsalomon wrote:
> We only allow a single GrContext to be used on one thread (at a time). But
there
> can be multiple GrContexts running simultaneously on different threads.

I moved the compiler instance into GrGLContext to avoid this problem. To
minimize the impact of this change (GrGLContext is used in *a lot* of places), I
use a raw pointer to SkSL::Compiler to avoid having to import SkSLCompiler.h
from GrGLContext.h. This may not be the best way to fix this -- thoughts?

https://codereview.chromium.org/2288033003/diff/160001/src/sksl/SkSLGLSLCodeG...
File src/sksl/SkSLGLSLCodeGenerator.cpp (right):

https://codereview.chromium.org/2288033003/diff/160001/src/sksl/SkSLGLSLCodeG...
src/sksl/SkSLGLSLCodeGenerator.cpp:136: // turns min(abs(x), y) into (abs(x) > y
? y : abs(x)) to avoid a Tegra3 compiler bug. Note that
On 2016/09/08 19:51:37, bsalomon wrote:
> Can we make it safe by introducing an intermediate var for y?

Done.

https://codereview.chromium.org/2288033003/diff/160001/src/sksl/SkSLGLSLCodeG...
src/sksl/SkSLGLSLCodeGenerator.cpp:155: writeMinAbsHack(*c.fArguments[0],
*c.fArguments[1]);
On 2016/09/08 19:51:37, bsalomon wrote:
> this->

Done.

[bsalomon, 2016-09-12 13:48:57]

https://codereview.chromium.org/2288033003/diff/160001/src/gpu/gl/builders/Gr...
File src/gpu/gl/builders/GrGLShaderStringBuilder.cpp (right):

https://codereview.chromium.org/2288033003/diff/160001/src/gpu/gl/builders/Gr...
src/gpu/gl/builders/GrGLShaderStringBuilder.cpp:118: static SkSL::Compiler
compiler;
On 2016/09/09 16:34:54, ethannicholas wrote:
> On 2016/09/08 19:51:37, bsalomon wrote:
> > We only allow a single GrContext to be used on one thread (at a time). But
> there
> > can be multiple GrContexts running simultaneously on different threads.
> 
> I moved the compiler instance into GrGLContext to avoid this problem. To
> minimize the impact of this change (GrGLContext is used in *a lot* of places),
I
> use a raw pointer to SkSL::Compiler to avoid having to import SkSLCompiler.h
> from GrGLContext.h. This may not be the best way to fix this -- thoughts?

I don't have a problem with including SkSLCompiler.h in GrGLContext.h. Though,
can't std::unique_ptr be used with just a forward decl?

https://codereview.chromium.org/2288033003/diff/200001/src/gpu/gl/GrGLContext.h
File src/gpu/gl/GrGLContext.h (right):

https://codereview.chromium.org/2288033003/diff/200001/src/gpu/gl/GrGLContext...
src/gpu/gl/GrGLContext.h:89: ~GrGLContext();
Should we declare virtual ~GrGLContextInfo()?

https://codereview.chromium.org/2288033003/diff/200001/src/gpu/gl/GrGLContext...
src/gpu/gl/GrGLContext.h:91: SkSL::Compiler* fCompiler;
std::unique_ptr?

[ethannicholas, 2016-09-12 14:53:26]

https://codereview.chromium.org/2288033003/diff/160001/src/gpu/gl/builders/Gr...
File src/gpu/gl/builders/GrGLShaderStringBuilder.cpp (right):

https://codereview.chromium.org/2288033003/diff/160001/src/gpu/gl/builders/Gr...
src/gpu/gl/builders/GrGLShaderStringBuilder.cpp:118: static SkSL::Compiler
compiler;
On 2016/09/12 13:48:57, bsalomon wrote:

> can't std::unique_ptr be used with just a forward decl?

error: invalid application of ‘sizeof’ to incomplete type ‘SkSL::Compiler’

:-(

https://codereview.chromium.org/2288033003/diff/200001/src/gpu/gl/GrGLContext.h
File src/gpu/gl/GrGLContext.h (right):

https://codereview.chromium.org/2288033003/diff/200001/src/gpu/gl/GrGLContext...
src/gpu/gl/GrGLContext.h:89: ~GrGLContext();
On 2016/09/12 13:48:57, bsalomon wrote:
> Should we declare virtual ~GrGLContextInfo()?

Good catch, done.

[bsalomon, 2016-09-12 14:58:43]

lgtm

[ethannicholas, 2016-09-12 15:07:15]

The CQ bit was checked by ethannicholas@google.com

[ethannicholas, 2016-09-12 15:07:16]

The patchset sent to the CQ was uploaded after l-g-t-m from
benjaminwagner@google.com
Link to the patchset: https://codereview.chromium.org/2288033003/#ps220001
(title: "added virtual destructor to GrGLContextInfo")

[commit-bot: I haz the power, 2016-09-12 15:07:29]

CQ is trying da patch. Follow status at
 
https://chromium-cq-status.appspot.com/v2/patch-status/codereview.chromium.or...

[commit-bot: I haz the power, 2016-09-12 15:50:15]

Description was changed from

==========
Turned on SkSL->GLSL compiler
GOLD_TRYBOT_URL= https://gold.skia.org/search?issue=2288033003
==========

to

==========
Turned on SkSL->GLSL compiler
GOLD_TRYBOT_URL= https://gold.skia.org/search?issue=2288033003

Committed:
https://skia.googlesource.com/skia/+/9b0fe3d125f237d9884732a48414fa85fc71b4e3
==========

[commit-bot: I haz the power, 2016-09-12 15:50:16]

Committed patchset #12 (id:220001) as
https://skia.googlesource.com/skia/+/9b0fe3d125f237d9884732a48414fa85fc71b4e3

[ethannicholas, 2016-09-12 16:15:41]

A revert of this CL (patchset #12 id:220001) has been created in
https://codereview.chromium.org/2337553002/ by ethannicholas@google.com.

The reason for reverting is: Compilation errors on some bots..

[ethannicholas, 2016-09-12 16:34:18]

Description was changed from

==========
Turned on SkSL->GLSL compiler
GOLD_TRYBOT_URL= https://gold.skia.org/search?issue=2288033003

Committed:
https://skia.googlesource.com/skia/+/9b0fe3d125f237d9884732a48414fa85fc71b4e3
==========

to

==========
Turned on SkSL->GLSL compiler
GOLD_TRYBOT_URL= https://gold.skia.org/search?issue=2288033003

Committed:
https://skia.googlesource.com/skia/+/9b0fe3d125f237d9884732a48414fa85fc71b4e3
==========

[ethannicholas, 2016-09-12 16:55:51]

Patchset #13 (id:240001) has been deleted

[ethannicholas, 2016-09-12 19:05:07]

Patchset #15 (id:300001) has been deleted

[ethannicholas, 2016-09-21 15:37:07]

Patchset #28 (id:580001) has been deleted

[ethannicholas, 2016-09-21 15:37:28]

Patchset #27 (id:560001) has been deleted

[ethannicholas, 2016-09-21 17:39:52]

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

[commit-bot: I haz the power, 2016-09-21 17:40:01]

Dry run: CQ is trying da patch. Follow status at
 
https://chromium-cq-status.appspot.com/v2/patch-status/codereview.chromium.or...

[commit-bot: I haz the power, 2016-09-21 18:42:01]

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

[commit-bot: I haz the power, 2016-09-21 18:42:02]

Dry run: This issue passed the CQ dry run.

[ethannicholas, 2016-09-21 20:08:57]

Patchset #28 (id:610001) has been deleted

[ethannicholas, 2016-09-23 14:58:15]

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

[commit-bot: I haz the power, 2016-09-23 14:58:22]

Dry run: CQ is trying da patch. Follow status at
 
https://chromium-cq-status.appspot.com/v2/patch-status/codereview.chromium.or...

[commit-bot: I haz the power, 2016-09-23 15:34:32]

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

[commit-bot: I haz the power, 2016-09-23 15:34:33]

Dry run: This issue passed the CQ dry run.

[ethannicholas, 2016-09-26 13:55:47]

The CQ bit was checked by ethannicholas@google.com

[ethannicholas, 2016-09-26 13:55:48]

The patchset sent to the CQ was uploaded after l-g-t-m from bsalomon@google.com,
benjaminwagner@google.com
Link to the patchset: https://codereview.chromium.org/2288033003/#ps760001
(title: "removed extraneous assert")

[commit-bot: I haz the power, 2016-09-26 13:55:55]

CQ is trying da patch. Follow status at
 
https://chromium-cq-status.appspot.com/v2/patch-status/codereview.chromium.or...

[commit-bot: I haz the power, 2016-09-26 14:02:30]

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

[commit-bot: I haz the power, 2016-09-26 14:02:31]

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

[ethannicholas, 2016-09-26 18:36:06]

The CQ bit was checked by ethannicholas@google.com

[ethannicholas, 2016-09-26 18:36:07]

The patchset sent to the CQ was uploaded after l-g-t-m from bsalomon@google.com,
benjaminwagner@google.com
Link to the patchset: https://codereview.chromium.org/2288033003/#ps800001
(title: "(hopefully) fixed redefinition of builtins")

[commit-bot: I haz the power, 2016-09-26 18:36:14]

CQ is trying da patch. Follow status at
 
https://chromium-cq-status.appspot.com/v2/patch-status/codereview.chromium.or...

[commit-bot: I haz the power, 2016-09-26 18:58:55]

Description was changed from

==========
Turned on SkSL->GLSL compiler
GOLD_TRYBOT_URL= https://gold.skia.org/search?issue=2288033003

Committed:
https://skia.googlesource.com/skia/+/9b0fe3d125f237d9884732a48414fa85fc71b4e3
==========

to

==========
Turned on SkSL->GLSL compiler
GOLD_TRYBOT_URL= https://gold.skia.org/search?issue=2288033003

Committed:
https://skia.googlesource.com/skia/+/9b0fe3d125f237d9884732a48414fa85fc71b4e3
Committed:
https://skia.googlesource.com/skia/+/b12b3c6908c62c908b3680be01e3b5bfd30de310
==========

[commit-bot: I haz the power, 2016-09-26 18:58:58]

Committed patchset #37 (id:800001) as
https://skia.googlesource.com/skia/+/b12b3c6908c62c908b3680be01e3b5bfd30de310

[ethannicholas, 2016-09-26 20:43:32]

A revert of this CL (patchset #37 id:800001) has been created in
https://codereview.chromium.org/2372773002/ by ethannicholas@google.com.

The reason for reverting is: Gold image breakage.

[ethannicholas, 2016-09-27 14:21:32]

Description was changed from

==========
Turned on SkSL->GLSL compiler
GOLD_TRYBOT_URL= https://gold.skia.org/search?issue=2288033003

Committed:
https://skia.googlesource.com/skia/+/9b0fe3d125f237d9884732a48414fa85fc71b4e3
Committed:
https://skia.googlesource.com/skia/+/b12b3c6908c62c908b3680be01e3b5bfd30de310
==========

to

==========
Turned on SkSL->GLSL compiler
GOLD_TRYBOT_URL= https://gold.skia.org/search?issue=2288033003

Committed:
https://skia.googlesource.com/skia/+/9b0fe3d125f237d9884732a48414fa85fc71b4e3
Committed:
https://skia.googlesource.com/skia/+/b12b3c6908c62c908b3680be01e3b5bfd30de310
==========

[ethannicholas, 2016-09-27 22:06:16]

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

[commit-bot: I haz the power, 2016-09-27 22:06:23]

Dry run: CQ is trying da patch. Follow status at
 
https://chromium-cq-status.appspot.com/v2/patch-status/codereview.chromium.or...

[commit-bot: I haz the power, 2016-09-27 22:36:58]

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

[commit-bot: I haz the power, 2016-09-27 22:36:59]

Dry run: This issue passed the CQ dry run.

[ethannicholas, 2016-09-30 13:04:00]

The CQ bit was checked by ethannicholas@google.com

[ethannicholas, 2016-09-30 13:04:00]

The patchset sent to the CQ was uploaded after l-g-t-m from bsalomon@google.com,
benjaminwagner@google.com
Link to the patchset: https://codereview.chromium.org/2288033003/#ps880001
(title: "fixed broken test")

[commit-bot: I haz the power, 2016-09-30 13:04:08]

CQ is trying da patch. Follow status at
 
https://chromium-cq-status.appspot.com/v2/patch-status/codereview.chromium.or...

[commit-bot: I haz the power, 2016-09-30 13:23:27]

Description was changed from

==========
Turned on SkSL->GLSL compiler
GOLD_TRYBOT_URL= https://gold.skia.org/search?issue=2288033003

Committed:
https://skia.googlesource.com/skia/+/9b0fe3d125f237d9884732a48414fa85fc71b4e3
Committed:
https://skia.googlesource.com/skia/+/b12b3c6908c62c908b3680be01e3b5bfd30de310
==========

to

==========
Turned on SkSL->GLSL compiler
GOLD_TRYBOT_URL= https://gold.skia.org/search?issue=2288033003

Committed:
https://skia.googlesource.com/skia/+/9b0fe3d125f237d9884732a48414fa85fc71b4e3
Committed:
https://skia.googlesource.com/skia/+/b12b3c6908c62c908b3680be01e3b5bfd30de310
Committed:
https://skia.googlesource.com/skia/+/f008b0a59f45c0d4bea3e66faf3b01805009ec89
==========

[commit-bot: I haz the power, 2016-09-30 13:23:28]

Committed patchset #41 (id:880001) as
https://skia.googlesource.com/skia/+/f008b0a59f45c0d4bea3e66faf3b01805009ec89

[dogben, 2016-09-30 15:00:52]

https://codereview.chromium.org/2288033003/diff/880001/src/sksl/SkSLCompiler.cpp
File src/sksl/SkSLCompiler.cpp (right):

https://codereview.chromium.org/2288033003/diff/880001/src/sksl/SkSLCompiler....
src/sksl/SkSLCompiler.cpp:137: printf("%s", errorText().c_str());
Debugging?

https://codereview.chromium.org/2288033003/diff/880001/src/sksl/SkSLGLSLCodeG...
File src/sksl/SkSLGLSLCodeGenerator.cpp (right):

https://codereview.chromium.org/2288033003/diff/880001/src/sksl/SkSLGLSLCodeG...
src/sksl/SkSLGLSLCodeGenerator.cpp:146: this->writeExpression(otherExpr,
kRelational_Precedence);
nit: kAssignment_Precedence

https://codereview.chromium.org/2288033003/diff/880001/src/sksl/SkSLGLSLCodeG...
src/sksl/SkSLGLSLCodeGenerator.cpp:148: this->writeExpression(absExpr,
kTernary_Precedence);
Why make a temp var for otherExpr but not absExpr?

https://codereview.chromium.org/2288033003/diff/880001/src/sksl/SkSLGLSLCodeG...
src/sksl/SkSLGLSLCodeGenerator.cpp:160: this->writeMinAbsHack(*c.fArguments[1],
*c.fArguments[0]);
Is argument evaluation order undefined? E.g. "min(abs(x++), x++)"

https://codereview.chromium.org/2288033003/diff/880001/src/sksl/SkSLGLSLCodeG...
src/sksl/SkSLGLSLCodeGenerator.cpp:613: this->write("out ");
Does this ever need to be "varying "?

https://codereview.chromium.org/2288033003/diff/880001/src/sksl/SkSLGLSLCodeG...
File src/sksl/SkSLGLSLCodeGenerator.h (right):

https://codereview.chromium.org/2288033003/diff/880001/src/sksl/SkSLGLSLCodeG...
src/sksl/SkSLGLSLCodeGenerator.h:176: std::string fFunctionHeader;
nit: documentation

https://codereview.chromium.org/2288033003/diff/880001/src/sksl/SkSLIRGenerat...
File src/sksl/SkSLIRGenerator.cpp (right):

https://codereview.chromium.org/2288033003/diff/880001/src/sksl/SkSLIRGenerat...
src/sksl/SkSLIRGenerator.cpp:1074: if (base->fType != *fContext.fInt_Type) {
Also uint?

https://codereview.chromium.org/2288033003/diff/880001/src/sksl/SkSLUtil.cpp
File src/sksl/SkSLUtil.cpp (right):

https://codereview.chromium.org/2288033003/diff/880001/src/sksl/SkSLUtil.cpp#...
src/sksl/SkSLUtil.cpp:47: int stoi(std::string s) {
stoi and stol are used in the parser, but they don't do any validation of the
input or check for error conditions from strtoul or atoi/atol. I could write 0xj
and cause an assertion failure or write 18446744073709999999 and get 0.

https://codereview.chromium.org/2288033003/diff/880001/src/sksl/SkSLUtil.cpp#...
src/sksl/SkSLUtil.cpp:64: int result = strtoul(s.substr(2).c_str(), &p, 16);
s/int/long/

https://codereview.chromium.org/2288033003/diff/880001/src/sksl/ir/SkSLIndexE...
File src/sksl/ir/SkSLIndexExpression.h (right):

https://codereview.chromium.org/2288033003/diff/880001/src/sksl/ir/SkSLIndexE...
src/sksl/ir/SkSLIndexExpression.h:30: switch (type.columns()) {
Should also be rows.

https://codereview.chromium.org/2288033003/diff/880001/src/sksl/ir/SkSLProgram.h
File src/sksl/ir/SkSLProgram.h (right):

https://codereview.chromium.org/2288033003/diff/880001/src/sksl/ir/SkSLProgra...
src/sksl/ir/SkSLProgram.h:42: // FIXME handle different types; currently it
assumes this is for floats
Comment belongs to fDefaultPrecision?

https://codereview.chromium.org/2288033003/diff/880001/src/sksl/sksl.flex
File src/sksl/sksl.flex (right):

https://codereview.chromium.org/2288033003/diff/880001/src/sksl/sksl.flex#new...
src/sksl/sksl.flex:33: "0x"[0-9a-zA-Z]+ { return SkSL::Token::INT_LITERAL; }
Why a-z rather than a-f?

[fmalita_google_do_not_use, 2016-09-30 15:05:05]

A revert of this CL (patchset #41 id:880001) has been created in
https://codereview.chromium.org/2387643003/ by fmalita@google.com.

The reason for reverting is: 1) Chromium roll failures:
https://build.chromium.org/p/tryserver.chromium.linux/builders/linux_chromium...

2) G3 roll failures

3) iOS failures:
https://uberchromegw.corp.google.com/i/client.skia/builders/Perf-iOS-Clang-iP....

[ethannicholas, 2016-09-30 15:23:00]

Patchset #42 (id:900001) has been deleted

[ethannicholas, 2016-09-30 15:37:48]

Description was changed from

==========
Turned on SkSL->GLSL compiler
GOLD_TRYBOT_URL= https://gold.skia.org/search?issue=2288033003

Committed:
https://skia.googlesource.com/skia/+/9b0fe3d125f237d9884732a48414fa85fc71b4e3
Committed:
https://skia.googlesource.com/skia/+/b12b3c6908c62c908b3680be01e3b5bfd30de310
Committed:
https://skia.googlesource.com/skia/+/f008b0a59f45c0d4bea3e66faf3b01805009ec89
==========

to

==========
Turned on SkSL->GLSL compiler
GOLD_TRYBOT_URL= https://gold.skia.org/search?issue=2288033003

Committed:
https://skia.googlesource.com/skia/+/9b0fe3d125f237d9884732a48414fa85fc71b4e3
Committed:
https://skia.googlesource.com/skia/+/b12b3c6908c62c908b3680be01e3b5bfd30de310
Committed:
https://skia.googlesource.com/skia/+/f008b0a59f45c0d4bea3e66faf3b01805009ec89
==========

[ethannicholas, 2016-09-30 15:38:01]

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

[commit-bot: I haz the power, 2016-09-30 15:38:13]

Dry run: CQ is trying da patch. Follow status at
 
https://chromium-cq-status.appspot.com/v2/patch-status/codereview.chromium.or...

[commit-bot: I haz the power, 2016-09-30 15:48:32]

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

[commit-bot: I haz the power, 2016-09-30 15:48:33]

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

[ethannicholas, 2016-10-04 18:49:09]

Patchset #47 (id:1020001) has been deleted

[ethannicholas, 2016-10-04 18:49:22]

Patchset #46 (id:1000001) has been deleted

[ethannicholas, 2016-10-04 19:58:34]

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

[commit-bot: I haz the power, 2016-10-04 19:58:42]

Dry run: CQ is trying da patch. Follow status at
 
https://chromium-cq-status.appspot.com/v2/patch-status/codereview.chromium.or...

[commit-bot: I haz the power, 2016-10-04 20:14:13]

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

[commit-bot: I haz the power, 2016-10-04 20:14:14]

Dry run: Try jobs failed on following builders:
  Test-Android-Clang-Nexus5-GPU-Adreno330-arm-Release-GN_Android-Trybot on
master.client.skia.android (JOB_FAILED,
http://build.chromium.org/p/client.skia.android/builders/Test-Android-Clang-N...)

[ethannicholas, 2016-10-05 14:11:02]

Patchset #47 (id:1060001) has been deleted

[ethannicholas, 2016-10-05 17:53:03]

Patchset #50 (id:1140001) has been deleted

[ethannicholas, 2016-10-05 19:03:55]

Patchset #47 (id:1080001) has been deleted

[ethannicholas, 2016-10-05 19:04:29]

Patchset #50 (id:1180001) has been deleted

[ethannicholas, 2016-10-05 19:04:48]

Patchset #49 (id:1160001) has been deleted

[ethannicholas, 2016-10-05 19:05:01]

Patchset #48 (id:1120001) has been deleted

[ethannicholas, 2016-10-05 19:14:15]

Patchset #47 (id:1100001) has been deleted

[ethannicholas, 2016-10-05 20:24:02]

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

[commit-bot: I haz the power, 2016-10-05 20:24:06]

Dry run: CQ is trying da patch. Follow status at
 
https://chromium-cq-status.appspot.com/v2/patch-status/codereview.chromium.or...

[commit-bot: I haz the power, 2016-10-05 20:49:26]

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

[commit-bot: I haz the power, 2016-10-05 20:49:27]

Dry run: This issue passed the CQ dry run.

[ethannicholas, 2016-10-06 13:16:47]

It's going to stick this time! :-)

Just needs one last going-over before landing it for reals.

https://codereview.chromium.org/2288033003/diff/880001/src/sksl/SkSLCompiler.cpp
File src/sksl/SkSLCompiler.cpp (right):

https://codereview.chromium.org/2288033003/diff/880001/src/sksl/SkSLCompiler....
src/sksl/SkSLCompiler.cpp:137: printf("%s", errorText().c_str());
On 2016/09/30 15:00:51, dogben wrote:
> Debugging?

Oops.

https://codereview.chromium.org/2288033003/diff/880001/src/sksl/SkSLGLSLCodeG...
File src/sksl/SkSLGLSLCodeGenerator.cpp (right):

https://codereview.chromium.org/2288033003/diff/880001/src/sksl/SkSLGLSLCodeG...
src/sksl/SkSLGLSLCodeGenerator.cpp:146: this->writeExpression(otherExpr,
kRelational_Precedence);
On 2016/09/30 15:00:51, dogben wrote:
> nit: kAssignment_Precedence

Done.

https://codereview.chromium.org/2288033003/diff/880001/src/sksl/SkSLGLSLCodeG...
src/sksl/SkSLGLSLCodeGenerator.cpp:148: this->writeExpression(absExpr,
kTernary_Precedence);
On 2016/09/30 15:00:51, dogben wrote:
> Why make a temp var for otherExpr but not absExpr?

Fixed.

https://codereview.chromium.org/2288033003/diff/880001/src/sksl/SkSLGLSLCodeG...
src/sksl/SkSLGLSLCodeGenerator.cpp:160: this->writeMinAbsHack(*c.fArguments[1],
*c.fArguments[0]);
On 2016/09/30 15:00:51, dogben wrote:
> Is argument evaluation order undefined? E.g. "min(abs(x++), x++)"

GLSL specifies left to right, but I haven't decided whether SkSL is going to
stick to that rule (and clearly it isn't 100% doing so at the moment). I'll at
least add a comment noting that this breaks the GLSL assumption in this case.

https://codereview.chromium.org/2288033003/diff/880001/src/sksl/SkSLGLSLCodeG...
src/sksl/SkSLGLSLCodeGenerator.cpp:613: this->write("out ");
On 2016/09/30 15:00:51, dogben wrote:
> Does this ever need to be "varying "?

I don't think so -- versions new enough to require you to specify the output
also use out instead of varying.

https://codereview.chromium.org/2288033003/diff/880001/src/sksl/SkSLIRGenerat...
File src/sksl/SkSLIRGenerator.cpp (right):

https://codereview.chromium.org/2288033003/diff/880001/src/sksl/SkSLIRGenerat...
src/sksl/SkSLIRGenerator.cpp:1074: if (base->fType != *fContext.fInt_Type) {
On 2016/09/30 15:00:51, dogben wrote:
> Also uint?

Eventually, but full uint support will require a lot of other changes as well.

https://codereview.chromium.org/2288033003/diff/880001/src/sksl/sksl.flex
File src/sksl/sksl.flex (right):

https://codereview.chromium.org/2288033003/diff/880001/src/sksl/sksl.flex#new...
src/sksl/sksl.flex:33: "0x"[0-9a-zA-Z]+ { return SkSL::Token::INT_LITERAL; }
On 2016/09/30 15:00:52, dogben wrote:
> Why a-z rather than a-f?

That is an excellent question.

[dogben, 2016-10-09 23:54:57]

lgtm

src/sksl LGTM

https://codereview.chromium.org/2288033003/diff/1200001/src/sksl/SkSLGLSLCode...
File src/sksl/SkSLGLSLCodeGenerator.cpp (right):

https://codereview.chromium.org/2288033003/diff/1200001/src/sksl/SkSLGLSLCode...
src/sksl/SkSLGLSLCodeGenerator.cpp:146: this->writeExpression(absExpr,
kTopLevel_Precedence);
nit: kAssignment_Precedence

[ethannicholas, 2016-10-10 13:19:53]

The CQ bit was checked by ethannicholas@google.com

[ethannicholas, 2016-10-10 13:19:54]

The patchset sent to the CQ was uploaded after l-g-t-m from bsalomon@google.com
Link to the patchset: https://codereview.chromium.org/2288033003/#ps1200001
(title: "that ought to do it")

[commit-bot: I haz the power, 2016-10-10 13:20:05]

CQ is trying da patch. Follow status at
 
https://chromium-cq-status.appspot.com/v2/patch-status/codereview.chromium.or...

[commit-bot: I haz the power, 2016-10-10 13:40:27]

Description was changed from

==========
Turned on SkSL->GLSL compiler
GOLD_TRYBOT_URL= https://gold.skia.org/search?issue=2288033003

Committed:
https://skia.googlesource.com/skia/+/9b0fe3d125f237d9884732a48414fa85fc71b4e3
Committed:
https://skia.googlesource.com/skia/+/b12b3c6908c62c908b3680be01e3b5bfd30de310
Committed:
https://skia.googlesource.com/skia/+/f008b0a59f45c0d4bea3e66faf3b01805009ec89
==========

to

==========
Turned on SkSL->GLSL compiler
GOLD_TRYBOT_URL= https://gold.skia.org/search?issue=2288033003

Committed:
https://skia.googlesource.com/skia/+/9b0fe3d125f237d9884732a48414fa85fc71b4e3
Committed:
https://skia.googlesource.com/skia/+/b12b3c6908c62c908b3680be01e3b5bfd30de310
Committed:
https://skia.googlesource.com/skia/+/f008b0a59f45c0d4bea3e66faf3b01805009ec89
Committed:
https://skia.googlesource.com/skia/+/08b2ccf398e2b81bc05d2c105837e5419899469b
==========

[commit-bot: I haz the power, 2016-10-10 13:40:29]

Committed patchset #47 (id:1200001) as
https://skia.googlesource.com/skia/+/08b2ccf398e2b81bc05d2c105837e5419899469b

[jvanverth1, 2016-10-10 16:18:03]

A revert of this CL (patchset #47 id:1200001) has been created in
https://codereview.chromium.org/2403083002/ by jvanverth@google.com.

The reason for reverting is: Looks like it introduces new static initializers,
and it's failing the Chrome roll..

[ethannicholas, 2016-10-10 16:45:12]

Description was changed from

==========
Turned on SkSL->GLSL compiler
GOLD_TRYBOT_URL= https://gold.skia.org/search?issue=2288033003

Committed:
https://skia.googlesource.com/skia/+/9b0fe3d125f237d9884732a48414fa85fc71b4e3
Committed:
https://skia.googlesource.com/skia/+/b12b3c6908c62c908b3680be01e3b5bfd30de310
Committed:
https://skia.googlesource.com/skia/+/f008b0a59f45c0d4bea3e66faf3b01805009ec89
Committed:
https://skia.googlesource.com/skia/+/08b2ccf398e2b81bc05d2c105837e5419899469b
==========

to

==========
Turned on SkSL->GLSL compiler
GOLD_TRYBOT_URL= https://gold.skia.org/search?issue=2288033003

Committed:
https://skia.googlesource.com/skia/+/9b0fe3d125f237d9884732a48414fa85fc71b4e3
Committed:
https://skia.googlesource.com/skia/+/b12b3c6908c62c908b3680be01e3b5bfd30de310
Committed:
https://skia.googlesource.com/skia/+/f008b0a59f45c0d4bea3e66faf3b01805009ec89
Committed:
https://skia.googlesource.com/skia/+/08b2ccf398e2b81bc05d2c105837e5419899469b
==========

[ethannicholas, 2016-10-10 16:46:26]

The CQ bit was checked by ethannicholas@google.com

[ethannicholas, 2016-10-10 16:46:26]

The patchset sent to the CQ was uploaded after l-g-t-m from bsalomon@google.com,
benjaminwagner@google.com
Link to the patchset: https://codereview.chromium.org/2288033003/#ps1220001
(title: "removed static initializers")

[commit-bot: I haz the power, 2016-10-10 16:46:37]

CQ is trying da patch. Follow status at
 
https://chromium-cq-status.appspot.com/v2/patch-status/codereview.chromium.or...

[commit-bot: I haz the power, 2016-10-10 17:09:04]

Description was changed from

==========
Turned on SkSL->GLSL compiler
GOLD_TRYBOT_URL= https://gold.skia.org/search?issue=2288033003

Committed:
https://skia.googlesource.com/skia/+/9b0fe3d125f237d9884732a48414fa85fc71b4e3
Committed:
https://skia.googlesource.com/skia/+/b12b3c6908c62c908b3680be01e3b5bfd30de310
Committed:
https://skia.googlesource.com/skia/+/f008b0a59f45c0d4bea3e66faf3b01805009ec89
Committed:
https://skia.googlesource.com/skia/+/08b2ccf398e2b81bc05d2c105837e5419899469b
==========

to

==========
Turned on SkSL->GLSL compiler
GOLD_TRYBOT_URL= https://gold.skia.org/search?issue=2288033003

Committed:
https://skia.googlesource.com/skia/+/9b0fe3d125f237d9884732a48414fa85fc71b4e3
Committed:
https://skia.googlesource.com/skia/+/b12b3c6908c62c908b3680be01e3b5bfd30de310
Committed:
https://skia.googlesource.com/skia/+/f008b0a59f45c0d4bea3e66faf3b01805009ec89
Committed:
https://skia.googlesource.com/skia/+/08b2ccf398e2b81bc05d2c105837e5419899469b
Committed:
https://skia.googlesource.com/skia/+/dcfe6dba4a335e50e86ff68e3252065d4197432c
==========

[commit-bot: I haz the power, 2016-10-10 17:09:07]

Committed patchset #48 (id:1220001) as
https://skia.googlesource.com/skia/+/dcfe6dba4a335e50e86ff68e3252065d4197432c

[mtklein, 2016-10-11 02:41:09]

A revert of this CL (patchset #48 id:1220001) has been created in
https://codereview.chromium.org/2408053002/ by mtklein@google.com.

The reason for reverting is:
https://build.chromium.org/p/chromium/builders/Linux%20x64/builds/26798.

[ethannicholas, 2016-10-11 14:56:37]

Description was changed from

==========
Turned on SkSL->GLSL compiler
GOLD_TRYBOT_URL= https://gold.skia.org/search?issue=2288033003

Committed:
https://skia.googlesource.com/skia/+/9b0fe3d125f237d9884732a48414fa85fc71b4e3
Committed:
https://skia.googlesource.com/skia/+/b12b3c6908c62c908b3680be01e3b5bfd30de310
Committed:
https://skia.googlesource.com/skia/+/f008b0a59f45c0d4bea3e66faf3b01805009ec89
Committed:
https://skia.googlesource.com/skia/+/08b2ccf398e2b81bc05d2c105837e5419899469b
Committed:
https://skia.googlesource.com/skia/+/dcfe6dba4a335e50e86ff68e3252065d4197432c
==========

to

==========
Turned on SkSL->GLSL compiler
GOLD_TRYBOT_URL= https://gold.skia.org/search?issue=2288033003

Committed:
https://skia.googlesource.com/skia/+/9b0fe3d125f237d9884732a48414fa85fc71b4e3
Committed:
https://skia.googlesource.com/skia/+/b12b3c6908c62c908b3680be01e3b5bfd30de310
Committed:
https://skia.googlesource.com/skia/+/f008b0a59f45c0d4bea3e66faf3b01805009ec89
Committed:
https://skia.googlesource.com/skia/+/08b2ccf398e2b81bc05d2c105837e5419899469b
Committed:
https://skia.googlesource.com/skia/+/dcfe6dba4a335e50e86ff68e3252065d4197432c
==========

[ethannicholas, 2016-10-11 14:58:01]

On 2016/10/11 02:41:09, mtklein wrote:
> A revert of this CL (patchset #48 id:1220001) has been created in
> https://codereview.chromium.org/2408053002/ by mailto:mtklein@google.com.
> 
> The reason for reverting is:
> https://build.chromium.org/p/chromium/builders/Linux%20x64/builds/26798.

The log implies that this is caused by inadvertent use of <iostream> instead of
<ostream>. Unfortunately I can't seem to reproduce the results they are seeing
with those scripts on my system, so I am changing it to <ostream>, re-landing,
and hoping for the best. Fingers crossed.

[ethannicholas, 2016-10-11 14:58:25]

The CQ bit was checked by ethannicholas@google.com

[ethannicholas, 2016-10-11 14:58:26]

The patchset sent to the CQ was uploaded after l-g-t-m from bsalomon@google.com,
benjaminwagner@google.com
Link to the patchset: https://codereview.chromium.org/2288033003/#ps1240001
(title: "changed <iostream> to <ostream>")

[commit-bot: I haz the power, 2016-10-11 14:58:31]

CQ is trying da patch. Follow status at
 
https://chromium-cq-status.appspot.com/v2/patch-status/codereview.chromium.or...

[commit-bot: I haz the power, 2016-10-11 15:47:08]

Description was changed from

==========
Turned on SkSL->GLSL compiler
GOLD_TRYBOT_URL= https://gold.skia.org/search?issue=2288033003

Committed:
https://skia.googlesource.com/skia/+/9b0fe3d125f237d9884732a48414fa85fc71b4e3
Committed:
https://skia.googlesource.com/skia/+/b12b3c6908c62c908b3680be01e3b5bfd30de310
Committed:
https://skia.googlesource.com/skia/+/f008b0a59f45c0d4bea3e66faf3b01805009ec89
Committed:
https://skia.googlesource.com/skia/+/08b2ccf398e2b81bc05d2c105837e5419899469b
Committed:
https://skia.googlesource.com/skia/+/dcfe6dba4a335e50e86ff68e3252065d4197432c
==========

to

==========
Turned on SkSL->GLSL compiler
GOLD_TRYBOT_URL= https://gold.skia.org/search?issue=2288033003

Committed:
https://skia.googlesource.com/skia/+/9b0fe3d125f237d9884732a48414fa85fc71b4e3
Committed:
https://skia.googlesource.com/skia/+/b12b3c6908c62c908b3680be01e3b5bfd30de310
Committed:
https://skia.googlesource.com/skia/+/f008b0a59f45c0d4bea3e66faf3b01805009ec89
Committed:
https://skia.googlesource.com/skia/+/08b2ccf398e2b81bc05d2c105837e5419899469b
Committed:
https://skia.googlesource.com/skia/+/dcfe6dba4a335e50e86ff68e3252065d4197432c
Committed:
https://skia.googlesource.com/skia/+/ccb1dd8f267f9d7fe7c9d0ce222ebc81b41853b3
==========

[commit-bot: I haz the power, 2016-10-11 15:47:10]

Committed patchset #49 (id:1240001) as
https://skia.googlesource.com/skia/+/ccb1dd8f267f9d7fe7c9d0ce222ebc81b41853b3

[jvanverth1, 2016-10-11 17:03:30]

A revert of this CL (patchset #49 id:1240001) has been created in
https://codereview.chromium.org/2408193002/ by jvanverth@google.com.

The reason for reverting is: Pre-emptive revert. Sorry, but we're getting back
up on our roll and Chrome reverted our last one for apparently no reason.
.

[ethannicholas, 2016-10-12 13:37:59]

Description was changed from

==========
Turned on SkSL->GLSL compiler
GOLD_TRYBOT_URL= https://gold.skia.org/search?issue=2288033003

Committed:
https://skia.googlesource.com/skia/+/9b0fe3d125f237d9884732a48414fa85fc71b4e3
Committed:
https://skia.googlesource.com/skia/+/b12b3c6908c62c908b3680be01e3b5bfd30de310
Committed:
https://skia.googlesource.com/skia/+/f008b0a59f45c0d4bea3e66faf3b01805009ec89
Committed:
https://skia.googlesource.com/skia/+/08b2ccf398e2b81bc05d2c105837e5419899469b
Committed:
https://skia.googlesource.com/skia/+/dcfe6dba4a335e50e86ff68e3252065d4197432c
Committed:
https://skia.googlesource.com/skia/+/ccb1dd8f267f9d7fe7c9d0ce222ebc81b41853b3
==========

to

==========
Turned on SkSL->GLSL compiler
GOLD_TRYBOT_URL= https://gold.skia.org/search?issue=2288033003

Committed:
https://skia.googlesource.com/skia/+/9b0fe3d125f237d9884732a48414fa85fc71b4e3
Committed:
https://skia.googlesource.com/skia/+/b12b3c6908c62c908b3680be01e3b5bfd30de310
Committed:
https://skia.googlesource.com/skia/+/f008b0a59f45c0d4bea3e66faf3b01805009ec89
Committed:
https://skia.googlesource.com/skia/+/08b2ccf398e2b81bc05d2c105837e5419899469b
Committed:
https://skia.googlesource.com/skia/+/dcfe6dba4a335e50e86ff68e3252065d4197432c
Committed:
https://skia.googlesource.com/skia/+/ccb1dd8f267f9d7fe7c9d0ce222ebc81b41853b3
==========

[ethannicholas, 2016-10-12 13:38:21]

The CQ bit was checked by ethannicholas@google.com

[commit-bot: I haz the power, 2016-10-12 13:38:32]

CQ is trying da patch. Follow status at
 
https://chromium-cq-status.appspot.com/v2/patch-status/codereview.chromium.or...

[commit-bot: I haz the power, 2016-10-12 13:39:59]

Description was changed from

==========
Turned on SkSL->GLSL compiler
GOLD_TRYBOT_URL= https://gold.skia.org/search?issue=2288033003

Committed:
https://skia.googlesource.com/skia/+/9b0fe3d125f237d9884732a48414fa85fc71b4e3
Committed:
https://skia.googlesource.com/skia/+/b12b3c6908c62c908b3680be01e3b5bfd30de310
Committed:
https://skia.googlesource.com/skia/+/f008b0a59f45c0d4bea3e66faf3b01805009ec89
Committed:
https://skia.googlesource.com/skia/+/08b2ccf398e2b81bc05d2c105837e5419899469b
Committed:
https://skia.googlesource.com/skia/+/dcfe6dba4a335e50e86ff68e3252065d4197432c
Committed:
https://skia.googlesource.com/skia/+/ccb1dd8f267f9d7fe7c9d0ce222ebc81b41853b3
==========

to

==========
Turned on SkSL->GLSL compiler
GOLD_TRYBOT_URL= https://gold.skia.org/search?issue=2288033003

Committed:
https://skia.googlesource.com/skia/+/9b0fe3d125f237d9884732a48414fa85fc71b4e3
Committed:
https://skia.googlesource.com/skia/+/b12b3c6908c62c908b3680be01e3b5bfd30de310
Committed:
https://skia.googlesource.com/skia/+/f008b0a59f45c0d4bea3e66faf3b01805009ec89
Committed:
https://skia.googlesource.com/skia/+/08b2ccf398e2b81bc05d2c105837e5419899469b
Committed:
https://skia.googlesource.com/skia/+/dcfe6dba4a335e50e86ff68e3252065d4197432c
Committed:
https://skia.googlesource.com/skia/+/ccb1dd8f267f9d7fe7c9d0ce222ebc81b41853b3
Committed:
https://skia.googlesource.com/skia/+/5961bc9278a00e56dacdd9408d0744b5a0a3b493
==========

[commit-bot: I haz the power, 2016-10-12 13:40:01]

Committed patchset #49 (id:1240001) as
https://skia.googlesource.com/skia/+/5961bc9278a00e56dacdd9408d0744b5a0a3b493