Skip to content

Conversation

@nikolaszimmermann
Copy link
Contributor

@nikolaszimmermann nikolaszimmermann commented Feb 2, 2024

a3c7518

[LBSE] Code cleanup after implementing all but one resource
https://bugs.webkit.org/show_bug.cgi?id=268615

Reviewed by Rob Buis.

Remove all usage of SVGRenderingContext.h / SVGResources.h / SVGResourcesCache.h, that
is legacy-only code, from LBSE. Turn all static methods in SVGResourcesCache to release
assertion, to make sure none of these methods is called from LBSE.

Covered by existing tests.

* Source/WebCore/rendering/ReferencedSVGResources.cpp:
(WebCore::ReferencedSVGResources::referencedSVGResourceIDs):
* Source/WebCore/rendering/svg/RenderSVGBlock.cpp:
(WebCore::RenderSVGBlock::willBeDestroyed):
(WebCore::RenderSVGBlock::styleDidChange):
* Source/WebCore/rendering/svg/RenderSVGContainer.cpp:
(WebCore::RenderSVGContainer::layout):
* Source/WebCore/rendering/svg/RenderSVGForeignObject.cpp:
(WebCore::RenderSVGForeignObject::layout):
* Source/WebCore/rendering/svg/RenderSVGGradientStop.cpp:
* Source/WebCore/rendering/svg/RenderSVGImage.cpp:
(WebCore::RenderSVGImage::layout):
(WebCore::RenderSVGImage::imageChanged):
* Source/WebCore/rendering/svg/RenderSVGInline.cpp:
(WebCore::RenderSVGInline::willBeDestroyed):
(WebCore::RenderSVGInline::styleDidChange):
* Source/WebCore/rendering/svg/RenderSVGModelObject.cpp:
(WebCore::RenderSVGModelObject::styleDidChange):
(WebCore::RenderSVGModelObject::willBeDestroyed): Deleted.
* Source/WebCore/rendering/svg/RenderSVGModelObject.h:
* Source/WebCore/rendering/svg/RenderSVGResourceClipper.cpp:
* Source/WebCore/rendering/svg/RenderSVGResourceMarker.cpp:
* Source/WebCore/rendering/svg/RenderSVGResourceMasker.cpp:
* Source/WebCore/rendering/svg/RenderSVGResourcePattern.cpp:
* Source/WebCore/rendering/svg/RenderSVGRoot.cpp:
(WebCore::RenderSVGRoot::layout):
(WebCore::RenderSVGRoot::layoutChildren):
(WebCore::RenderSVGRoot::paintObject):
(WebCore::RenderSVGRoot::willBeDestroyed):
(WebCore::RenderSVGRoot::insertedIntoTree): Deleted.
(WebCore::RenderSVGRoot::willBeRemovedFromTree): Deleted.
(WebCore::RenderSVGRoot::styleDidChange): Deleted.
(WebCore::RenderSVGRoot::addResourceForClientInvalidation): Deleted.
* Source/WebCore/rendering/svg/RenderSVGRoot.h:
* Source/WebCore/rendering/svg/RenderSVGShape.cpp:
(WebCore::RenderSVGShape::layout):
* Source/WebCore/rendering/svg/RenderSVGText.cpp:
(WebCore::RenderSVGText::layout):
* Source/WebCore/rendering/svg/SVGContainerLayout.cpp:
* Source/WebCore/rendering/svg/SVGResourcesCache.cpp:
(WebCore::SVGResourcesCache::clientLayoutChanged):
(WebCore::SVGResourcesCache::clientStyleChanged):
(WebCore::SVGResourcesCache::clientWasAddedToTree):
(WebCore::SVGResourcesCache::clientWillBeRemovedFromTree):
(WebCore::SVGResourcesCache::clientDestroyed):
(WebCore::SVGResourcesCache::resourceDestroyed):
* Source/WebCore/rendering/updating/RenderTreeBuilder.cpp:
(WebCore::RenderTreeBuilder::attachInternal):
(WebCore::RenderTreeBuilder::detach):
* Source/WebCore/rendering/updating/RenderTreeBuilderSVG.cpp:
(WebCore::RenderTreeBuilder::SVG::attach):
(WebCore::RenderTreeBuilder::SVG::detach):
* Source/WebCore/rendering/updating/RenderTreeBuilderSVG.h:

Canonical link: https://commits.webkit.org/274053@main

c2c6eb3

Misc iOS, tvOS & watchOS macOS Linux Windows
✅ 🧪 style ✅ 🛠 ios ✅ 🛠 mac ✅ 🛠 wpe ✅ 🛠 wincairo
✅ 🧪 bindings ✅ 🛠 ios-sim ✅ 🛠 mac-AS-debug 🧪 wpe-wk2
✅ 🧪 webkitperl ✅ 🧪 ios-wk2 🧪 api-mac ✅ 🧪 api-wpe
✅ 🧪 ios-wk2-wpt ✅ 🧪 mac-wk1 ✅ 🛠 gtk
✅ 🧪 api-ios 🧪 mac-wk2 ✅ 🧪 gtk-wk2
✅ 🛠 tv ✅ 🧪 mac-AS-debug-wk2 ❌ 🧪 api-gtk
✅ 🛠 tv-sim
✅ 🛠 🧪 merge ✅ 🛠 watch
✅ 🛠 watch-sim

@nikolaszimmermann nikolaszimmermann self-assigned this Feb 2, 2024
@nikolaszimmermann nikolaszimmermann added the SVG For bugs in the SVG implementation. label Feb 2, 2024
@webkit-ews-buildbot webkit-ews-buildbot added the merging-blocked Applied to prevent a change from being merged label Feb 2, 2024
Copy link
Contributor

@rwlbuis rwlbuis left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM, nice to see such code be removed.

@nikolaszimmermann nikolaszimmermann removed the merging-blocked Applied to prevent a change from being merged label Feb 2, 2024
@nikolaszimmermann nikolaszimmermann force-pushed the eng/LBSE-Code-cleanup-after-implementing-all-but-one-resource branch from f1f2e14 to be20e83 Compare February 2, 2024 16:54
@webkit-ews-buildbot webkit-ews-buildbot added the merging-blocked Applied to prevent a change from being merged label Feb 2, 2024
@nikolaszimmermann nikolaszimmermann removed the merging-blocked Applied to prevent a change from being merged label Feb 2, 2024
@nikolaszimmermann nikolaszimmermann force-pushed the eng/LBSE-Code-cleanup-after-implementing-all-but-one-resource branch from be20e83 to b1d4022 Compare February 2, 2024 23:04
@nikolaszimmermann nikolaszimmermann force-pushed the eng/LBSE-Code-cleanup-after-implementing-all-but-one-resource branch from b1d4022 to 145c933 Compare February 2, 2024 23:10
@nikolaszimmermann nikolaszimmermann added merge-queue Applied to send a pull request to merge-queue and removed merge-queue Applied to send a pull request to merge-queue labels Feb 3, 2024
@nikolaszimmermann nikolaszimmermann force-pushed the eng/LBSE-Code-cleanup-after-implementing-all-but-one-resource branch from 145c933 to c2c6eb3 Compare February 3, 2024 22:44
@nikolaszimmermann nikolaszimmermann added the merge-queue Applied to send a pull request to merge-queue label Feb 3, 2024
https://bugs.webkit.org/show_bug.cgi?id=268615

Reviewed by Rob Buis.

Remove all usage of SVGRenderingContext.h / SVGResources.h / SVGResourcesCache.h, that
is legacy-only code, from LBSE. Turn all static methods in SVGResourcesCache to release
assertion, to make sure none of these methods is called from LBSE.

Covered by existing tests.

* Source/WebCore/rendering/ReferencedSVGResources.cpp:
(WebCore::ReferencedSVGResources::referencedSVGResourceIDs):
* Source/WebCore/rendering/svg/RenderSVGBlock.cpp:
(WebCore::RenderSVGBlock::willBeDestroyed):
(WebCore::RenderSVGBlock::styleDidChange):
* Source/WebCore/rendering/svg/RenderSVGContainer.cpp:
(WebCore::RenderSVGContainer::layout):
* Source/WebCore/rendering/svg/RenderSVGForeignObject.cpp:
(WebCore::RenderSVGForeignObject::layout):
* Source/WebCore/rendering/svg/RenderSVGGradientStop.cpp:
* Source/WebCore/rendering/svg/RenderSVGImage.cpp:
(WebCore::RenderSVGImage::layout):
(WebCore::RenderSVGImage::imageChanged):
* Source/WebCore/rendering/svg/RenderSVGInline.cpp:
(WebCore::RenderSVGInline::willBeDestroyed):
(WebCore::RenderSVGInline::styleDidChange):
* Source/WebCore/rendering/svg/RenderSVGModelObject.cpp:
(WebCore::RenderSVGModelObject::styleDidChange):
(WebCore::RenderSVGModelObject::willBeDestroyed): Deleted.
* Source/WebCore/rendering/svg/RenderSVGModelObject.h:
* Source/WebCore/rendering/svg/RenderSVGResourceClipper.cpp:
* Source/WebCore/rendering/svg/RenderSVGResourceMarker.cpp:
* Source/WebCore/rendering/svg/RenderSVGResourceMasker.cpp:
* Source/WebCore/rendering/svg/RenderSVGResourcePattern.cpp:
* Source/WebCore/rendering/svg/RenderSVGRoot.cpp:
(WebCore::RenderSVGRoot::layout):
(WebCore::RenderSVGRoot::layoutChildren):
(WebCore::RenderSVGRoot::paintObject):
(WebCore::RenderSVGRoot::willBeDestroyed):
(WebCore::RenderSVGRoot::insertedIntoTree): Deleted.
(WebCore::RenderSVGRoot::willBeRemovedFromTree): Deleted.
(WebCore::RenderSVGRoot::styleDidChange): Deleted.
(WebCore::RenderSVGRoot::addResourceForClientInvalidation): Deleted.
* Source/WebCore/rendering/svg/RenderSVGRoot.h:
* Source/WebCore/rendering/svg/RenderSVGShape.cpp:
(WebCore::RenderSVGShape::layout):
* Source/WebCore/rendering/svg/RenderSVGText.cpp:
(WebCore::RenderSVGText::layout):
* Source/WebCore/rendering/svg/SVGContainerLayout.cpp:
* Source/WebCore/rendering/svg/SVGResourcesCache.cpp:
(WebCore::SVGResourcesCache::clientLayoutChanged):
(WebCore::SVGResourcesCache::clientStyleChanged):
(WebCore::SVGResourcesCache::clientWasAddedToTree):
(WebCore::SVGResourcesCache::clientWillBeRemovedFromTree):
(WebCore::SVGResourcesCache::clientDestroyed):
(WebCore::SVGResourcesCache::resourceDestroyed):
* Source/WebCore/rendering/updating/RenderTreeBuilder.cpp:
(WebCore::RenderTreeBuilder::attachInternal):
(WebCore::RenderTreeBuilder::detach):
* Source/WebCore/rendering/updating/RenderTreeBuilderSVG.cpp:
(WebCore::RenderTreeBuilder::SVG::attach):
(WebCore::RenderTreeBuilder::SVG::detach):
* Source/WebCore/rendering/updating/RenderTreeBuilderSVG.h:

Canonical link: https://commits.webkit.org/274053@main
@webkit-commit-queue webkit-commit-queue force-pushed the eng/LBSE-Code-cleanup-after-implementing-all-but-one-resource branch from c2c6eb3 to a3c7518 Compare February 3, 2024 23:58
@webkit-commit-queue
Copy link
Collaborator

Committed 274053@main (a3c7518): https://commits.webkit.org/274053@main

Reviewed commits have been landed. Closing PR #23740 and removing active labels.

@webkit-commit-queue webkit-commit-queue merged commit a3c7518 into WebKit:main Feb 3, 2024
@webkit-commit-queue webkit-commit-queue removed the merge-queue Applied to send a pull request to merge-queue label Feb 3, 2024
@nikolaszimmermann nikolaszimmermann deleted the eng/LBSE-Code-cleanup-after-implementing-all-but-one-resource branch February 5, 2024 09:16
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

SVG For bugs in the SVG implementation.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

5 participants