⚠ Archived content — this site is no longer maintained.   Current WebKit documentation is at docs.webkit.org.

Changeset 286962 in webkit


Ignore:
Timestamp:
Dec 13, 2021, 11:55:06 AM (5 years ago)
Author:
Nikolas Zimmermann
Message:

[LBSE] Rename RenderSVGModelObject -> LegacyRenderSVGModelObject
​https://bugs.webkit.org/show_bug.cgi?id=234235

Reviewed by Rob Buis.

RenderSVGModelObject will inherit from RenderLayerModelObject in LBSE,
therefore rename the current implementation to LegacyRenderSVGRoot and
adapt all callsites.

Covered by existing tests, no change in behaviour.

  • Sources.txt:
  • WebCore.xcodeproj/project.pbxproj:
  • css/CSSComputedStyleDeclaration.cpp:

(WebCore::isLayoutDependent):
(WebCore::ComputedStyleExtractor::valueForPropertyInStyle):

  • rendering/RenderObject.cpp:

(WebCore::RenderObject::computedFragmentedFlowState):

  • rendering/RenderObject.h:

(WebCore::RenderObject::isLegacyRenderSVGModelObject const):
(WebCore::RenderObject::isRenderOrLegacyRenderSVGModelObject const):

  • rendering/svg/LegacyRenderSVGModelObject.cpp: Renamed from Source/WebCore/rendering/svg/RenderSVGModelObject.cpp.

(WebCore::LegacyRenderSVGModelObject::LegacyRenderSVGModelObject):
(WebCore::LegacyRenderSVGModelObject::clippedOverflowRect const):
(WebCore::LegacyRenderSVGModelObject::computeFloatVisibleRectInContainer const):
(WebCore::LegacyRenderSVGModelObject::mapLocalToContainer const):
(WebCore::LegacyRenderSVGModelObject::pushMappingToContainer const):
(WebCore::LegacyRenderSVGModelObject::outlineBoundsForRepaint const):
(WebCore::LegacyRenderSVGModelObject::absoluteRects const):
(WebCore::LegacyRenderSVGModelObject::absoluteQuads const):
(WebCore::LegacyRenderSVGModelObject::willBeDestroyed):
(WebCore::LegacyRenderSVGModelObject::styleDidChange):
(WebCore::LegacyRenderSVGModelObject::nodeAtPoint):
(WebCore::LegacyRenderSVGModelObject::absoluteFocusRingQuads):
(WebCore::LegacyRenderSVGModelObject::checkIntersection):
(WebCore::LegacyRenderSVGModelObject::checkEnclosure):

  • rendering/svg/LegacyRenderSVGModelObject.h: Renamed from Source/WebCore/rendering/svg/RenderSVGModelObject.h.
  • rendering/svg/RenderSVGContainer.cpp:

(WebCore::RenderSVGContainer::RenderSVGContainer):
(WebCore::RenderSVGContainer::layout):

  • rendering/svg/RenderSVGContainer.h:
  • rendering/svg/RenderSVGImage.cpp:

(WebCore::RenderSVGImage::RenderSVGImage):
(WebCore::RenderSVGImage::willBeDestroyed):
(WebCore::RenderSVGImage::imageElement const):
(WebCore::RenderSVGImage::layout):

  • rendering/svg/RenderSVGImage.h:
  • rendering/svg/RenderSVGShape.cpp:

(WebCore::RenderSVGShape::RenderSVGShape):
(WebCore::RenderSVGShape::layout):

  • rendering/svg/RenderSVGShape.h:
  • rendering/svg/RenderSVGShapeInlines.h:

(WebCore::RenderSVGShape::graphicsElement const):

  • svg/SVGSVGElement.cpp:

(WebCore::checkIntersectionWithoutUpdatingLayout):
(WebCore::checkEnclosureWithoutUpdatingLayout):

Location:
trunk/Source/WebCore
Files:
14 edited
2 moved

Legend:

Unmodified
Added
Removed

  • trunk/Source/WebCore/ChangeLog

    r286958 r286962  
     12021-12-13  Nikolas Zimmermann  <nzimmermann@igalia.com>
     2
     3        [LBSE] Rename RenderSVGModelObject -> LegacyRenderSVGModelObject
     4        https://bugs.webkit.org/show_bug.cgi?id=234235
     5
     6        Reviewed by Rob Buis.
     7
     8        RenderSVGModelObject will inherit from RenderLayerModelObject in LBSE,
     9        therefore rename the current implementation to LegacyRenderSVGRoot and
     10        adapt all callsites.
     11
     12        Covered by existing tests, no change in behaviour.
     13
     14        * Sources.txt:
     15        * WebCore.xcodeproj/project.pbxproj:
     16        * css/CSSComputedStyleDeclaration.cpp:
     17        (WebCore::isLayoutDependent):
     18        (WebCore::ComputedStyleExtractor::valueForPropertyInStyle):
     19        * rendering/RenderObject.cpp:
     20        (WebCore::RenderObject::computedFragmentedFlowState):
     21        * rendering/RenderObject.h:
     22        (WebCore::RenderObject::isLegacyRenderSVGModelObject const):
     23        (WebCore::RenderObject::isRenderOrLegacyRenderSVGModelObject const):
     24        * rendering/svg/LegacyRenderSVGModelObject.cpp: Renamed from Source/WebCore/rendering/svg/RenderSVGModelObject.cpp.
     25        (WebCore::LegacyRenderSVGModelObject::LegacyRenderSVGModelObject):
     26        (WebCore::LegacyRenderSVGModelObject::clippedOverflowRect const):
     27        (WebCore::LegacyRenderSVGModelObject::computeFloatVisibleRectInContainer const):
     28        (WebCore::LegacyRenderSVGModelObject::mapLocalToContainer const):
     29        (WebCore::LegacyRenderSVGModelObject::pushMappingToContainer const):
     30        (WebCore::LegacyRenderSVGModelObject::outlineBoundsForRepaint const):
     31        (WebCore::LegacyRenderSVGModelObject::absoluteRects const):
     32        (WebCore::LegacyRenderSVGModelObject::absoluteQuads const):
     33        (WebCore::LegacyRenderSVGModelObject::willBeDestroyed):
     34        (WebCore::LegacyRenderSVGModelObject::styleDidChange):
     35        (WebCore::LegacyRenderSVGModelObject::nodeAtPoint):
     36        (WebCore::LegacyRenderSVGModelObject::absoluteFocusRingQuads):
     37        (WebCore::LegacyRenderSVGModelObject::checkIntersection):
     38        (WebCore::LegacyRenderSVGModelObject::checkEnclosure):
     39        * rendering/svg/LegacyRenderSVGModelObject.h: Renamed from Source/WebCore/rendering/svg/RenderSVGModelObject.h.
     40        * rendering/svg/RenderSVGContainer.cpp:
     41        (WebCore::RenderSVGContainer::RenderSVGContainer):
     42        (WebCore::RenderSVGContainer::layout):
     43        * rendering/svg/RenderSVGContainer.h:
     44        * rendering/svg/RenderSVGImage.cpp:
     45        (WebCore::RenderSVGImage::RenderSVGImage):
     46        (WebCore::RenderSVGImage::willBeDestroyed):
     47        (WebCore::RenderSVGImage::imageElement const):
     48        (WebCore::RenderSVGImage::layout):
     49        * rendering/svg/RenderSVGImage.h:
     50        * rendering/svg/RenderSVGShape.cpp:
     51        (WebCore::RenderSVGShape::RenderSVGShape):
     52        (WebCore::RenderSVGShape::layout):
     53        * rendering/svg/RenderSVGShape.h:
     54        * rendering/svg/RenderSVGShapeInlines.h:
     55        (WebCore::RenderSVGShape::graphicsElement const):
     56        * svg/SVGSVGElement.cpp:
     57        (WebCore::checkIntersectionWithoutUpdatingLayout):
     58        (WebCore::checkEnclosureWithoutUpdatingLayout):
     59
    1602021-12-13  Elliott Williams  <emw@apple.com>
    261

  • trunk/Source/WebCore/Sources.txt

    r286943 r286962  
    24622462rendering/style/TextSizeAdjustment.cpp
    24632463rendering/style/WillChangeData.cpp
     2464rendering/svg/LegacyRenderSVGModelObject.cpp
    24642465rendering/svg/LegacyRenderSVGRoot.cpp
    24652466rendering/svg/RenderSVGBlock.cpp
    … …  
    24722473rendering/svg/RenderSVGInline.cpp
    24732474rendering/svg/RenderSVGInlineText.cpp
    2474 rendering/svg/RenderSVGModelObject.cpp
    24752475rendering/svg/RenderSVGPath.cpp
    24762476rendering/svg/RenderSVGRect.cpp

  • trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj

    r286943 r286962  
    12421242                436708C712D9CA4B00044234 /* RenderSVGHiddenContainer.h in Headers */ = {isa = PBXBuildFile; fileRef = 4367088812D9CA4A00044234 /* RenderSVGHiddenContainer.h */; };
    12431243                436708C912D9CA4B00044234 /* RenderSVGImage.h in Headers */ = {isa = PBXBuildFile; fileRef = 4367088A12D9CA4A00044234 /* RenderSVGImage.h */; };
    1244                 436708CB12D9CA4B00044234 /* RenderSVGModelObject.h in Headers */ = {isa = PBXBuildFile; fileRef = 4367088C12D9CA4A00044234 /* RenderSVGModelObject.h */; };
     1244                436708CB12D9CA4B00044234 /* LegacyRenderSVGModelObject.h in Headers */ = {isa = PBXBuildFile; fileRef = 4367088C12D9CA4A00044234 /* LegacyRenderSVGModelObject.h */; };
    12451245                436708CD12D9CA4B00044234 /* RenderSVGResource.h in Headers */ = {isa = PBXBuildFile; fileRef = 4367088E12D9CA4A00044234 /* RenderSVGResource.h */; };
    12461246                436708CF12D9CA4B00044234 /* RenderSVGResourceClipper.h in Headers */ = {isa = PBXBuildFile; fileRef = 4367089012D9CA4A00044234 /* RenderSVGResourceClipper.h */; };
    … …  
    89628962                4367088912D9CA4A00044234 /* RenderSVGImage.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = RenderSVGImage.cpp; sourceTree = "<group>"; };
    89638963                4367088A12D9CA4A00044234 /* RenderSVGImage.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RenderSVGImage.h; sourceTree = "<group>"; };
    8964                 4367088B12D9CA4A00044234 /* RenderSVGModelObject.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = RenderSVGModelObject.cpp; sourceTree = "<group>"; };
    8965                 4367088C12D9CA4A00044234 /* RenderSVGModelObject.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RenderSVGModelObject.h; sourceTree = "<group>"; };
     8964                4367088B12D9CA4A00044234 /* LegacyRenderSVGModelObject.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = LegacyRenderSVGModelObject.cpp; sourceTree = "<group>"; };
     8965                4367088C12D9CA4A00044234 /* LegacyRenderSVGModelObject.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = LegacyRenderSVGModelObject.h; sourceTree = "<group>"; };
    89668966                4367088D12D9CA4A00044234 /* RenderSVGResource.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = RenderSVGResource.cpp; sourceTree = "<group>"; };
    89678967                4367088E12D9CA4A00044234 /* RenderSVGResource.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RenderSVGResource.h; sourceTree = "<group>"; };
    … …  
    1884818848                        isa = PBXGroup;
    1884918849                        children = (
     18850                                4367088B12D9CA4A00044234 /* LegacyRenderSVGModelObject.cpp */,
     18851                                4367088C12D9CA4A00044234 /* LegacyRenderSVGModelObject.h */,
    1885018852                                436708A512D9CA4B00044234 /* LegacyRenderSVGRoot.cpp */,
    1885118853                                436708A612D9CA4B00044234 /* LegacyRenderSVGRoot.h */,
    … …  
    1887118873                                0854B0041255E4E600B9CDD0 /* RenderSVGInlineText.cpp */,
    1887218874                                0854B0051255E4E600B9CDD0 /* RenderSVGInlineText.h */,
    18873                                 4367088B12D9CA4A00044234 /* RenderSVGModelObject.cpp */,
    18874                                 4367088C12D9CA4A00044234 /* RenderSVGModelObject.h */,
    1887518875                                ADDF1AD41257CD9A0003A759 /* RenderSVGPath.cpp */,
    1887618876                                ADDF1AD51257CD9A0003A759 /* RenderSVGPath.h */,
    … …  
    3579735797                                A185B42A1E8211A100DC9118 /* LegacyPreviewLoader.h in Headers */,
    3579835798                                A10DBF4718F92317000D70C6 /* LegacyPreviewLoaderClient.h in Headers */,
     35799                                436708CB12D9CA4B00044234 /* LegacyRenderSVGModelObject.h in Headers */,
    3579935800                                436708E512D9CA4B00044234 /* LegacyRenderSVGRoot.h in Headers */,
    3580035801                                A8CFF5E10A155A05000A4234 /* LegacyRootInlineBox.h in Headers */,
    … …  
    3660136602                                CDF747E9270F6CAE008FEEEC /* RenderSVGInlineInlines.h in Headers */,
    3660236603                                0854B0171255E4E600B9CDD0 /* RenderSVGInlineText.h in Headers */,
    36603                                 436708CB12D9CA4B00044234 /* RenderSVGModelObject.h in Headers */,
    3660436604                                ADDF1AD71257CD9A0003A759 /* RenderSVGPath.h in Headers */,
    3660536605                                A10BB5851484E3A700B2E87A /* RenderSVGRect.h in Headers */,

  • trunk/Source/WebCore/css/CSSComputedStyleDeclaration.cpp

    r286795 r286962  
    22582258    case CSSPropertyInlineSize:
    22592259    case CSSPropertyBlockSize:
    2260         return renderer && !renderer->isRenderSVGModelObject() && !isNonReplacedInline(*renderer);
     2260        return renderer && !renderer->isRenderOrLegacyRenderSVGModelObject() && !isNonReplacedInline(*renderer);
    22612261    case CSSPropertyPerspectiveOrigin:
    22622262    case CSSPropertyTransformOrigin:
    … …  
    31353135            return getCSSPropertyValuesForShorthandProperties(gapShorthand());
    31363136        case CSSPropertyHeight:
    3137             if (renderer && !renderer->isRenderSVGModelObject()) {
     3137            if (renderer && !renderer->isRenderOrLegacyRenderSVGModelObject()) {
    31383138                // According to http://www.w3.org/TR/CSS2/visudet.html#the-height-property,
    31393139                // the "height" property does not apply for non-replaced inline elements.
    … …  
    34613461            return cssValuePool.createValue(style.widows(), CSSUnitType::CSS_NUMBER);
    34623462        case CSSPropertyWidth:
    3463             if (renderer && !renderer->isRenderSVGModelObject()) {
     3463            if (renderer && !renderer->isRenderOrLegacyRenderSVGModelObject()) {
    34643464                // According to http://www.w3.org/TR/CSS2/visudet.html#the-width-property,
    34653465                // the "width" property does not apply for non-replaced inline elements.

  • trunk/Source/WebCore/rendering/RenderObject.cpp

    r286835 r286962  
    4444#include "HitTestResult.h"
    4545#include "LayoutIntegrationLineLayout.h"
     46#include "LegacyRenderSVGModelObject.h"
    4647#include "LegacyRenderSVGRoot.h"
    4748#include "LogicalSelectionOffsetCaches.h"
    … …  
    6465#include "RenderSVGBlock.h"
    6566#include "RenderSVGInline.h"
    66 #include "RenderSVGModelObject.h"
    6767#include "RenderSVGResourceContainer.h"
    6868#include "RenderScrollbarPart.h"
    … …  
    239239    if (is<RenderText>(renderer))
    240240        inheritedFlowState = renderer.parent()->fragmentedFlowState();
    241     else if (is<RenderSVGBlock>(renderer) || is<RenderSVGInline>(renderer) || is<RenderSVGModelObject>(renderer)) {
     241    else if (is<RenderSVGBlock>(renderer) || is<RenderSVGInline>(renderer) || is<LegacyRenderSVGModelObject>(renderer)) {
    242242        // containingBlock() skips svg boundary (SVG root is a RenderReplaced).
    243243        if (auto* svgRoot = SVGRenderSupport::findTreeRootObject(downcast<RenderElement>(renderer)))

  • trunk/Source/WebCore/rendering/RenderObject.h

    r286835 r286962  
    325325#endif // ENABLE(MATHML)
    326326
    327     // FIXME: Until all SVG renders can be subclasses of RenderSVGModelObject we have
    328     // to add SVG renderer methods to RenderObject with an ASSERT_NOT_REACHED() default implementation.
     327    virtual bool isLegacyRenderSVGModelObject() const { return false; }
    329328    virtual bool isRenderSVGModelObject() const { return false; }
    330329    virtual bool isRenderSVGBlock() const { return false; };
    … …  
    350349    virtual bool isSVGResourceFilterPrimitive() const { return false; }
    351350    bool isSVGRootOrLegacySVGRoot() const { return isSVGRoot() || isLegacySVGRoot(); }
     351    bool isRenderOrLegacyRenderSVGModelObject() const { return isRenderSVGModelObject() || isLegacyRenderSVGModelObject(); }
    352352
    353353    // FIXME: Those belong into a SVG specific base-class for all renderers (see above)

  • trunk/Source/WebCore/rendering/svg/LegacyRenderSVGModelObject.cpp

    r286961 r286962  
    3030
    3131#include "config.h"
    32 #include "RenderSVGModelObject.h"
     32#include "LegacyRenderSVGModelObject.h"
    3333
    3434#include "NotImplemented.h"
    … …  
    4545namespace WebCore {
    4646
    47 WTF_MAKE_ISO_ALLOCATED_IMPL(RenderSVGModelObject);
    48 
    49 RenderSVGModelObject::RenderSVGModelObject(SVGElement& element, RenderStyle&& style)
     47WTF_MAKE_ISO_ALLOCATED_IMPL(LegacyRenderSVGModelObject);
     48
     49LegacyRenderSVGModelObject::LegacyRenderSVGModelObject(SVGElement& element, RenderStyle&& style)
    5050    : RenderElement(element, WTFMove(style), 0)
    5151{
    5252}
    5353
    54 LayoutRect RenderSVGModelObject::clippedOverflowRect(const RenderLayerModelObject* repaintContainer, VisibleRectContext context) const
     54LayoutRect LegacyRenderSVGModelObject::clippedOverflowRect(const RenderLayerModelObject* repaintContainer, VisibleRectContext context) const
    5555{
    5656#if ENABLE(LAYER_BASED_SVG_ENGINE)
    … …  
    6969}
    7070
    71 std::optional<FloatRect> RenderSVGModelObject::computeFloatVisibleRectInContainer(const FloatRect& rect, const RenderLayerModelObject* container, VisibleRectContext context) const
     71std::optional<FloatRect> LegacyRenderSVGModelObject::computeFloatVisibleRectInContainer(const FloatRect& rect, const RenderLayerModelObject* container, VisibleRectContext context) const
    7272{
    7373    return SVGRenderSupport::computeFloatVisibleRectInContainer(*this, rect, container, context);
    7474}
    7575
    76 void RenderSVGModelObject::mapLocalToContainer(const RenderLayerModelObject* ancestorContainer, TransformState& transformState, OptionSet<MapCoordinatesMode>, bool* wasFixed) const
     76void LegacyRenderSVGModelObject::mapLocalToContainer(const RenderLayerModelObject* ancestorContainer, TransformState& transformState, OptionSet<MapCoordinatesMode>, bool* wasFixed) const
    7777{
    7878    SVGRenderSupport::mapLocalToContainer(*this, ancestorContainer, transformState, wasFixed);
    7979}
    8080
    81 const RenderObject* RenderSVGModelObject::pushMappingToContainer(const RenderLayerModelObject* ancestorToStopAt, RenderGeometryMap& geometryMap) const
     81const RenderObject* LegacyRenderSVGModelObject::pushMappingToContainer(const RenderLayerModelObject* ancestorToStopAt, RenderGeometryMap& geometryMap) const
    8282{
    8383    return SVGRenderSupport::pushMappingToContainer(*this, ancestorToStopAt, geometryMap);
    … …  
    8787// FIXME: This may also need to move into SVGRenderSupport as the RenderBox version depends
    8888// on borderBoundingBox() which SVG RenderBox subclases (like SVGRenderBlock) do not implement.
    89 LayoutRect RenderSVGModelObject::outlineBoundsForRepaint(const RenderLayerModelObject* repaintContainer, const RenderGeometryMap*) const
     89LayoutRect LegacyRenderSVGModelObject::outlineBoundsForRepaint(const RenderLayerModelObject* repaintContainer, const RenderGeometryMap*) const
    9090{
    9191    LayoutRect box = enclosingLayoutRect(repaintRectInLocalCoordinates());
    … …  
    9696}
    9797
    98 void RenderSVGModelObject::absoluteRects(Vector<IntRect>& rects, const LayoutPoint& accumulatedOffset) const
     98void LegacyRenderSVGModelObject::absoluteRects(Vector<IntRect>& rects, const LayoutPoint& accumulatedOffset) const
    9999{
    100100    IntRect rect = enclosingIntRect(strokeBoundingBox());
    … …  
    103103}
    104104
    105 void RenderSVGModelObject::absoluteQuads(Vector<FloatQuad>& quads, bool* wasFixed) const
     105void LegacyRenderSVGModelObject::absoluteQuads(Vector<FloatQuad>& quads, bool* wasFixed) const
    106106{
    107107    quads.append(localToAbsoluteQuad(strokeBoundingBox(), UseTransforms, wasFixed));
    108108}
    109109
    110 void RenderSVGModelObject::willBeDestroyed()
     110void LegacyRenderSVGModelObject::willBeDestroyed()
    111111{
    112112    SVGResourcesCache::clientDestroyed(*this);
    … …  
    114114}
    115115
    116 void RenderSVGModelObject::styleDidChange(StyleDifference diff, const RenderStyle* oldStyle)
     116void LegacyRenderSVGModelObject::styleDidChange(StyleDifference diff, const RenderStyle* oldStyle)
    117117{
    118118    if (diff == StyleDifference::Layout) {
    … …  
    125125}
    126126
    127 bool RenderSVGModelObject::nodeAtPoint(const HitTestRequest&, HitTestResult&, const HitTestLocation&, const LayoutPoint&, HitTestAction)
     127bool LegacyRenderSVGModelObject::nodeAtPoint(const HitTestRequest&, HitTestResult&, const HitTestLocation&, const LayoutPoint&, HitTestAction)
    128128{
    129129#if ENABLE(LAYER_BASED_SVG_ENGINE)
    130130    if (document().settings().layerBasedSVGEngineEnabled()) {
    131         // FIXME: [LBSE] Upstream RenderSVGModelObject inheritance changes (should inherit from RenderLayerModelObject).
     131        // FIXME: [LBSE] Upstream LegacyRenderSVGModelObject inheritance changes (should inherit from RenderLayerModelObject).
    132132        notImplemented();
    133133        return false;
    … …  
    167167    if (r.isEmpty() && other.isEmpty())
    168168        return false;
    169     if (r.isEmpty() && !other.isEmpty()) {
    170         return (other.contains(r.x(), r.y()) && !other.contains(r.maxX(), r.maxY()))
    171                || (!other.contains(r.x(), r.y()) && other.contains(r.maxX(), r.maxY()));
    172     }
     169    if (r.isEmpty() && !other.isEmpty())
     170        return (other.contains(r.x(), r.y()) && !other.contains(r.maxX(), r.maxY())) || (!other.contains(r.x(), r.y()) && other.contains(r.maxX(), r.maxY()));
    173171    if (other.isEmpty() && !r.isEmpty())
    174172        return intersectsAllowingEmpty(other, r);
    … …  
    185183// The SVG addFocusRingRects() method adds rects in local coordinates so the default absoluteFocusRingQuads
    186184// returns incorrect values for SVG objects. Overriding this method provides access to the absolute bounds.
    187 void RenderSVGModelObject::absoluteFocusRingQuads(Vector<FloatQuad>& quads)
     185void LegacyRenderSVGModelObject::absoluteFocusRingQuads(Vector<FloatQuad>& quads)
    188186{
    189187    quads.append(localToAbsoluteQuad(FloatQuad(repaintRectInLocalCoordinates())));
    190188}
    191189   
    192 bool RenderSVGModelObject::checkIntersection(RenderElement* renderer, const FloatRect& rect)
     190bool LegacyRenderSVGModelObject::checkIntersection(RenderElement* renderer, const FloatRect& rect)
    193191{
    194192    if (!renderer || renderer->style().pointerEvents() == PointerEvents::None)
    … …  
    203201}
    204202
    205 bool RenderSVGModelObject::checkEnclosure(RenderElement* renderer, const FloatRect& rect)
     203bool LegacyRenderSVGModelObject::checkEnclosure(RenderElement* renderer, const FloatRect& rect)
    206204{
    207205    if (!renderer || renderer->style().pointerEvents() == PointerEvents::None)

  • trunk/Source/WebCore/rendering/svg/LegacyRenderSVGModelObject.h

    r286961 r286962  
    4444class SVGElement;
    4545
    46 class RenderSVGModelObject : public RenderElement {
    47     WTF_MAKE_ISO_ALLOCATED(RenderSVGModelObject);
     46class LegacyRenderSVGModelObject : public RenderElement {
     47    WTF_MAKE_ISO_ALLOCATED(LegacyRenderSVGModelObject);
    4848public:
    4949    LayoutRect clippedOverflowRect(const RenderLayerModelObject* repaintContainer, VisibleRectContext) const override;
    … …  
    6868
    6969protected:
    70     RenderSVGModelObject(SVGElement&, RenderStyle&&);
     70    LegacyRenderSVGModelObject(SVGElement&, RenderStyle&&);
    7171
    7272    void willBeDestroyed() override;
    7373
    7474private:
    75     bool isRenderSVGModelObject() const final { return true; }
     75    bool isLegacyRenderSVGModelObject() const final { return true; }
    7676
    7777    // This method should never be called, SVG uses a different nodeAtPoint method
    … …  
    8282} // namespace WebCore
    8383
    84 SPECIALIZE_TYPE_TRAITS_RENDER_OBJECT(RenderSVGModelObject, isRenderSVGModelObject())
     84SPECIALIZE_TYPE_TRAITS_RENDER_OBJECT(LegacyRenderSVGModelObject, isLegacyRenderSVGModelObject())

  • trunk/Source/WebCore/rendering/svg/RenderSVGContainer.cpp

    r286392 r286962  
    4444
    4545RenderSVGContainer::RenderSVGContainer(SVGElement& element, RenderStyle&& style)
    46     : RenderSVGModelObject(element, WTFMove(style))
     46    : LegacyRenderSVGModelObject(element, WTFMove(style))
    4747{
    4848}
    … …  
    8282   
    8383        // If our bounds changed, notify the parents.
    84         RenderSVGModelObject::setNeedsBoundariesUpdate();
     84        LegacyRenderSVGModelObject::setNeedsBoundariesUpdate();
    8585    }
    8686

  • trunk/Source/WebCore/rendering/svg/RenderSVGContainer.h

    r233636 r286962  
    2323#pragma once
    2424
    25 #include "RenderSVGModelObject.h"
     25#include "LegacyRenderSVGModelObject.h"
    2626
    2727namespace WebCore {
    … …  
    2929class SVGElement;
    3030
    31 class RenderSVGContainer : public RenderSVGModelObject {
     31class RenderSVGContainer : public LegacyRenderSVGModelObject {
    3232    WTF_MAKE_ISO_ALLOCATED(RenderSVGContainer);
    3333public:

  • trunk/Source/WebCore/rendering/svg/RenderSVGImage.cpp

    r283851 r286962  
    4949
    5050RenderSVGImage::RenderSVGImage(SVGImageElement& element, RenderStyle&& style)
    51     : RenderSVGModelObject(element, WTFMove(style))
     51    : LegacyRenderSVGModelObject(element, WTFMove(style))
    5252    , m_needsBoundariesUpdate(true)
    5353    , m_needsTransformUpdate(true)
    … …  
    6262{
    6363    imageResource().shutdown();
    64     RenderSVGModelObject::willBeDestroyed();
     64    LegacyRenderSVGModelObject::willBeDestroyed();
    6565}
    6666
    6767SVGImageElement& RenderSVGImage::imageElement() const
    6868{
    69     return downcast<SVGImageElement>(RenderSVGModelObject::element());
     69    return downcast<SVGImageElement>(LegacyRenderSVGModelObject::element());
    7070}
    7171
    … …  
    157157    // If our bounds changed, notify the parents.
    158158    if (transformOrBoundariesUpdate)
    159         RenderSVGModelObject::setNeedsBoundariesUpdate();
     159        LegacyRenderSVGModelObject::setNeedsBoundariesUpdate();
    160160
    161161    repainter.repaintAfterLayout();

  • trunk/Source/WebCore/rendering/svg/RenderSVGImage.h

    r281064 r286962  
    2626#include "AffineTransform.h"
    2727#include "FloatRect.h"
    28 #include "RenderSVGModelObject.h"
     28#include "LegacyRenderSVGModelObject.h"
    2929
    3030namespace WebCore {
    … …  
    3333class SVGImageElement;
    3434
    35 class RenderSVGImage final : public RenderSVGModelObject {
     35class RenderSVGImage final : public LegacyRenderSVGModelObject {
    3636    WTF_MAKE_ISO_ALLOCATED(RenderSVGImage);
    3737public:

  • trunk/Source/WebCore/rendering/svg/RenderSVGShape.cpp

    r283851 r286962  
    5353
    5454RenderSVGShape::RenderSVGShape(SVGGraphicsElement& element, RenderStyle&& style)
    55     : RenderSVGModelObject(element, WTFMove(style))
     55    : LegacyRenderSVGModelObject(element, WTFMove(style))
    5656    , m_needsBoundariesUpdate(false) // Default is false, the cached rects are empty from the beginning.
    5757    , m_needsShapeUpdate(true) // Default is true, so we grab a Path object once from SVGGraphicsElement.
    … …  
    169169    // If our bounds changed, notify the parents.
    170170    if (updateCachedBoundariesInParents)
    171         RenderSVGModelObject::setNeedsBoundariesUpdate();
     171        LegacyRenderSVGModelObject::setNeedsBoundariesUpdate();
    172172
    173173    repainter.repaintAfterLayout();

  • trunk/Source/WebCore/rendering/svg/RenderSVGShape.h

    r283851 r286962  
    2828#include "AffineTransform.h"
    2929#include "FloatRect.h"
    30 #include "RenderSVGModelObject.h"
     30#include "LegacyRenderSVGModelObject.h"
    3131#include "SVGMarkerData.h"
    3232#include <memory>
    … …  
    4242class SVGGraphicsElement;
    4343
    44 class RenderSVGShape : public RenderSVGModelObject {
     44class RenderSVGShape : public LegacyRenderSVGModelObject {
    4545    WTF_MAKE_ISO_ALLOCATED(RenderSVGShape);
    4646public:

  • trunk/Source/WebCore/rendering/svg/RenderSVGShapeInlines.h

    r283851 r286962  
    3333inline SVGGraphicsElement& RenderSVGShape::graphicsElement() const
    3434{
    35     return downcast<SVGGraphicsElement>(RenderSVGModelObject::element());
     35    return downcast<SVGGraphicsElement>(LegacyRenderSVGModelObject::element());
    3636}
    3737

  • trunk/Source/WebCore/svg/SVGSVGElement.cpp

    r286846 r286962  
    246246static bool checkIntersectionWithoutUpdatingLayout(SVGElement& element, SVGRect& rect)
    247247{
    248     return RenderSVGModelObject::checkIntersection(element.renderer(), rect.value());
     248    return LegacyRenderSVGModelObject::checkIntersection(element.renderer(), rect.value());
    249249}
    250250   
    251251static bool checkEnclosureWithoutUpdatingLayout(SVGElement& element, SVGRect& rect)
    252252{
    253     return RenderSVGModelObject::checkEnclosure(element.renderer(), rect.value());
     253    return LegacyRenderSVGModelObject::checkEnclosure(element.renderer(), rect.value());
    254254}
    255255
Note: See TracChangeset for help on using the changeset viewer.