third_party/WebKit/Source/modules/canvas2d/CanvasRenderingContext2D.cpp - Issue 1903613002: Skip canvas filter construction in frameless documents

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/canvas2d/CanvasRenderingContext2D.cpp

Issue 1903613002: Skip canvas filter construction in frameless documents (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Address comment Created 4 years, 8 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

« no previous file with comments | « third_party/WebKit/LayoutTests/fast/canvas/canvas-filter-frameless-document-expected.txt ('k') | third_party/WebKit/Source/modules/canvas2d/CanvasRenderingContext2DState.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: third_party/WebKit/Source/modules/canvas2d/CanvasRenderingContext2D.cpp

diff --git a/third_party/WebKit/Source/modules/canvas2d/CanvasRenderingContext2D.cpp b/third_party/WebKit/Source/modules/canvas2d/CanvasRenderingContext2D.cpp

index 7614344777eaa2b8807216639c1e271db631d3c7..b138cecd63628bd489ca7cfed0d8ba0c059cd2bc 100644

--- a/third_party/WebKit/Source/modules/canvas2d/CanvasRenderingContext2D.cpp

+++ b/third_party/WebKit/Source/modules/canvas2d/CanvasRenderingContext2D.cpp

@@ -382,6 +382,10 @@ SkImageFilter* CanvasRenderingContext2D::stateGetFilter()

void CanvasRenderingContext2D::snapshotStateForFilter()

{

+ // The style resolution required for fonts is not available in frame-less documents.

+ if (!canvas()->document().frame())

+ return;

modifiableState().setFontForFilter(accessFont());

}