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

diff --git a/src/gpu/effects/GrConfigConversionEffect.cpp b/src/gpu/effects/GrConfigConversionEffect.cpp
index b94a7b1..158ff90 100644
--- a/src/gpu/effects/GrConfigConversionEffect.cpp
+++ b/src/gpu/effects/GrConfigConversionEffect.cpp
@@ -19,8 +19,8 @@
 public:
     GrGLSLConfigConversionEffect() {}
     void emitCode(EmitArgs& args) override {
-        GrGLSLFPFragmentBuilder*        fragBuilder = args.fFragBuilder;
-        const GrConfigConversionEffect& _outer      = args.fFp.cast<GrConfigConversionEffect>();
+        GrGLSLFPFragmentBuilder* fragBuilder = args.fFragBuilder;
+        const GrConfigConversionEffect& _outer = args.fFp.cast<GrConfigConversionEffect>();
         (void)_outer;
         auto pmConversion = _outer.pmConversion();
         (void)pmConversion;
@@ -31,34 +31,26 @@
                 "%s.xyz = floor((%s.xyz * %s.w) * 255.0 + 0.5) / 255.0;\n        break;\n    case "
                 "1:\n        %s.xyz = %s.w <= 0.0 ? half3(0.0) : floor((%s.xyz / %s.w) * 255.0 + "
                 "0.5) / 255.0;\n        break;\n}\n",
-                args.fOutputColor,
-                args.fInputColor,
-                (int)_outer.pmConversion(),
-                args.fOutputColor,
-                args.fOutputColor,
-                args.fOutputColor,
-                args.fOutputColor,
-                args.fOutputColor,
-                args.fOutputColor,
-                args.fOutputColor);
+                args.fOutputColor, args.fInputColor, (int)_outer.pmConversion(), args.fOutputColor,
+                args.fOutputColor, args.fOutputColor, args.fOutputColor, args.fOutputColor,
+                args.fOutputColor, args.fOutputColor);
     }
 
 private:
     void onSetData(const GrGLSLProgramDataManager& pdman,
-                   const GrFragmentProcessor&      _proc) override {}
+                   const GrFragmentProcessor& _proc) override {}
 };
 GrGLSLFragmentProcessor* GrConfigConversionEffect::onCreateGLSLInstance() const {
     return new GrGLSLConfigConversionEffect();
 }
-void GrConfigConversionEffect::onGetGLSLProcessorKey(const GrShaderCaps&    caps,
+void GrConfigConversionEffect::onGetGLSLProcessorKey(const GrShaderCaps& caps,
                                                      GrProcessorKeyBuilder* b) const {
     b->add32((int32_t)fPmConversion);
 }
 bool GrConfigConversionEffect::onIsEqual(const GrFragmentProcessor& other) const {
     const GrConfigConversionEffect& that = other.cast<GrConfigConversionEffect>();
     (void)that;
-    if (fPmConversion != that.fPmConversion)
-        return false;
+    if (fPmConversion != that.fPmConversion) return false;
     return true;
 }
 GrConfigConversionEffect::GrConfigConversionEffect(const GrConfigConversionEffect& src)