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.cpp

diff --git a/src/gpu/effects/GrMixerEffect.cpp b/src/gpu/effects/GrMixerEffect.cpp
index 084cb3f..fb0e50e 100644
--- a/src/gpu/effects/GrMixerEffect.cpp
+++ b/src/gpu/effects/GrMixerEffect.cpp
@@ -20,7 +20,7 @@
     GrGLSLMixerEffect() {}
     void emitCode(EmitArgs& args) override {
         GrGLSLFPFragmentBuilder* fragBuilder = args.fFragBuilder;
-        const GrMixerEffect&     _outer      = args.fFp.cast<GrMixerEffect>();
+        const GrMixerEffect& _outer = args.fFp.cast<GrMixerEffect>();
         (void)_outer;
         auto weight = _outer.weight();
         (void)weight;
@@ -38,16 +38,14 @@
             fragBuilder->codeAppendf("half4 %s;", _child1.c_str());
         }
         fragBuilder->codeAppendf("\nhalf4 in1 = %s ? %s : %s;\n%s = mix(in0, in1, %s);\n",
-                                 _outer.fp1_index() >= 0 ? "true" : "false",
-                                 _child1.c_str(),
-                                 args.fInputColor,
-                                 args.fOutputColor,
+                                 _outer.fp1_index() >= 0 ? "true" : "false", _child1.c_str(),
+                                 args.fInputColor, args.fOutputColor,
                                  args.fUniformHandler->getUniformCStr(fWeightVar));
     }
 
 private:
     void onSetData(const GrGLSLProgramDataManager& pdman,
-                   const GrFragmentProcessor&      _proc) override {
+                   const GrFragmentProcessor& _proc) override {
         const GrMixerEffect& _outer = _proc.cast<GrMixerEffect>();
         { pdman.set1f(fWeightVar, (_outer.weight())); }
     }
@@ -56,13 +54,12 @@
 GrGLSLFragmentProcessor* GrMixerEffect::onCreateGLSLInstance() const {
     return new GrGLSLMixerEffect();
 }
-void GrMixerEffect::onGetGLSLProcessorKey(const GrShaderCaps&    caps,
+void GrMixerEffect::onGetGLSLProcessorKey(const GrShaderCaps& caps,
                                           GrProcessorKeyBuilder* b) const {}
 bool GrMixerEffect::onIsEqual(const GrFragmentProcessor& other) const {
     const GrMixerEffect& that = other.cast<GrMixerEffect>();
     (void)that;
-    if (fWeight != that.fWeight)
-        return false;
+    if (fWeight != that.fWeight) return false;
     return true;
 }
 GrMixerEffect::GrMixerEffect(const GrMixerEffect& src)