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

Unified Diff: Source/core/rendering/svg/RenderSVGModelObject.cpp

Issue 61753005: Remove SVGLocatable and SVGTransformable (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Fix farthestVieportElement Created 7 years, 1 month 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/core.gypi ('k') | Source/core/rendering/svg/RenderSVGResourceContainer.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/core/rendering/svg/RenderSVGModelObject.cpp
diff --git a/Source/core/rendering/svg/RenderSVGModelObject.cpp b/Source/core/rendering/svg/RenderSVGModelObject.cpp
index 56312a7af54146da356bc2c3051541e8fdc0e858..12da706b521cbdec3523fd33a70c001577a82d6e 100644
--- a/Source/core/rendering/svg/RenderSVGModelObject.cpp
+++ b/Source/core/rendering/svg/RenderSVGModelObject.cpp
@@ -35,7 +35,7 @@
#include "SVGNames.h"
#include "core/rendering/svg/RenderSVGRoot.h"
#include "core/rendering/svg/SVGResourcesCache.h"
-#include "core/svg/SVGElement.h"
+#include "core/svg/SVGGraphicsElement.h"
namespace WebCore {
@@ -123,12 +123,12 @@ bool RenderSVGModelObject::nodeAtPoint(const HitTestRequest&, HitTestResult&, co
return false;
}
-static void getElementCTM(SVGElement* element, AffineTransform& transform)
+static void getElementCTM(SVGGraphicsElement* element, AffineTransform& transform)
{
ASSERT(element);
element->document().updateLayoutIgnorePendingStylesheets();
- SVGElement* stopAtElement = SVGLocatable::nearestViewportElement(element);
+ SVGElement* stopAtElement = element->nearestViewportElement();
ASSERT(stopAtElement);
AffineTransform localTransform;
@@ -182,7 +182,7 @@ bool RenderSVGModelObject::checkIntersection(RenderObject* renderer, const SVGRe
if (!isGraphicsElement(renderer))
return false;
AffineTransform ctm;
- SVGElement* svgElement = toSVGElement(renderer->node());
+ SVGGraphicsElement* svgElement = toSVGGraphicsElement(renderer->node());
getElementCTM(svgElement, ctm);
ASSERT(svgElement->renderer());
return intersectsAllowingEmpty(rect, ctm.mapRect(svgElement->renderer()->repaintRectInLocalCoordinates()));
@@ -195,7 +195,7 @@ bool RenderSVGModelObject::checkEnclosure(RenderObject* renderer, const SVGRect&
if (!isGraphicsElement(renderer))
return false;
AffineTransform ctm;
- SVGElement* svgElement = toSVGElement(renderer->node());
+ SVGGraphicsElement* svgElement = toSVGGraphicsElement(renderer->node());
getElementCTM(svgElement, ctm);
ASSERT(svgElement->renderer());
return rect.contains(ctm.mapRect(svgElement->renderer()->repaintRectInLocalCoordinates()));
« no previous file with comments | « Source/core/core.gypi ('k') | Source/core/rendering/svg/RenderSVGResourceContainer.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698