third_party/WebKit/Source/core/svg/graphics/SVGImage.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/core/svg/graphics/SVGImage.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/core/paint/SVGShapePainter.cpp ('k') | third_party/WebKit/Source/core/svg/graphics/filters/SVGFEImage.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: third_party/WebKit/Source/core/svg/graphics/SVGImage.cpp

diff --git a/third_party/WebKit/Source/core/svg/graphics/SVGImage.cpp b/third_party/WebKit/Source/core/svg/graphics/SVGImage.cpp

index 2d0f17b8994daac736bb8b2f0fb375b97b684e9a..dbbea4e2558185582be737b27f3531a8bebf4bdb 100644

--- a/third_party/WebKit/Source/core/svg/graphics/SVGImage.cpp

+++ b/third_party/WebKit/Source/core/svg/graphics/SVGImage.cpp

@@ -287,6 +287,8 @@ void SVGImage::drawPatternForContainer(GraphicsContext& context, const FloatSize

drawForContainer(patternPicture.context().canvas(), paint, containerSize, zoom, tile, srcRect, url);

}

RefPtr<SkPicture> tilePicture = patternPicture.endRecording();

+ if (!tilePicture)

+ return;

SkMatrix patternTransform;

patternTransform.setTranslate(phase.x() + spacedTile.x(), phase.y() + spacedTile.y());

@@ -370,7 +372,8 @@ void SVGImage::drawInternal(SkCanvas* canvas, const SkPaint& paint, const FloatR

canvas->saveLayer(&layerRect, &paint);

}

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

- canvas->drawPicture(recording.get());

+ if (recording)

+ canvas->drawPicture(recording.get());

}

if (getImageObserver())