Source/WebCore/rendering/svg/RenderSVGResourceFilterPrimitive.cpp - Issue 6949013: Merge 85926

Side by Side Diff

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

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

Side by Side Diff: Source/WebCore/rendering/svg/RenderSVGResourceFilterPrimitive.cpp

Issue 6949013: Merge 85926 (Closed) Base URL: http://svn.webkit.org/repository/webkit/branches/chromium/742/

Patch Set: Created 9 years, 7 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 unified diff | Download patch

« no previous file with comments | « Source/WebCore/rendering/svg/RenderSVGResourceFilter.cpp ('k') | no next file » | no next file with comments »

OLD	NEW
1 /*	1 /*

2 * Copyright (C) 2010 University of Szeged	2 * Copyright (C) 2010 University of Szeged

3 * Copyright (C) 2010 Zoltan Herczeg	3 * Copyright (C) 2010 Zoltan Herczeg

4 * Copyright (C) 2011 Renata Hodovan (reni@webkit.org)	4 * Copyright (C) 2011 Renata Hodovan (reni@webkit.org)

5 *	5 *

6 * Redistribution and use in source and binary forms, with or without	6 * Redistribution and use in source and binary forms, with or without

7 * modification, are permitted provided that the following conditions	7 * modification, are permitted provided that the following conditions

8 * are met:	8 * are met:

9 * 1. Redistributions of source code must retain the above copyright	9 * 1. Redistributions of source code must retain the above copyright

10 * notice, this list of conditions and the following disclaimer.	10 * notice, this list of conditions and the following disclaimer.

(...skipping 110 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
121 // FEImage needs the unclipped subregion in absolute coordinates to determin e the correct	121 // FEImage needs the unclipped subregion in absolute coordinates to determin e the correct

122 // destination rect in combination with preserveAspectRatio.	122 // destination rect in combination with preserveAspectRatio.

123 if (effect->filterEffectType() == FilterEffectTypeImage)	123 if (effect->filterEffectType() == FilterEffectTypeImage)

124 static_cast<FEImage*>(effect)->setAbsoluteSubregion(absoluteSubregion);	124 static_cast<FEImage*>(effect)->setAbsoluteSubregion(absoluteSubregion);

125	125

126 // Clip every filter effect to the filter region.	126 // Clip every filter effect to the filter region.

127 FloatRect absoluteScaledFilterRegion = filter->filterRegion();	127 FloatRect absoluteScaledFilterRegion = filter->filterRegion();

128 absoluteScaledFilterRegion.scale(filterResolution.width(), filterResolution. height());	128 absoluteScaledFilterRegion.scale(filterResolution.width(), filterResolution. height());

129 absoluteSubregion.intersect(absoluteScaledFilterRegion);	129 absoluteSubregion.intersect(absoluteScaledFilterRegion);

130	130

131 effect->setMaxEffectRect(enclosingIntRect(absoluteSubregion));	131 effect->setMaxEffectRect(absoluteSubregion);

132 return subregion;	132 return subregion;

133 }	133 }

134	134

135 } // namespace WebCore	135 } // namespace WebCore

136	136

137 #endif // ENABLE(SVG) && ENABLE(FILTERS)	137 #endif // ENABLE(SVG) && ENABLE(FILTERS)

OLD	NEW