From 9f666a14a9112c3cdec4d2a3332390cae20197df Mon Sep 17 00:00:00 2001 From: herb Date: Mon, 25 Apr 2016 09:05:14 -0700 Subject: [PATCH] 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 | 20 ++------------------ 1 file changed, 2 insertions(+), 18 deletions(-) diff --git a/src/core/SkBitmapProcShader.cpp b/src/core/SkBitmapProcShader.cpp index 5e66bf1959..3727bbca86 100644 --- a/src/core/SkBitmapProcShader.cpp +++ b/src/core/SkBitmapProcShader.cpp @@ -180,8 +180,8 @@ public: fMatrixTypeMask, fXMode, fYMode, fFilterQuality, fSrcPixmap, - fAlpha, mode, dstInfo)) { - + fAlpha, mode, dstInfo)) + { state->fStorage[0] = fBlitterPipeline; state->fBlitBW = &LinearPipelineContext::ForwardToPipeline; @@ -232,17 +232,6 @@ static bool choose_linear_pipeline(const SkShader::ContextRec& rec, const SkImag 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 @@ SkShader::Context* SkBitmapProcShader::MakeContext(const SkShader& shader, // 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);