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

Unified Diff: Source/core/paint/SVGPaintContext.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/SVGPaintContext.h ('k') | Source/core/paint/SVGShapePainter.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/core/paint/SVGPaintContext.cpp
diff --git a/Source/core/paint/SVGPaintContext.cpp b/Source/core/paint/SVGPaintContext.cpp
index 189a36429c47d3d465f1ecdd587f9d6ad87ee7e6..88373de89212c1bf8d0097097f9bd49c1a68a757 100644
--- a/Source/core/paint/SVGPaintContext.cpp
+++ b/Source/core/paint/SVGPaintContext.cpp
@@ -28,12 +28,12 @@
#include "core/frame/FrameHost.h"
#include "core/layout/Layer.h"
#include "core/layout/PaintInfo.h"
+#include "core/layout/svg/LayoutSVGResourceFilter.h"
+#include "core/layout/svg/LayoutSVGResourceMasker.h"
#include "core/layout/svg/SVGLayoutSupport.h"
#include "core/layout/svg/SVGResources.h"
#include "core/layout/svg/SVGResourcesCache.h"
#include "core/paint/RenderDrawingRecorder.h"
-#include "core/rendering/svg/RenderSVGResourceFilter.h"
-#include "core/rendering/svg/RenderSVGResourceMasker.h"
#include "platform/FloatConversion.h"
namespace blink {
@@ -125,7 +125,7 @@ bool SVGPaintContext::applyClipIfNecessary(SVGResources* resources)
// resources->clipper() corresponds to the non-prefixed 'clip-path' whereas
// m_object->style()->clipPath() corresponds to '-webkit-clip-path'.
// FIXME: We should unify the clip-path and -webkit-clip-path codepaths.
- if (RenderSVGResourceClipper* clipper = resources ? resources->clipper() : nullptr) {
+ if (LayoutSVGResourceClipper* clipper = resources ? resources->clipper() : nullptr) {
if (!clipper->applyStatefulResource(m_object, m_paintInfo.context, m_clipperState))
return false;
m_clipper = clipper;
@@ -143,7 +143,7 @@ bool SVGPaintContext::applyClipIfNecessary(SVGResources* resources)
bool SVGPaintContext::applyMaskIfNecessary(SVGResources* resources)
{
- if (RenderSVGResourceMasker* masker = resources ? resources->masker() : nullptr) {
+ if (LayoutSVGResourceMasker* masker = resources ? resources->masker() : nullptr) {
if (!masker->prepareEffect(m_object, m_paintInfo.context))
return false;
m_masker = masker;
@@ -156,7 +156,7 @@ bool SVGPaintContext::applyFilterIfNecessary(SVGResources* resources)
if (!resources) {
if (m_object->style()->svgStyle().hasFilter())
return false;
- } else if (RenderSVGResourceFilter* filter = resources->filter()) {
+ } else if (LayoutSVGResourceFilter* filter = resources->filter()) {
m_filter = filter;
GraphicsContext* filterContext = filter->prepareEffect(m_object, m_paintInfo.context);
if (!filterContext)
@@ -180,7 +180,7 @@ bool SVGPaintContext::isIsolationInstalled() const
return true;
if (m_masker || m_filter)
return true;
- if (m_clipper && m_clipperState == RenderSVGResourceClipper::ClipperAppliedMask)
+ if (m_clipper && m_clipperState == LayoutSVGResourceClipper::ClipperAppliedMask)
return true;
return false;
}
« no previous file with comments | « Source/core/paint/SVGPaintContext.h ('k') | Source/core/paint/SVGShapePainter.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698