From bcf35f86d50b784b165de703b404998dd4299f6a Mon Sep 17 00:00:00 2001 From: Ethan Nicholas Date: Thu, 30 Mar 2017 18:42:48 +0000 Subject: Revert "skslc can now be compiled with no Skia dependencies, in preparation for" This reverts commit 7833466da45bfa1e078427c4a6db94d41c5c1535. Reason for revert: Vulkan assertion failure Original change's description: > skslc can now be compiled with no Skia dependencies, in preparation for > its eventual role in Skia's build process. > > Bug: skia: > Change-Id: Iaa9933f4fc4a64bec60aa897c509a3513f457a78 > Reviewed-on: https://skia-review.googlesource.com/10282 > Commit-Queue: Ethan Nicholas > Reviewed-by: Ben Wagner > TBR=egdaniel@google.com,benjaminwagner@google.com,ethannicholas@google.com,reviews@skia.org NOPRESUBMIT=true NOTREECHECKS=true NOTRY=true Change-Id: Ic64cac2395abb406116885ddd725f74a434c8c49 Reviewed-on: https://skia-review.googlesource.com/10758 Reviewed-by: Ethan Nicholas Commit-Queue: Ethan Nicholas --- src/sksl/ir/SkSLSymbolTable.h | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'src/sksl/ir/SkSLSymbolTable.h') diff --git a/src/sksl/ir/SkSLSymbolTable.h b/src/sksl/ir/SkSLSymbolTable.h index 5d3aebc266..df8dc713ae 100644 --- a/src/sksl/ir/SkSLSymbolTable.h +++ b/src/sksl/ir/SkSLSymbolTable.h @@ -4,7 +4,7 @@ * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ - + #ifndef SKSL_SYMBOLTABLE #define SKSL_SYMBOLTABLE @@ -31,11 +31,11 @@ public: : fParent(parent) , fErrorReporter(errorReporter) {} - const Symbol* operator[](const String& name); + const Symbol* operator[](const SkString& name); - void add(const String& name, std::unique_ptr symbol); + void add(const SkString& name, std::unique_ptr symbol); - void addWithoutOwnership(const String& name, const Symbol* symbol); + void addWithoutOwnership(const SkString& name, const Symbol* symbol); Symbol* takeOwnership(Symbol* s); @@ -48,7 +48,7 @@ private: std::vector> fOwnedPointers; - std::unordered_map fSymbols; + std::unordered_map fSymbols; ErrorReporter& fErrorReporter; }; -- cgit v1.2.3