Source/WebCore/rendering/svg/RenderSVGResourceMasker.cpp - Issue 9802004: Merge 110563

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: Source/WebCore/rendering/svg/RenderSVGResourceMasker.cpp

Issue 9802004: Merge 110563 (Closed) Base URL: http://svn.webkit.org/repository/webkit/branches/chromium/1025/

Patch Set: Created 8 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:

Index: Source/WebCore/rendering/svg/RenderSVGResourceMasker.cpp

===================================================================

--- Source/WebCore/rendering/svg/RenderSVGResourceMasker.cpp (revision 111489)

+++ Source/WebCore/rendering/svg/RenderSVGResourceMasker.cpp (working copy)

@@ -86,7 +86,8 @@

ASSERT(context);

ASSERT_UNUSED(resourceMode, resourceMode == ApplyToDefaultMode);

- if (!m_masker.contains(object))

+ bool missingMaskerData = !m_masker.contains(object);

+ if (missingMaskerData)

m_masker.set(object, new MaskerData);

MaskerData* maskerData = m_masker.get(object);

@@ -116,7 +117,7 @@

if (!maskerData->maskImage)

return false;

- SVGImageBufferTools::clipToImageBuffer(context, absoluteTransform, repaintRect, maskerData->maskImage);

+ SVGImageBufferTools::clipToImageBuffer(context, absoluteTransform, repaintRect, maskerData->maskImage, missingMaskerData);

return true;

}