aboutsummaryrefslogtreecommitdiffhomepage
path: root/src/core
diff options
context:
space:
mode:
authorGravatar herb <herb@google.com>2016-04-25 09:05:14 -0700
committerGravatar Commit bot <commit-bot@chromium.org>2016-04-25 09:05:14 -0700
commit9f666a14a9112c3cdec4d2a3332390cae20197df (patch)
treeab147105905a03682fdb2a611a86b6d14e6404e0 /src/core
parent27c565adbed6364550f77dea52af71f09b8d7e7c (diff)
Whitespace change.
Diffstat (limited to 'src/core')
-rw-r--r--src/core/SkBitmapProcShader.cpp20
1 files 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);