Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(228)

Unified Diff: src/core/SkBitmapProcShader.cpp

Issue 1915073002: Whitespace change. (Closed) Base URL: https://skia.googlesource.com/skia.git@master
Patch Set: Created 4 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: src/core/SkBitmapProcShader.cpp
diff --git a/src/core/SkBitmapProcShader.cpp b/src/core/SkBitmapProcShader.cpp
index 5e66bf1959e0638b519ce320b1905347176fd624..3727bbca864993bb537b5f607119cb945f66c059 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);
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698