commit 140f3da2b320f93300dd937ae34c7a5eee882581
author Brian Salomon <bsalomon@google.com> Thu Aug 23 13:51:27 2018 +0000
committer Skia Commit-Bot <skia-commit-bot@chromium.org> Thu Aug 23 13:51:32 2018 +0000
tree 89f0a9d269b838199e754562c7c8aa2f0fb08a20
parent e82ef487832f29b644cf37db18704162a1bae153

Revert "Fix leak in SkSLParser"

This reverts commit e82ef487832f29b644cf37db18704162a1bae153.

Reason for revert: Chrome balks at static ~
https://logs.chromium.org/logs/chromium/buildbucket/cr-buildbucket.appspot.com/8937396289549666272/+/steps/compile__with_patch_/0/stdout

Original change's description:
> Fix leak in SkSLParser
> 
> Change-Id: Id608361eadf63a02a9bde428215284201e80d4ee
> Reviewed-on: https://skia-review.googlesource.com/148901
> Reviewed-by: Ethan Nicholas <ethannicholas@google.com>
> Commit-Queue: Brian Salomon <bsalomon@google.com>

TBR=bsalomon@google.com,ethannicholas@google.com

Change-Id: Ic119f85584eeae961fc920cb361baa2bbf6ab231
No-Presubmit: true
No-Tree-Checks: true
No-Try: true
Reviewed-on: https://skia-review.googlesource.com/148921
Reviewed-by: Brian Salomon <bsalomon@google.com>
Commit-Queue: Brian Salomon <bsalomon@google.com>

src/sksl/SkSLParser.cpp

diff --git a/src/sksl/SkSLParser.cpp b/src/sksl/SkSLParser.cpp
index 8b81bd8..86c0985 100644
--- a/src/sksl/SkSLParser.cpp
+++ b/src/sksl/SkSLParser.cpp
@@ -77,10 +77,10 @@
     Parser* fParser;
 };
 
-std::unique_ptr<std::unordered_map<String, Parser::LayoutToken>> Parser::layoutTokens;
+std::unordered_map<String, Parser::LayoutToken>* Parser::layoutTokens;
 
 void Parser::InitLayoutMap() {
-    layoutTokens.reset(new std::unordered_map<String, LayoutToken>);
+    layoutTokens = new std::unordered_map<String, LayoutToken>;
     #define TOKEN(name, text) (*layoutTokens)[text] = LayoutToken::name;
     TOKEN(LOCATION,                     "location");
     TOKEN(OFFSET,                       "offset");