src/core/SkShader.cpp - Issue 291913004: formalize named picture versions

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: src/core/SkShader.cpp

Issue 291913004: formalize named picture versions (Closed) Base URL: https://skia.googlecode.com/svn/trunk

Patch Set: Created 6 years, 7 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:

Index: src/core/SkShader.cpp

diff --git a/src/core/SkShader.cpp b/src/core/SkShader.cpp

index 6a418b6b4578eb6c2be004f5d809dcb984ff9b4b..3eb653f39abbc819e9725765d20605dca3749e48 100644

--- a/src/core/SkShader.cpp

+++ b/src/core/SkShader.cpp

@@ -255,7 +255,7 @@ bool SkColorShader::isOpaque() const {

SkColorShader::SkColorShader(SkReadBuffer& b) : INHERITED(b) {

// V25_COMPATIBILITY_CODE We had a boolean to make the color shader inherit the paint's

// color. We don't support that any more.

- if (b.pictureVersion() < 26 && 0 != b.pictureVersion()) {

+ if (b.pictureVersionLT(SkReadBuffer::kColorShaderNoBool_PictureVersion)) {

if (b.readBool()) {

SkDEBUGFAIL("We shouldn't have pictures that recorded the inherited case.");

fColor = SK_ColorWHITE;