third_party/WebKit/Source/modules/csspaint/PaintRenderingContext2D.cpp - Issue 2391373002: Refactor CRC2D::reset() to avoid non-additive SkCanvas state operations

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: third_party/WebKit/Source/modules/csspaint/PaintRenderingContext2D.cpp

Issue 2391373002: Refactor CRC2D::reset() to avoid non-additive SkCanvas state operations (Closed)

Patch Set: unit test fix Created 4 years, 2 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

« third_party/WebKit/Source/modules/canvas2d/CanvasRenderingContext2D.cpp ('K') | « third_party/WebKit/Source/modules/canvas2d/CanvasRenderingContext2D.cpp ('k') | third_party/WebKit/Source/modules/offscreencanvas2d/OffscreenCanvasRenderingContext2D.cpp » ('j') | third_party/WebKit/Source/modules/offscreencanvas2d/OffscreenCanvasRenderingContext2D.cpp » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: third_party/WebKit/Source/modules/csspaint/PaintRenderingContext2D.cpp

diff --git a/third_party/WebKit/Source/modules/csspaint/PaintRenderingContext2D.cpp b/third_party/WebKit/Source/modules/csspaint/PaintRenderingContext2D.cpp

index 15e5a6aa9311f1f065211ab1a6e65d5168f57378..808ce86ba67fe70d88bbe3a8fef9273751fb4f57 100644

--- a/third_party/WebKit/Source/modules/csspaint/PaintRenderingContext2D.cpp

+++ b/third_party/WebKit/Source/modules/csspaint/PaintRenderingContext2D.cpp

@@ -68,10 +68,9 @@ void PaintRenderingContext2D::didDraw(const SkIRect& dirtyRect) {

void PaintRenderingContext2D::validateStateStack() const {

#if ENABLE(ASSERT)

Justin Novosad 2016/10/06 19:48:54 DCHECK_IS_ON()

f(malita) 2016/10/06 20:02:29 Done.

- SkCanvas* skCanvas = existingDrawingCanvas();

- if (skCanvas) {

- ASSERT(static_cast<size_t>(skCanvas->getSaveCount()) ==

- m_stateStack.size());

+ if (SkCanvas* skCanvas = existingDrawingCanvas()) {

+ DCHECK_EQ(static_cast<size_t>(skCanvas->getSaveCount()),

+ m_stateStack.size() + 1);

}

#endif

}