Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(2909)

Unified Diff: Source/platform/graphics/filters/Filter.cpp

Issue 1348973004: Merge SVGFilter into Filter (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Nits. Created 5 years, 3 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 | « Source/platform/graphics/filters/Filter.h ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/platform/graphics/filters/Filter.cpp
diff --git a/Source/platform/graphics/filters/Filter.cpp b/Source/platform/graphics/filters/Filter.cpp
index 6aa814174cf3c2b485dbfd493fbab4b508f8ace4..22ba718e5ef557466470ce0ddee8ac86ff241189 100644
--- a/Source/platform/graphics/filters/Filter.cpp
+++ b/Source/platform/graphics/filters/Filter.cpp
@@ -36,10 +36,11 @@
namespace blink {
-Filter::Filter(const FloatRect& referenceBox, const FloatRect& filterRegion, float scale)
+Filter::Filter(const FloatRect& referenceBox, const FloatRect& filterRegion, float scale, UnitScaling unitScaling)
: m_referenceBox(referenceBox)
, m_filterRegion(filterRegion)
, m_scale(scale)
+ , m_unitScaling(unitScaling)
, m_sourceGraphic(SourceGraphic::create(this))
{
}
@@ -48,6 +49,16 @@ Filter::~Filter()
{
}
+PassRefPtrWillBeRawPtr<Filter> Filter::create(const FloatRect& referenceBox, const FloatRect& filterRegion, float scale, UnitScaling unitScaling)
+{
+ return adoptRefWillBeNoop(new Filter(referenceBox, filterRegion, scale, unitScaling));
+}
+
+PassRefPtrWillBeRawPtr<Filter> Filter::create(float scale)
+{
+ return adoptRefWillBeNoop(new Filter(FloatRect(), FloatRect(), scale, UserSpace));
+}
+
DEFINE_TRACE(Filter)
{
visitor->trace(m_sourceGraphic);
@@ -68,6 +79,29 @@ FloatRect Filter::mapAbsoluteRectToLocalRect(const FloatRect& rect) const
return result;
}
+float Filter::applyHorizontalScale(float value) const
+{
+ if (m_unitScaling == BoundingBox)
+ value *= referenceBox().width();
+ return m_scale * value;
+}
+
+float Filter::applyVerticalScale(float value) const
+{
+ if (m_unitScaling == BoundingBox)
+ value *= referenceBox().height();
+ return m_scale * value;
+}
+
+FloatPoint3D Filter::resolve3dPoint(const FloatPoint3D& point) const
+{
+ if (m_unitScaling != BoundingBox)
+ return point;
+ return FloatPoint3D(point.x() * referenceBox().width() + referenceBox().x(),
+ point.y() * referenceBox().height() + referenceBox().y(),
+ point.z() * sqrtf(referenceBox().size().diagonalLengthSquared() / 2));
+}
+
void Filter::setLastEffect(PassRefPtrWillBeRawPtr<FilterEffect> effect)
{
m_lastEffect = effect;
« no previous file with comments | « Source/platform/graphics/filters/Filter.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698