diff options
author | Steve Block <steveblock@google.com> | 2010-04-27 16:31:00 +0100 |
---|---|---|
committer | Steve Block <steveblock@google.com> | 2010-05-11 14:42:12 +0100 |
commit | dcc8cf2e65d1aa555cce12431a16547e66b469ee (patch) | |
tree | 92a8d65cd5383bca9749f5327fb5e440563926e6 /WebCore/rendering/SVGMarkerLayoutInfo.cpp | |
parent | ccac38a6b48843126402088a309597e682f40fe6 (diff) | |
download | external_webkit-dcc8cf2e65d1aa555cce12431a16547e66b469ee.zip external_webkit-dcc8cf2e65d1aa555cce12431a16547e66b469ee.tar.gz external_webkit-dcc8cf2e65d1aa555cce12431a16547e66b469ee.tar.bz2 |
Merge webkit.org at r58033 : Initial merge by git
Change-Id: If006c38561af287c50cd578d251629b51e4d8cd1
Diffstat (limited to 'WebCore/rendering/SVGMarkerLayoutInfo.cpp')
-rw-r--r-- | WebCore/rendering/SVGMarkerLayoutInfo.cpp | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/WebCore/rendering/SVGMarkerLayoutInfo.cpp b/WebCore/rendering/SVGMarkerLayoutInfo.cpp index 3fe513f..b771cf8 100644 --- a/WebCore/rendering/SVGMarkerLayoutInfo.cpp +++ b/WebCore/rendering/SVGMarkerLayoutInfo.cpp @@ -26,8 +26,7 @@ #if ENABLE(SVG) #include "SVGMarkerLayoutInfo.h" -#include "RenderSVGViewportContainer.h" -#include "SVGResourceMarker.h" +#include "RenderSVGResourceMarker.h" namespace WebCore { @@ -52,7 +51,7 @@ static inline void processStartAndMidMarkers(void* infoPtr, const PathElement* e markerData.updateOutslope(element->points[0]); // Draw the marker for the previous element - SVGResourceMarker* marker = markerData.marker(); + RenderSVGResourceMarker* marker = markerData.marker(); if (elementIndex > 0 && marker) info.addLayoutedMarker(marker, markerData.origin(), markerData.currentAngle()); @@ -66,7 +65,7 @@ static inline void processStartAndMidMarkers(void* infoPtr, const PathElement* e ++elementIndex; } -FloatRect SVGMarkerLayoutInfo::calculateBoundaries(SVGResourceMarker* startMarker, SVGResourceMarker* midMarker, SVGResourceMarker* endMarker, float strokeWidth, const Path& path) +FloatRect SVGMarkerLayoutInfo::calculateBoundaries(RenderSVGResourceMarker* startMarker, RenderSVGResourceMarker* midMarker, RenderSVGResourceMarker* endMarker, float strokeWidth, const Path& path) { m_layout.clear(); m_midMarker = midMarker; @@ -90,7 +89,7 @@ FloatRect SVGMarkerLayoutInfo::calculateBoundaries(SVGResourceMarker* startMarke for (; it != end; ++it) { MarkerLayout& layout = *it; - RenderSVGViewportContainer* markerContent = layout.marker->renderer(); + RenderSVGResourceMarker* markerContent = layout.marker; ASSERT(markerContent); bounds.unite(markerContent->markerBoundaries(layout.matrix)); @@ -113,7 +112,7 @@ void SVGMarkerLayoutInfo::drawMarkers(RenderObject::PaintInfo& paintInfo) } } -void SVGMarkerLayoutInfo::addLayoutedMarker(SVGResourceMarker* marker, const FloatPoint& origin, float angle) +void SVGMarkerLayoutInfo::addLayoutedMarker(RenderSVGResourceMarker* marker, const FloatPoint& origin, float angle) { ASSERT(marker); m_layout.append(MarkerLayout(marker, marker->markerTransformation(origin, angle, m_strokeWidth))); |