commit 04ff61faae9bd55ef77cc1e2fae7890c67773631
author Ethan Nicholas <ethannicholas@google.com> Wed May 27 19:01:44 2020 +0000
committer Skia Commit-Bot <skia-commit-bot@chromium.org> Wed May 27 19:57:58 2020 +0000
tree 575e951af5b408db9158f56f5e686f6c51e1aa38
parent 7135239769de6971f8ad8ca11af3cb5c2c02d486

Reland "Revert "SkSL function inlining""

This reverts commit 2dd272bf157de3d3edeff0fbc1a5bcc17eec3164.

Reason for revert: breaking angle

Original change's description:
> Revert "Revert "SkSL function inlining""
> 
> This reverts commit 1b63b4ac6933ccddb15bcf650cd5747d5eba44d0.
> 
> Change-Id: I8120bb10cecc6889f4f4fd7b4c3a61d250e49219
> Reviewed-on: https://skia-review.googlesource.com/c/skia/+/291358
> Reviewed-by: Brian Osman <brianosman@google.com>
> Commit-Queue: Ethan Nicholas <ethannicholas@google.com>

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

# Not skipping CQ checks because this is a reland.

Change-Id: Ib3117efd1b77e97899e636bcbc4d84200118bc36
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/292264
Reviewed-by: Ethan Nicholas <ethannicholas@google.com>
Commit-Queue: Ethan Nicholas <ethannicholas@google.com>

src/sksl/SkSLMetalCodeGenerator.cpp

diff --git a/src/sksl/SkSLMetalCodeGenerator.cpp b/src/sksl/SkSLMetalCodeGenerator.cpp
index 2b222d8..099ab4c 100644
--- a/src/sksl/SkSLMetalCodeGenerator.cpp
+++ b/src/sksl/SkSLMetalCodeGenerator.cpp
@@ -1164,15 +1164,11 @@
 }
 
 void MetalCodeGenerator::writeBlock(const Block& b) {
-    if (b.fIsScope) {
-        this->writeLine("{");
-        fIndentation++;
-    }
+    this->writeLine("{");
+    fIndentation++;
     this->writeStatements(b.fStatements);
-    if (b.fIsScope) {
-        fIndentation--;
-        this->write("}");
-    }
+    fIndentation--;
+    this->write("}");
 }
 
 void MetalCodeGenerator::writeIfStatement(const IfStatement& stmt) {