commit d6ab77a2e20ff54644ffc247da4dd2ea755c1111
author Mike Klein <mtklein@google.com> Thu Mar 21 08:18:24 2019 -0500
committer Skia Commit-Bot <skia-commit-bot@chromium.org> Thu Mar 21 15:52:32 2019 +0000
tree e9c82f10a447a4eed75616c9e9c897c7d473909a
parent a02dd32dee27ae051ea1981d3321090bd8120320

restore .clang-format

Cq-Include-Trybots: skia.primary:Housekeeper-PerCommit-CheckGeneratedFiles
Change-Id: I93f928c35b2369c9e496d4e887e8500970bea2ec
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/202359
Reviewed-by: Brian Salomon <bsalomon@google.com>
Commit-Queue: Mike Klein <mtklein@google.com>

src/gpu/effects/GrMixerEffect.h

diff --git a/src/gpu/effects/GrMixerEffect.h b/src/gpu/effects/GrMixerEffect.h
index 6c8ff12..16ce6fc 100644
--- a/src/gpu/effects/GrMixerEffect.h
+++ b/src/gpu/effects/GrMixerEffect.h
@@ -45,28 +45,28 @@
                    c1 = (this->numChildProcessors() > 1)
                                 ? ConstantOutputForConstantInput(this->childProcessor(1), input)
                                 : input;
-        return {c0.fR + (c1.fR - c0.fR) * fWeight,
-                c0.fG + (c1.fG - c0.fG) * fWeight,
-                c0.fB + (c1.fB - c0.fB) * fWeight,
-                c0.fA + (c1.fA - c0.fA) * fWeight};
+        return {c0.fR + (c1.fR - c0.fR) * fWeight, c0.fG + (c1.fG - c0.fG) * fWeight,
+                c0.fB + (c1.fB - c0.fB) * fWeight, c0.fA + (c1.fA - c0.fA) * fWeight};
     }
-    int                                         fp0_index() const { return fFp0_index; }
-    int                                         fp1_index() const { return fFp1_index; }
-    float                                       weight() const { return fWeight; }
+    int fp0_index() const { return fFp0_index; }
+    int fp1_index() const { return fFp1_index; }
+    float weight() const { return fWeight; }
     static std::unique_ptr<GrFragmentProcessor> Make(std::unique_ptr<GrFragmentProcessor> fp0,
-                                                     std::unique_ptr<GrFragmentProcessor> fp1,
-                                                     float                                weight) {
+                                                     std::unique_ptr<GrFragmentProcessor>
+                                                             fp1,
+                                                     float weight) {
         return std::unique_ptr<GrFragmentProcessor>(
                 new GrMixerEffect(std::move(fp0), std::move(fp1), weight));
     }
     GrMixerEffect(const GrMixerEffect& src);
     std::unique_ptr<GrFragmentProcessor> clone() const override;
-    const char*                          name() const override { return "MixerEffect"; }
+    const char* name() const override { return "MixerEffect"; }
 
 private:
     GrMixerEffect(std::unique_ptr<GrFragmentProcessor> fp0,
-                  std::unique_ptr<GrFragmentProcessor> fp1,
-                  float                                weight)
+                  std::unique_ptr<GrFragmentProcessor>
+                          fp1,
+                  float weight)
             : INHERITED(kGrMixerEffect_ClassID, (OptimizationFlags)OptFlags(fp0, fp1))
             , fWeight(weight) {
         SkASSERT(fp0);
@@ -81,9 +81,9 @@
     void onGetGLSLProcessorKey(const GrShaderCaps&, GrProcessorKeyBuilder*) const override;
     bool onIsEqual(const GrFragmentProcessor&) const override;
     GR_DECLARE_FRAGMENT_PROCESSOR_TEST
-    int                         fFp0_index = -1;
-    int                         fFp1_index = -1;
-    float                       fWeight;
+    int fFp0_index = -1;
+    int fFp1_index = -1;
+    float fWeight;
     typedef GrFragmentProcessor INHERITED;
 };
 #endif