third_party/WebKit/Source/modules/canvas2d/CanvasRenderingContext2D.cpp - Issue 1583103007: Use an up-to-date canvas size when building canvas filters

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 1583103007: Use an up-to-date canvas size when building canvas filters (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Remove unused function Created 4 years, 11 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/layout/svg/ReferenceFilterBuilder.cpp ('K') | « third_party/WebKit/Source/core/paint/FilterEffectBuilder.cpp ('k') | third_party/WebKit/Source/modules/canvas2d/CanvasRenderingContext2DState.h » ('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 8cf6c194b1d8705f3a361699351866cedf243c06..c2b01b6ffa46942b5425a244b164e8e34c580923 100644

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

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

@@ -828,7 +828,7 @@ static bool isFullCanvasCompositeMode(SkXfermode::Mode op)

template<typename DrawFunc>

void CanvasRenderingContext2D::compositedDraw(const DrawFunc& drawFunc, SkCanvas* c, CanvasRenderingContext2DState::PaintType paintType, CanvasRenderingContext2DState::ImageType imageType)

{

- SkImageFilter* filter = state().getFilter(canvas(), accessFont());

+ SkImageFilter* filter = state().getFilter(canvas(), accessFont(), canvas()->size());

ASSERT(isFullCanvasCompositeMode(state().globalComposite()) || filter);

SkMatrix ctm = c->getTotalMatrix();

c->resetMatrix();