Switch SkSL to std::string

On desktop, this saves just over 5% of the time in the SkSL compiler.

As written, the code will now build either way, so it's much easier to
switch back (or even have some platforms use SkString, if that's ever
required).

Bug: skia:
Change-Id: I634f26a4f6fcb404e59bda6a5c6a21a9c6d73c0b
Reviewed-on: https://skia-review.googlesource.com/34381
Reviewed-by: Brian Osman <brianosman@google.com>
Commit-Queue: Brian Osman <brianosman@google.com>

1 files changed, 24 insertions, 24 deletions

diff --git a/tests/SkSLMemoryLayoutTest.cpp b/tests/SkSLMemoryLayoutTest.cpp
index 0a5d382e8a..80188e61c7 100644
--- a/tests/SkSLMemoryLayoutTest.cpp
+++ b/tests/SkSLMemoryLayoutTest.cpp
@@ -54,40 +54,40 @@ DEF_TEST(SkSLMemoryLayout140Test, r) {
 
     // struct 1
     std::vector<SkSL::Type::Field> fields1;
-    fields1.emplace_back(SkSL::Modifiers(), SkString("a"), context.fFloat3_Type.get());
-    SkSL::Type s1(SkSL::Position(), SkString("s1"), fields1);
+    fields1.emplace_back(SkSL::Modifiers(), SkSL::String("a"), context.fFloat3_Type.get());
+    SkSL::Type s1(SkSL::Position(), SkSL::String("s1"), fields1);
     REPORTER_ASSERT(r, 16 == layout.size(s1));
     REPORTER_ASSERT(r, 16 == layout.alignment(s1));
 
-    fields1.emplace_back(SkSL::Modifiers(), SkString("b"), context.fFloat_Type.get());
-    SkSL::Type s2(SkSL::Position(), SkString("s2"), fields1);
+    fields1.emplace_back(SkSL::Modifiers(), SkSL::String("b"), context.fFloat_Type.get());
+    SkSL::Type s2(SkSL::Position(), SkSL::String("s2"), fields1);
     REPORTER_ASSERT(r, 16 == layout.size(s2));
     REPORTER_ASSERT(r, 16 == layout.alignment(s2));
 
-    fields1.emplace_back(SkSL::Modifiers(), SkString("c"), context.fBool_Type.get());
-    SkSL::Type s3(SkSL::Position(), SkString("s3"), fields1);
+    fields1.emplace_back(SkSL::Modifiers(), SkSL::String("c"), context.fBool_Type.get());
+    SkSL::Type s3(SkSL::Position(), SkSL::String("s3"), fields1);
     REPORTER_ASSERT(r, 32 == layout.size(s3));
     REPORTER_ASSERT(r, 16 == layout.alignment(s3));
 
     // struct 2
     std::vector<SkSL::Type::Field> fields2;
-    fields2.emplace_back(SkSL::Modifiers(), SkString("a"), context.fInt_Type.get());
-    SkSL::Type s4(SkSL::Position(), SkString("s4"), fields2);
+    fields2.emplace_back(SkSL::Modifiers(), SkSL::String("a"), context.fInt_Type.get());
+    SkSL::Type s4(SkSL::Position(), SkSL::String("s4"), fields2);
     REPORTER_ASSERT(r, 16 == layout.size(s4));
     REPORTER_ASSERT(r, 16 == layout.alignment(s4));
 
-    fields2.emplace_back(SkSL::Modifiers(), SkString("b"), context.fFloat3_Type.get());
-    SkSL::Type s5(SkSL::Position(), SkString("s5"), fields2);
+    fields2.emplace_back(SkSL::Modifiers(), SkSL::String("b"), context.fFloat3_Type.get());
+    SkSL::Type s5(SkSL::Position(), SkSL::String("s5"), fields2);
     REPORTER_ASSERT(r, 32 == layout.size(s5));
     REPORTER_ASSERT(r, 16 == layout.alignment(s5));
 
     // arrays
-    SkSL::Type array1(SkString("float[4]"), SkSL::Type::kArray_Kind, *context.fFloat_Type, 4);
+    SkSL::Type array1(SkSL::String("float[4]"), SkSL::Type::kArray_Kind, *context.fFloat_Type, 4);
     REPORTER_ASSERT(r, 64 == layout.size(array1));
     REPORTER_ASSERT(r, 16 == layout.alignment(array1));
     REPORTER_ASSERT(r, 16 == layout.stride(array1));
 
-    SkSL::Type array2(SkString("float4[4]"), SkSL::Type::kArray_Kind, *context.fFloat4_Type, 4);
+    SkSL::Type array2(SkSL::String("float4[4]"), SkSL::Type::kArray_Kind, *context.fFloat4_Type, 4);
     REPORTER_ASSERT(r, 64 == layout.size(array2));
     REPORTER_ASSERT(r, 16 == layout.alignment(array2));
     REPORTER_ASSERT(r, 16 == layout.stride(array2));
@@ -135,40 +135,40 @@ DEF_TEST(SkSLMemoryLayout430Test, r) {
 
     // struct 1
     std::vector<SkSL::Type::Field> fields1;
-    fields1.emplace_back(SkSL::Modifiers(), SkString("a"), context.fFloat3_Type.get());
-    SkSL::Type s1(SkSL::Position(), SkString("s1"), fields1);
+    fields1.emplace_back(SkSL::Modifiers(), SkSL::String("a"), context.fFloat3_Type.get());
+    SkSL::Type s1(SkSL::Position(), SkSL::String("s1"), fields1);
     REPORTER_ASSERT(r, 16 == layout.size(s1));
     REPORTER_ASSERT(r, 16 == layout.alignment(s1));
 
-    fields1.emplace_back(SkSL::Modifiers(), SkString("b"), context.fFloat_Type.get());
-    SkSL::Type s2(SkSL::Position(), SkString("s2"), fields1);
+    fields1.emplace_back(SkSL::Modifiers(), SkSL::String("b"), context.fFloat_Type.get());
+    SkSL::Type s2(SkSL::Position(), SkSL::String("s2"), fields1);
     REPORTER_ASSERT(r, 16 == layout.size(s2));
     REPORTER_ASSERT(r, 16 == layout.alignment(s2));
 
-    fields1.emplace_back(SkSL::Modifiers(), SkString("c"), context.fBool_Type.get());
-    SkSL::Type s3(SkSL::Position(), SkString("s3"), fields1);
+    fields1.emplace_back(SkSL::Modifiers(), SkSL::String("c"), context.fBool_Type.get());
+    SkSL::Type s3(SkSL::Position(), SkSL::String("s3"), fields1);
     REPORTER_ASSERT(r, 32 == layout.size(s3));
     REPORTER_ASSERT(r, 16 == layout.alignment(s3));
 
     // struct 2
     std::vector<SkSL::Type::Field> fields2;
-    fields2.emplace_back(SkSL::Modifiers(), SkString("a"), context.fInt_Type.get());
-    SkSL::Type s4(SkSL::Position(), SkString("s4"), fields2);
+    fields2.emplace_back(SkSL::Modifiers(), SkSL::String("a"), context.fInt_Type.get());
+    SkSL::Type s4(SkSL::Position(), SkSL::String("s4"), fields2);
     REPORTER_ASSERT(r, 4 == layout.size(s4));
     REPORTER_ASSERT(r, 4 == layout.alignment(s4));
 
-    fields2.emplace_back(SkSL::Modifiers(), SkString("b"), context.fFloat3_Type.get());
-    SkSL::Type s5(SkSL::Position(), SkString("s5"), fields2);
+    fields2.emplace_back(SkSL::Modifiers(), SkSL::String("b"), context.fFloat3_Type.get());
+    SkSL::Type s5(SkSL::Position(), SkSL::String("s5"), fields2);
     REPORTER_ASSERT(r, 32 == layout.size(s5));
     REPORTER_ASSERT(r, 16 == layout.alignment(s5));
 
     // arrays
-    SkSL::Type array1(SkString("float[4]"), SkSL::Type::kArray_Kind, *context.fFloat_Type, 4);
+    SkSL::Type array1(SkSL::String("float[4]"), SkSL::Type::kArray_Kind, *context.fFloat_Type, 4);
     REPORTER_ASSERT(r, 16 == layout.size(array1));
     REPORTER_ASSERT(r, 4 == layout.alignment(array1));
     REPORTER_ASSERT(r, 4 == layout.stride(array1));
 
-    SkSL::Type array2(SkString("float4[4]"), SkSL::Type::kArray_Kind, *context.fFloat4_Type, 4);
+    SkSL::Type array2(SkSL::String("float4[4]"), SkSL::Type::kArray_Kind, *context.fFloat4_Type, 4);
     REPORTER_ASSERT(r, 64 == layout.size(array2));
     REPORTER_ASSERT(r, 16 == layout.alignment(array2));
     REPORTER_ASSERT(r, 16 == layout.stride(array2));