commit f3333c89bf05fc602d9bf8e1e24547668c660383
author Ethan Nicholas <ethannicholas@google.com> Fri Mar 31 09:33:41 2017 -0400
committer Skia Commit-Bot <skia-commit-bot@chromium.org> Fri Mar 31 15:25:32 2017 +0000
tree 3c0855ef8829201299ce757ecaf28bfda50a2683
parent 66b09abdb184d843ece45a1d343fbe632075b323

skslc can now be compiled with no Skia dependencies, in preparation for its eventual
role in Skia's build process.

This reverts commit bcf35f86d50b784b165de703b404998dd4299f6a.

BUG=skia:

Change-Id: Id0a12dfc4d804d69a3c6bf60fed37e89ee130f02
Reviewed-on: https://skia-review.googlesource.com/10802
Commit-Queue: Ethan Nicholas <ethannicholas@google.com>
Reviewed-by: Ben Wagner <benjaminwagner@google.com>

bench/GLBench.cpp

diff --git a/bench/GLBench.cpp b/bench/GLBench.cpp
index 0fcd56f..f043c95 100644
--- a/bench/GLBench.cpp
+++ b/bench/GLBench.cpp
@@ -67,7 +67,7 @@
 
 GrGLuint GLBench::CompileShader(const GrGLContext* context, const char* sksl, GrGLenum type) {
     const GrGLInterface* gl = context->interface();
-    SkString glsl;
+    SkSL::String glsl;
     SkSL::Program::Settings settings;
     settings.fCaps = context->caps()->shaderCaps();
     std::unique_ptr<SkSL::Program> program = context->compiler()->convertProgram(