diff options
| author | Lorry Tar Creator <lorry-tar-importer@lorry> | 2017-06-27 06:07:23 +0000 |
|---|---|---|
| committer | Lorry Tar Creator <lorry-tar-importer@lorry> | 2017-06-27 06:07:23 +0000 |
| commit | 1bf1084f2b10c3b47fd1a588d85d21ed0eb41d0c (patch) | |
| tree | 46dcd36c86e7fbc6e5df36deb463b33e9967a6f7 /Source/WebCore/rendering/svg/RenderSVGResourceMarker.cpp | |
| parent | 32761a6cee1d0dee366b885b7b9c777e67885688 (diff) | |
| download | WebKitGtk-tarball-master.tar.gz | |
webkitgtk-2.16.5HEADwebkitgtk-2.16.5master
Diffstat (limited to 'Source/WebCore/rendering/svg/RenderSVGResourceMarker.cpp')
| -rw-r--r-- | Source/WebCore/rendering/svg/RenderSVGResourceMarker.cpp | 16 |
1 files changed, 5 insertions, 11 deletions
diff --git a/Source/WebCore/rendering/svg/RenderSVGResourceMarker.cpp b/Source/WebCore/rendering/svg/RenderSVGResourceMarker.cpp index 3ea195056..75360ae6a 100644 --- a/Source/WebCore/rendering/svg/RenderSVGResourceMarker.cpp +++ b/Source/WebCore/rendering/svg/RenderSVGResourceMarker.cpp @@ -20,8 +20,6 @@ */ #include "config.h" - -#if ENABLE(SVG) #include "RenderSVGResourceMarker.h" #include "GraphicsContext.h" @@ -30,10 +28,8 @@ namespace WebCore { -RenderSVGResourceType RenderSVGResourceMarker::s_resourceType = MarkerResourceType; - -RenderSVGResourceMarker::RenderSVGResourceMarker(SVGMarkerElement& element, PassRef<RenderStyle> style) - : RenderSVGResourceContainer(element, std::move(style)) +RenderSVGResourceMarker::RenderSVGResourceMarker(SVGMarkerElement& element, RenderStyle&& style) + : RenderSVGResourceContainer(element, WTFMove(style)) { } @@ -59,7 +55,7 @@ void RenderSVGResourceMarker::removeAllClientsFromCache(bool markForInvalidation markAllClientsForInvalidation(markForInvalidation ? LayoutAndBoundariesInvalidation : ParentOnlyInvalidation); } -void RenderSVGResourceMarker::removeClientFromCache(RenderObject& client, bool markForInvalidation) +void RenderSVGResourceMarker::removeClientFromCache(RenderElement& client, bool markForInvalidation) { markClientForInvalidation(client, markForInvalidation ? BoundariesInvalidation : ParentOnlyInvalidation); } @@ -67,7 +63,7 @@ void RenderSVGResourceMarker::removeClientFromCache(RenderObject& client, bool m void RenderSVGResourceMarker::applyViewportClip(PaintInfo& paintInfo) { if (SVGRenderSupport::isOverflowHidden(*this)) - paintInfo.context->clip(m_viewport); + paintInfo.context().clip(m_viewport); } FloatRect RenderSVGResourceMarker::markerBoundaries(const AffineTransform& markerTransformation) const @@ -122,7 +118,7 @@ void RenderSVGResourceMarker::draw(PaintInfo& paintInfo, const AffineTransform& return; PaintInfo info(paintInfo); - GraphicsContextStateSaver stateSaver(*info.context); + GraphicsContextStateSaver stateSaver(info.context()); info.applyTransform(transform); RenderSVGContainer::paint(info, IntPoint()); } @@ -157,5 +153,3 @@ void RenderSVGResourceMarker::calcViewport() } } - -#endif // ENABLE(SVG) |