diff options
author | Steve Block <steveblock@google.com> | 2010-02-02 14:57:50 +0000 |
---|---|---|
committer | Steve Block <steveblock@google.com> | 2010-02-04 15:06:55 +0000 |
commit | d0825bca7fe65beaee391d30da42e937db621564 (patch) | |
tree | 7461c49eb5844ffd1f35d1ba2c8b7584c1620823 /WebCore/rendering/RenderForeignObject.cpp | |
parent | 3db770bd97c5a59b6c7574ca80a39e5a51c1defd (diff) | |
download | external_webkit-d0825bca7fe65beaee391d30da42e937db621564.zip external_webkit-d0825bca7fe65beaee391d30da42e937db621564.tar.gz external_webkit-d0825bca7fe65beaee391d30da42e937db621564.tar.bz2 |
Merge webkit.org at r54127 : Initial merge by git
Change-Id: Ib661abb595522f50ea406f72d3a0ce17f7193c82
Diffstat (limited to 'WebCore/rendering/RenderForeignObject.cpp')
-rw-r--r-- | WebCore/rendering/RenderForeignObject.cpp | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/WebCore/rendering/RenderForeignObject.cpp b/WebCore/rendering/RenderForeignObject.cpp index b15d55c..6597554 100644 --- a/WebCore/rendering/RenderForeignObject.cpp +++ b/WebCore/rendering/RenderForeignObject.cpp @@ -84,12 +84,14 @@ FloatRect RenderForeignObject::repaintRectInLocalCoordinates() const void RenderForeignObject::computeRectForRepaint(RenderBoxModelObject* repaintContainer, IntRect& rect, bool fixed) { rect = localToParentTransform().mapRect(rect); + style()->svgStyle()->inflateForShadow(rect); RenderBlock::computeRectForRepaint(repaintContainer, rect, fixed); } -TransformationMatrix RenderForeignObject::localToParentTransform() const +const TransformationMatrix& RenderForeignObject::localToParentTransform() const { - return localTransform() * translationForAttributes(); + m_localToParentTransform = localTransform() * translationForAttributes(); + return m_localToParentTransform; } void RenderForeignObject::layout() @@ -118,6 +120,11 @@ bool RenderForeignObject::nodeAtPoint(const HitTestRequest&, HitTestResult&, int return false; } +void RenderForeignObject::mapLocalToContainer(RenderBoxModelObject* repaintContainer, bool fixed , bool useTransforms, TransformState& transformState) const +{ + SVGRenderBase::mapLocalToContainer(this, repaintContainer, fixed, useTransforms, transformState); +} + } // namespace WebCore #endif // ENABLE(SVG) && ENABLE(SVG_FOREIGN_OBJECT) |