Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[LBSE] Move SVG resources to legacy #19590

Merged

Conversation

rwlbuis
Copy link
Contributor

@rwlbuis rwlbuis commented Oct 26, 2023

3a242e0

[LBSE] Move SVG resources to legacy
https://bugs.webkit.org/show_bug.cgi?id=263722

Reviewed by Nikolas Zimmermann.

Move masker/marker to legacy.

* Source/WebCore/Sources.txt:
* Source/WebCore/WebCore.xcodeproj/project.pbxproj:
* Source/WebCore/rendering/svg/RenderSVGPath.cpp:
(WebCore::markerForType):
* Source/WebCore/rendering/svg/RenderSVGShape.cpp:
* Source/WebCore/rendering/svg/SVGBoundingBoxComputation.cpp:
* Source/WebCore/rendering/svg/SVGRenderSupport.cpp:
(WebCore::SVGRenderSupport::intersectRepaintRectWithResources):
* Source/WebCore/rendering/svg/SVGRenderTreeAsText.cpp:
(WebCore::writeSVGResourceContainer):
(WebCore::writeResources):
* Source/WebCore/rendering/svg/SVGRenderingContext.cpp:
(WebCore::SVGRenderingContext::prepareToRenderSVGContent):
* Source/WebCore/rendering/svg/SVGResources.cpp:
(WebCore::SVGResources::buildCachedResources):
(WebCore::SVGResources::setMarkerStart):
(WebCore::SVGResources::setMarkerMid):
(WebCore::SVGResources::setMarkerEnd):
(WebCore::SVGResources::setMasker):
* Source/WebCore/rendering/svg/SVGResources.h:
(WebCore::SVGResources::markerStart const):
(WebCore::SVGResources::markerMid const):
(WebCore::SVGResources::markerEnd const):
(WebCore::SVGResources::masker const):
* Source/WebCore/rendering/svg/SVGResourcesCycleSolver.cpp:
* Source/WebCore/rendering/svg/legacy/LegacyRenderSVGPath.cpp:
(WebCore::markerForType):
(WebCore::LegacyRenderSVGPath::drawMarkers):
(WebCore::LegacyRenderSVGPath::markerRect const):
* Source/WebCore/rendering/svg/legacy/LegacyRenderSVGResource.cpp:
(WebCore::removeFromCacheAndInvalidateDependencies):
* Source/WebCore/rendering/svg/legacy/LegacyRenderSVGResourceMarker.cpp: Renamed from Source/WebCore/rendering/svg/RenderSVGResourceMarker.cpp.
(WebCore::LegacyRenderSVGResourceMarker::LegacyRenderSVGResourceMarker):
(WebCore::LegacyRenderSVGResourceMarker::layout):
(WebCore::LegacyRenderSVGResourceMarker::removeAllClientsFromCacheIfNeeded):
(WebCore::LegacyRenderSVGResourceMarker::removeClientFromCache):
(WebCore::LegacyRenderSVGResourceMarker::applyViewportClip):
(WebCore::LegacyRenderSVGResourceMarker::markerBoundaries const):
(WebCore::LegacyRenderSVGResourceMarker::localToParentTransform const):
(WebCore::LegacyRenderSVGResourceMarker::referencePoint const):
(WebCore::LegacyRenderSVGResourceMarker::angle const):
(WebCore::LegacyRenderSVGResourceMarker::markerTransformation const):
(WebCore::LegacyRenderSVGResourceMarker::draw):
(WebCore::LegacyRenderSVGResourceMarker::markerContentTransformation const):
(WebCore::LegacyRenderSVGResourceMarker::viewportTransform const):
(WebCore::LegacyRenderSVGResourceMarker::calcViewport):
* Source/WebCore/rendering/svg/legacy/LegacyRenderSVGResourceMarker.h: Renamed from Source/WebCore/rendering/svg/RenderSVGResourceMarker.h.
* Source/WebCore/rendering/svg/legacy/LegacyRenderSVGResourceMarkerInlines.h: Renamed from Source/WebCore/rendering/svg/RenderSVGResourceMarkerInlines.h.
(WebCore::LegacyRenderSVGResourceMarker::markerElement const):
(WebCore::LegacyRenderSVGResourceMarker::markerUnits const):
* Source/WebCore/rendering/svg/legacy/LegacyRenderSVGResourceMasker.cpp: Renamed from Source/WebCore/rendering/svg/RenderSVGResourceMasker.cpp.
(WebCore::LegacyRenderSVGResourceMasker::LegacyRenderSVGResourceMasker):
(WebCore::LegacyRenderSVGResourceMasker::removeAllClientsFromCacheIfNeeded):
(WebCore::LegacyRenderSVGResourceMasker::removeClientFromCache):
(WebCore::LegacyRenderSVGResourceMasker::applyResource):
(WebCore::LegacyRenderSVGResourceMasker::drawContentIntoMaskImage):
(WebCore::LegacyRenderSVGResourceMasker::drawContentIntoContext):
(WebCore::LegacyRenderSVGResourceMasker::calculateMaskContentRepaintRect):
(WebCore::LegacyRenderSVGResourceMasker::resourceBoundingBox):
* Source/WebCore/rendering/svg/legacy/LegacyRenderSVGResourceMasker.h: Renamed from Source/WebCore/rendering/svg/RenderSVGResourceMasker.h.
* Source/WebCore/rendering/svg/legacy/LegacyRenderSVGResourceMaskerInlines.h: Renamed from Source/WebCore/rendering/svg/RenderSVGResourceMaskerInlines.h.
(WebCore::LegacyRenderSVGResourceMasker::maskElement const):
(WebCore::LegacyRenderSVGResourceMasker::maskUnits const):
(WebCore::LegacyRenderSVGResourceMasker::maskContentUnits const):
* Source/WebCore/rendering/svg/legacy/LegacyRenderSVGShape.cpp:
* Source/WebCore/svg/SVGElement.cpp:
* Source/WebCore/svg/SVGMarkerElement.cpp:
(WebCore::SVGMarkerElement::createElementRenderer):
* Source/WebCore/svg/SVGMaskElement.cpp:
(WebCore::SVGMaskElement::createElementRenderer):
* Source/WebCore/svg/graphics/SVGResourceImage.cpp:
(WebCore::SVGResourceImage::draw):

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

36d03fa

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 ✅ 🛠 gtk
✅ 🧪 ios-wk2-wpt ✅ 🧪 mac-wk1 ✅ 🧪 gtk-wk2
✅ 🧪 api-ios ✅ 🧪 mac-wk2 ✅ 🧪 api-gtk
✅ 🛠 tv ✅ 🧪 mac-AS-debug-wk2
✅ 🛠 tv-sim
✅ 🛠 🧪 merge ✅ 🛠 watch
✅ 🛠 watch-sim

@rwlbuis rwlbuis self-assigned this Oct 26, 2023
@rwlbuis rwlbuis added the SVG For bugs in the SVG implementation. label Oct 26, 2023
@rwlbuis rwlbuis changed the title https://bugs.webkit.org/show_bug.cgi?id=263722 [LBSE] Move SVG resources to legacy Oct 26, 2023
@rwlbuis rwlbuis force-pushed the eng/LBSE-Move-SVG-resources-to-legacy branch from b997400 to 36d03fa Compare October 26, 2023 15:27
Copy link
Contributor

@nikolaszimmermann nikolaszimmermann left a comment

Choose a reason for hiding this comment

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

r=me

@rwlbuis
Copy link
Contributor Author

rwlbuis commented Oct 26, 2023

r=me

Thanks, but more are needed :) Remember Said wanted to do all in one change.

@rwlbuis
Copy link
Contributor Author

rwlbuis commented Oct 27, 2023

r=me

Thanks, but more are needed :) Remember Said wanted to do all in one change.

Ok, plan is to do them now asap but it does not mean it needs to be one PR, so landing this now.

@rwlbuis rwlbuis added the merge-queue Applied to send a pull request to merge-queue label Oct 27, 2023
https://bugs.webkit.org/show_bug.cgi?id=263722

Reviewed by Nikolas Zimmermann.

Move masker/marker to legacy.

* Source/WebCore/Sources.txt:
* Source/WebCore/WebCore.xcodeproj/project.pbxproj:
* Source/WebCore/rendering/svg/RenderSVGPath.cpp:
(WebCore::markerForType):
* Source/WebCore/rendering/svg/RenderSVGShape.cpp:
* Source/WebCore/rendering/svg/SVGBoundingBoxComputation.cpp:
* Source/WebCore/rendering/svg/SVGRenderSupport.cpp:
(WebCore::SVGRenderSupport::intersectRepaintRectWithResources):
* Source/WebCore/rendering/svg/SVGRenderTreeAsText.cpp:
(WebCore::writeSVGResourceContainer):
(WebCore::writeResources):
* Source/WebCore/rendering/svg/SVGRenderingContext.cpp:
(WebCore::SVGRenderingContext::prepareToRenderSVGContent):
* Source/WebCore/rendering/svg/SVGResources.cpp:
(WebCore::SVGResources::buildCachedResources):
(WebCore::SVGResources::setMarkerStart):
(WebCore::SVGResources::setMarkerMid):
(WebCore::SVGResources::setMarkerEnd):
(WebCore::SVGResources::setMasker):
* Source/WebCore/rendering/svg/SVGResources.h:
(WebCore::SVGResources::markerStart const):
(WebCore::SVGResources::markerMid const):
(WebCore::SVGResources::markerEnd const):
(WebCore::SVGResources::masker const):
* Source/WebCore/rendering/svg/SVGResourcesCycleSolver.cpp:
* Source/WebCore/rendering/svg/legacy/LegacyRenderSVGPath.cpp:
(WebCore::markerForType):
(WebCore::LegacyRenderSVGPath::drawMarkers):
(WebCore::LegacyRenderSVGPath::markerRect const):
* Source/WebCore/rendering/svg/legacy/LegacyRenderSVGResource.cpp:
(WebCore::removeFromCacheAndInvalidateDependencies):
* Source/WebCore/rendering/svg/legacy/LegacyRenderSVGResourceMarker.cpp: Renamed from Source/WebCore/rendering/svg/RenderSVGResourceMarker.cpp.
(WebCore::LegacyRenderSVGResourceMarker::LegacyRenderSVGResourceMarker):
(WebCore::LegacyRenderSVGResourceMarker::layout):
(WebCore::LegacyRenderSVGResourceMarker::removeAllClientsFromCacheIfNeeded):
(WebCore::LegacyRenderSVGResourceMarker::removeClientFromCache):
(WebCore::LegacyRenderSVGResourceMarker::applyViewportClip):
(WebCore::LegacyRenderSVGResourceMarker::markerBoundaries const):
(WebCore::LegacyRenderSVGResourceMarker::localToParentTransform const):
(WebCore::LegacyRenderSVGResourceMarker::referencePoint const):
(WebCore::LegacyRenderSVGResourceMarker::angle const):
(WebCore::LegacyRenderSVGResourceMarker::markerTransformation const):
(WebCore::LegacyRenderSVGResourceMarker::draw):
(WebCore::LegacyRenderSVGResourceMarker::markerContentTransformation const):
(WebCore::LegacyRenderSVGResourceMarker::viewportTransform const):
(WebCore::LegacyRenderSVGResourceMarker::calcViewport):
* Source/WebCore/rendering/svg/legacy/LegacyRenderSVGResourceMarker.h: Renamed from Source/WebCore/rendering/svg/RenderSVGResourceMarker.h.
* Source/WebCore/rendering/svg/legacy/LegacyRenderSVGResourceMarkerInlines.h: Renamed from Source/WebCore/rendering/svg/RenderSVGResourceMarkerInlines.h.
(WebCore::LegacyRenderSVGResourceMarker::markerElement const):
(WebCore::LegacyRenderSVGResourceMarker::markerUnits const):
* Source/WebCore/rendering/svg/legacy/LegacyRenderSVGResourceMasker.cpp: Renamed from Source/WebCore/rendering/svg/RenderSVGResourceMasker.cpp.
(WebCore::LegacyRenderSVGResourceMasker::LegacyRenderSVGResourceMasker):
(WebCore::LegacyRenderSVGResourceMasker::removeAllClientsFromCacheIfNeeded):
(WebCore::LegacyRenderSVGResourceMasker::removeClientFromCache):
(WebCore::LegacyRenderSVGResourceMasker::applyResource):
(WebCore::LegacyRenderSVGResourceMasker::drawContentIntoMaskImage):
(WebCore::LegacyRenderSVGResourceMasker::drawContentIntoContext):
(WebCore::LegacyRenderSVGResourceMasker::calculateMaskContentRepaintRect):
(WebCore::LegacyRenderSVGResourceMasker::resourceBoundingBox):
* Source/WebCore/rendering/svg/legacy/LegacyRenderSVGResourceMasker.h: Renamed from Source/WebCore/rendering/svg/RenderSVGResourceMasker.h.
* Source/WebCore/rendering/svg/legacy/LegacyRenderSVGResourceMaskerInlines.h: Renamed from Source/WebCore/rendering/svg/RenderSVGResourceMaskerInlines.h.
(WebCore::LegacyRenderSVGResourceMasker::maskElement const):
(WebCore::LegacyRenderSVGResourceMasker::maskUnits const):
(WebCore::LegacyRenderSVGResourceMasker::maskContentUnits const):
* Source/WebCore/rendering/svg/legacy/LegacyRenderSVGShape.cpp:
* Source/WebCore/svg/SVGElement.cpp:
* Source/WebCore/svg/SVGMarkerElement.cpp:
(WebCore::SVGMarkerElement::createElementRenderer):
* Source/WebCore/svg/SVGMaskElement.cpp:
(WebCore::SVGMaskElement::createElementRenderer):
* Source/WebCore/svg/graphics/SVGResourceImage.cpp:
(WebCore::SVGResourceImage::draw):

Canonical link: https://commits.webkit.org/269870@main
@webkit-commit-queue webkit-commit-queue force-pushed the eng/LBSE-Move-SVG-resources-to-legacy branch from 36d03fa to 3a242e0 Compare October 27, 2023 22:08
@webkit-commit-queue
Copy link
Collaborator

Committed 269870@main (3a242e0): https://commits.webkit.org/269870@main

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

@webkit-commit-queue webkit-commit-queue merged commit 3a242e0 into WebKit:main Oct 27, 2023
@webkit-commit-queue webkit-commit-queue removed the merge-queue Applied to send a pull request to merge-queue label Oct 27, 2023
@rwlbuis rwlbuis deleted the eng/LBSE-Move-SVG-resources-to-legacy branch October 31, 2023 11:41
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.

4 participants