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

Unified Diff: Source/core/paint/SVGShapePainter.cpp

Issue 908243002: Move rendering/svg/RenderSVGResource* to layout/svg. (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Created 5 years, 10 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/core/paint/SVGShapePainter.h ('k') | Source/core/rendering/svg/RenderSVGGradientStop.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/core/paint/SVGShapePainter.cpp
diff --git a/Source/core/paint/SVGShapePainter.cpp b/Source/core/paint/SVGShapePainter.cpp
index b2bd43e8ad04ed9d60b3404815aa745b5ffcd1fe..664cbffee65c7c09114e241f201f010b564dcd93 100644
--- a/Source/core/paint/SVGShapePainter.cpp
+++ b/Source/core/paint/SVGShapePainter.cpp
@@ -6,6 +6,7 @@
#include "core/paint/SVGShapePainter.h"
#include "core/layout/PaintInfo.h"
+#include "core/layout/svg/LayoutSVGResourceMarker.h"
#include "core/layout/svg/SVGLayoutSupport.h"
#include "core/layout/svg/SVGMarkerData.h"
#include "core/layout/svg/SVGResources.h"
@@ -17,7 +18,6 @@
#include "core/paint/SVGPaintContext.h"
#include "core/paint/TransformRecorder.h"
#include "core/rendering/svg/RenderSVGPath.h"
-#include "core/rendering/svg/RenderSVGResourceMarker.h"
#include "core/rendering/svg/RenderSVGShape.h"
#include "platform/graphics/paint/DisplayItemList.h"
#include "third_party/skia/include/core/SkPicture.h"
@@ -159,21 +159,21 @@ void SVGShapePainter::paintMarkers(const PaintInfo& paintInfo)
if (!resources)
return;
- RenderSVGResourceMarker* markerStart = resources->markerStart();
- RenderSVGResourceMarker* markerMid = resources->markerMid();
- RenderSVGResourceMarker* markerEnd = resources->markerEnd();
+ LayoutSVGResourceMarker* markerStart = resources->markerStart();
+ LayoutSVGResourceMarker* markerMid = resources->markerMid();
+ LayoutSVGResourceMarker* markerEnd = resources->markerEnd();
if (!markerStart && !markerMid && !markerEnd)
return;
float strokeWidth = m_renderSVGShape.strokeWidth();
unsigned size = markerPositions->size();
for (unsigned i = 0; i < size; ++i) {
- if (RenderSVGResourceMarker* marker = SVGMarkerData::markerForType((*markerPositions)[i].type, markerStart, markerMid, markerEnd))
+ if (LayoutSVGResourceMarker* marker = SVGMarkerData::markerForType((*markerPositions)[i].type, markerStart, markerMid, markerEnd))
paintMarker(paintInfo, *marker, (*markerPositions)[i], strokeWidth);
}
}
-void SVGShapePainter::paintMarker(const PaintInfo& paintInfo, RenderSVGResourceMarker& marker, const MarkerPosition& position, float strokeWidth)
+void SVGShapePainter::paintMarker(const PaintInfo& paintInfo, LayoutSVGResourceMarker& marker, const MarkerPosition& position, float strokeWidth)
{
// An empty viewBox disables rendering.
SVGMarkerElement* markerElement = toSVGMarkerElement(marker.element());
« no previous file with comments | « Source/core/paint/SVGShapePainter.h ('k') | Source/core/rendering/svg/RenderSVGGradientStop.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698