commit b9f6afb7832685afbe488673965013f1fec1b29a
author Ethan Nicholas <ethannicholas@google.com> Thu Jul 27 16:02:37 2017 -0400
committer Skia Commit-Bot <skia-commit-bot@chromium.org> Thu Jul 27 20:28:50 2017 +0000
tree fdba9b5ec2e292af37812654c0c7c8b2286b07d3
parent f8480b90551d29484d51e74f6a43c9ab95b5d95c

switched to infra version of clang-format for skslc

Change-Id: I3e993e271cb5e26816d37c70d9ad62acce3ed84c
Reviewed-on: https://skia-review.googlesource.com/27800
Reviewed-by: Mike Klein <mtklein@google.com>
Commit-Queue: Ethan Nicholas <ethannicholas@google.com>

BUILD.gn

diff --git a/BUILD.gn b/BUILD.gn
index 5b7b787..b772056 100644
--- a/BUILD.gn
+++ b/BUILD.gn
@@ -454,7 +454,10 @@
     if (host_os == "win") {
       skslc_path += ".exe"
     }
-    args = [ rebase_path(skslc_path) ]
+    args = [
+      rebase_path(skslc_path),
+      rebase_path("infra/bots/.recipe_deps/depot_tools/clang-format"),
+    ]
     args += rebase_path(skia_gpu_processor_sources)
   }
 } else {

gn/compile_processors.py

diff --git a/gn/compile_processors.py b/gn/compile_processors.py
index 9fc5c3d..20b8d7d 100755
--- a/gn/compile_processors.py
+++ b/gn/compile_processors.py
@@ -10,16 +10,17 @@
 import sys
 
 skslc = sys.argv[1]
-processors = sys.argv[2:]
+clangFormat = sys.argv[2]
+processors = sys.argv[3:]
 for p in processors:
     path, _ = os.path.splitext(p)
     print("Recompiling " + p + "...")
     try:
         subprocess.check_output([skslc, p, path + ".h"])
-        subprocess.check_call("clang-format --sort-includes=false -i \"" +
+        subprocess.check_call(clangFormat + " --sort-includes=false -i \"" +
                               path + ".h\"", shell=True)
         subprocess.check_output([skslc, p, path + ".cpp"])
-        subprocess.check_call("clang-format --sort-includes=false -i \"" +
+        subprocess.check_call(clangFormat + " --sort-includes=false -i \"" +
                               path + ".cpp\"", shell=True)
     except subprocess.CalledProcessError as err:
         print("### Error compiling " + p + ":")

src/gpu/effects/GrSimpleTextureEffect.cpp

diff --git a/src/gpu/effects/GrSimpleTextureEffect.cpp b/src/gpu/effects/GrSimpleTextureEffect.cpp
index a7ef780..cab078b 100644
--- a/src/gpu/effects/GrSimpleTextureEffect.cpp
+++ b/src/gpu/effects/GrSimpleTextureEffect.cpp
@@ -82,9 +82,9 @@
             kTileModes[testData->fRandom->nextULessThan(SK_ARRAY_COUNT(kTileModes))],
             kTileModes[testData->fRandom->nextULessThan(SK_ARRAY_COUNT(kTileModes))],
     };
-    GrSamplerParams params(tileModes,
-                           testData->fRandom->nextBool() ? GrSamplerParams::kBilerp_FilterMode
-                                                         : GrSamplerParams::kNone_FilterMode);
+    GrSamplerParams params(tileModes, testData->fRandom->nextBool()
+                                              ? GrSamplerParams::kBilerp_FilterMode
+                                              : GrSamplerParams::kNone_FilterMode);
 
     const SkMatrix& matrix = GrTest::TestMatrix(testData->fRandom);
     sk_sp<GrColorSpaceXform> colorSpaceXform = GrTest::TestColorXform(testData->fRandom);