src/core/SkScan_AntiPath.cpp - Issue 825983005: Revert of It is dangerous to ignore SkRect::intersect's return value

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/SkScan_AntiPath.cpp

Issue 825983005: Revert of It is dangerous to ignore SkRect::intersect's return value (Closed) Base URL: https://skia.googlesource.com/skia.git@master

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

Index: src/core/SkScan_AntiPath.cpp

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

index 545a70129e1a3950b8f7eda3a51f881753e30ff3..158f34d265bc352562412014ef3abe285b313c0c 100644

--- a/src/core/SkScan_AntiPath.cpp

+++ b/src/core/SkScan_AntiPath.cpp

@@ -454,10 +454,7 @@

fMask.fFormat = SkMask::kA8_Format;

fClipRect = ir;

- if (!fClipRect.intersect(clip.getBounds())) {

- SkASSERT(0);

- fClipRect.setEmpty();

- }

+ fClipRect.intersect(clip.getBounds());

// For valgrind, write 1 extra byte at the end so we don't read

// uninitialized memory. See comment in add_aa_span and fStorage[].

« no previous file with comments | « include/core/SkRect.h ('k') | src/effects/SkBlurMaskFilter.cpp » ('j') | no next file with comments »