commit 9f666a14a9112c3cdec4d2a3332390cae20197df
author herb <herb@google.com> Mon Apr 25 09:05:14 2016 -0700
committer Commit bot <commit-bot@chromium.org> Mon Apr 25 09:05:14 2016 -0700
tree ab147105905a03682fdb2a611a86b6d14e6404e0
parent 27c565adbed6364550f77dea52af71f09b8d7e7c

Whitespace change.

BUG=skia:
GOLD_TRYBOT_URL= https://gold.skia.org/search2?unt=true&query=source_type%3Dgm&master=false&issue=1915073002

Review URL: https://codereview.chromium.org/1915073002

src/core/SkBitmapProcShader.cpp

diff --git a/src/core/SkBitmapProcShader.cpp b/src/core/SkBitmapProcShader.cpp
index 5e66bf1..3727bbc 100644
--- a/src/core/SkBitmapProcShader.cpp
+++ b/src/core/SkBitmapProcShader.cpp
@@ -180,8 +180,8 @@
             fMatrixTypeMask,
             fXMode, fYMode,
             fFilterQuality, fSrcPixmap,
-            fAlpha, mode, dstInfo)) {
-
+            fAlpha, mode, dstInfo))
+        {
             state->fStorage[0] = fBlitterPipeline;
             state->fBlitBW = &LinearPipelineContext::ForwardToPipeline;
 
@@ -232,17 +232,6 @@
         return false;
     }
 
-#if 0   // later we may opt-in to the new code even if the client hasn't requested it...
-    // These src attributes are only supported in the new 4f context
-    //
-    if (srcInfo.isSRGB() ||
-        kUnpremul_SkAlphaType == srcInfo.alphaType() ||
-        (4 == srcInfo.bytesPerPixel() && kN32_SkColorType != srcInfo.colorType()))
-    {
-        return true;
-    }
-#endif
-
     // If we get here, we can reasonably use either context, respect the caller's preference
     //
     return SkShader::ContextRec::kPM4f_DstType == rec.fPreferredDstType;
@@ -267,11 +256,6 @@
     // Decide if we can/want to use the new linear pipeline
     bool useLinearPipeline = choose_linear_pipeline(rec, provider.info());
 
-    //
-    // For now, only enable locally since we are hitting some crashers on the test bots
-    //
-    //useLinearPipeline = false;
-
     if (useLinearPipeline) {
         void* infoStorage = (char*)storage + sizeof(LinearPipelineContext);
         SkBitmapProcInfo* info = new (infoStorage) SkBitmapProcInfo(provider, tmx, tmy);