src/views/SkTextBox.cpp - Issue 577243002: update to accommodate latest clang in chrome toolchain

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/views/SkTextBox.cpp

Issue 577243002: update to accommodate latest clang in chrome toolchain (Closed) Base URL: https://skia.googlesource.com/skia.git@master

Patch Set: Created 6 years, 3 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/views/SkTextBox.cpp

diff --git a/src/views/SkTextBox.cpp b/src/views/SkTextBox.cpp

index b0a42cd714c7e6b506dec1bb292962e63b2354e3..55d75a64dac74e1f3e3f5aa5005ef9ab69be31ec 100644

--- a/src/views/SkTextBox.cpp

+++ b/src/views/SkTextBox.cpp

@@ -167,7 +167,7 @@ void SkTextBox::setSpacing(SkScalar mul, SkScalar add)

void SkTextBox::draw(SkCanvas* canvas, const char text[], size_t len, const SkPaint& paint)

{

- SkASSERT(canvas && &paint && (text || len == 0));

+ SkASSERT(canvas && (text || len == 0));

SkScalar marginWidth = fBox.width();

« no previous file with comments | « src/ports/SkFontHost_FreeType.cpp ('k') | src/views/SkViewPriv.cpp » ('j') | no next file with comments »