commit 0df1b04db87c3d86ee0b0bd6aa2cb5b6be32cac2
author Ethan Nicholas <ethannicholas@google.com> Fri Mar 31 13:56:23 2017 -0400
committer Skia Commit-Bot <skia-commit-bot@chromium.org> Fri Mar 31 18:49:51 2017 +0000
tree 12e72247e1d2f4a66d2045cc6a6a62a3505d82ab
parent f809fef8280e3d6ad9d95697cd234560b49962ab

skslc can now be compiled with no Skia dependencies, in preparation for its eventual

This reverts commit 9bd301d640ff63c280b202c7dd00bc00a3315ff4.

Bug: skia:
Change-Id: I5ad3f77ef33aa5ce2fd27fe383c9339c571663a1
Reviewed-on: https://skia-review.googlesource.com/10964
Reviewed-by: Ethan Nicholas <ethannicholas@google.com>
Commit-Queue: Ethan Nicholas <ethannicholas@google.com>

tests/SkSLErrorTest.cpp

diff --git a/tests/SkSLErrorTest.cpp b/tests/SkSLErrorTest.cpp
index bde5e70..bd0c64a 100644
--- a/tests/SkSLErrorTest.cpp
+++ b/tests/SkSLErrorTest.cpp
@@ -13,17 +13,16 @@
 
 static void test_failure(skiatest::Reporter* r, const char* src, const char* error) {
     SkSL::Compiler compiler;
-    SkDynamicMemoryWStream out;
     SkSL::Program::Settings settings;
     sk_sp<GrShaderCaps> caps = SkSL::ShaderCapsFactory::Default();
     settings.fCaps = caps.get();
     std::unique_ptr<SkSL::Program> program = compiler.convertProgram(SkSL::Program::kFragment_Kind,
                                                                      SkString(src), settings);
     if (program) {
-        SkString ignored;
+        SkSL::String ignored;
         compiler.toSPIRV(*program, &ignored);
     }
-    SkString skError(error);
+    SkSL::String skError(error);
     if (compiler.errorText() != skError) {
         SkDebugf("SKSL ERROR:\n    source: %s\n    expected: %s    received: %s", src, error,
                  compiler.errorText().c_str());
@@ -33,14 +32,13 @@
 
 static void test_success(skiatest::Reporter* r, const char* src) {
     SkSL::Compiler compiler;
-    SkDynamicMemoryWStream out;
     SkSL::Program::Settings settings;
     sk_sp<GrShaderCaps> caps = SkSL::ShaderCapsFactory::Default();
     settings.fCaps = caps.get();
     std::unique_ptr<SkSL::Program> program = compiler.convertProgram(SkSL::Program::kFragment_Kind,
                                                                      SkString(src), settings);
     REPORTER_ASSERT(r, program);
-    SkString ignored;
+    SkSL::String ignored;
     REPORTER_ASSERT(r, compiler.toSPIRV(*program, &ignored));
 }