AuroraMiddleware/skia2
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Whitespace change.

Browse Source 
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
This commit is contained in:
herb 2016-04-25 09:05:14 -07:00 committed by Commit bot
parent 27c565adbe
commit 9f666a14a9
1 changed files with 2 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/core/SkBitmapProcShader.cpp
View File

@ -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);