third_party/WebKit/Source/platform/graphics/paint/DrawingRecorder.cpp - Issue 1841833002: Deal gracefully with null {GraphicsContext,SkPictureBuilder}.endRecording() results.

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/platform/graphics/paint/DrawingRecorder.cpp

Issue 1841833002: Deal gracefully with null {GraphicsContext,SkPictureBuilder}.endRecording() results. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Don't end recording twice in DrawingRecorder. Created 4 years, 9 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/core/inspector/InspectorLayerTreeAgent.cpp ('K') | « third_party/WebKit/Source/platform/graphics/GraphicsContext.h ('k') | third_party/WebKit/Source/platform/graphics/paint/SkPictureBuilder.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: third_party/WebKit/Source/platform/graphics/paint/DrawingRecorder.cpp

diff --git a/third_party/WebKit/Source/platform/graphics/paint/DrawingRecorder.cpp b/third_party/WebKit/Source/platform/graphics/paint/DrawingRecorder.cpp

index 202a06ec3a544304f8479de75e868293d11291c7..2fc78331f63336a6961f9a5b54c09a5abe670af5 100644

--- a/third_party/WebKit/Source/platform/graphics/paint/DrawingRecorder.cpp

+++ b/third_party/WebKit/Source/platform/graphics/paint/DrawingRecorder.cpp

@@ -88,9 +88,13 @@ DrawingRecorder::~DrawingRecorder()

ASSERT(m_displayItemPosition == m_context.getPaintController().newDisplayItemList().size());

#endif

+ RefPtr<const SkPicture> recording = m_context.endRecording();

+ if (!recording)

+ return;

m_context.getPaintController().createAndAppend<DrawingDisplayItem>(m_displayItemClient

, m_displayItemType

- , m_context.endRecording()

+ , recording

, m_knownToBeOpaque

#if ENABLE(ASSERT)

, m_underInvalidationCheckingMode