[GPU Process][Filters] Top level SVGFilter should own its FilterResults #13652
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
https://bugs.webkit.org/show_bug.cgi?id=256535 rdar://109107572 Reviewed by NOBODY (OOPS!). This will allow caching the FilterResults along with the SVGFilter in RemoteResourceCache. GraphicsContext::drawFilteredImageBuffer() has to take FilterResultsEnsurer which returns FilterResults&. drawFilteredImageBuffer() will call it when FilterResults is needed. SVGFilter::ensureResults() will return FilterResults& and it takes FilterResultsCreator. FilterResultsCreator returns a std::unique_ptr<FilterResults> which SVGFilter will maintain. * Source/WebCore/platform/graphics/GraphicsContext.cpp: (WebCore::GraphicsContext::drawFilteredImageBuffer): * Source/WebCore/platform/graphics/GraphicsContext.h: * Source/WebCore/platform/graphics/displaylists/DisplayListItems.cpp: (WebCore::DisplayList::DrawFilteredImageBuffer::apply): * Source/WebCore/platform/graphics/displaylists/DisplayListItems.h: * Source/WebCore/platform/graphics/displaylists/DisplayListRecorder.cpp: (WebCore::DisplayList::Recorder::drawFilteredImageBuffer): * Source/WebCore/platform/graphics/displaylists/DisplayListRecorder.h: * Source/WebCore/platform/graphics/filters/FilterImageTargetSwitcher.cpp: (WebCore::FilterImageTargetSwitcher::FilterImageTargetSwitcher): (WebCore::FilterImageTargetSwitcher::endClipAndDrawSourceImage): (WebCore::FilterImageTargetSwitcher::endDrawSourceImage): * Source/WebCore/platform/graphics/filters/FilterImageTargetSwitcher.h: * Source/WebCore/platform/graphics/filters/FilterResults.h: * Source/WebCore/platform/graphics/filters/FilterStyleTargetSwitcher.cpp: (WebCore::FilterStyleTargetSwitcher::endDrawSourceImage): * Source/WebCore/platform/graphics/filters/FilterStyleTargetSwitcher.h: * Source/WebCore/platform/graphics/filters/FilterTargetSwitcher.cpp: (WebCore::FilterTargetSwitcher::create): * Source/WebCore/platform/graphics/filters/FilterTargetSwitcher.h: (WebCore::FilterTargetSwitcher::endClipAndDrawSourceImage): (WebCore::FilterTargetSwitcher::endDrawSourceImage): * Source/WebCore/rendering/svg/RenderSVGResourceFilter.cpp: (WebCore::RenderSVGResourceFilter::applyResource): (WebCore::RenderSVGResourceFilter::postApplyResource): (WebCore::RenderSVGResourceFilter::markFilterForRepaint): * Source/WebCore/rendering/svg/RenderSVGResourceFilter.h: * Source/WebCore/svg/graphics/filters/SVGFilter.cpp: (WebCore::SVGFilter::ensureResults): (WebCore::SVGFilter::clearEffectResult): * Source/WebCore/svg/graphics/filters/SVGFilter.h: * Source/WebKit/GPUProcess/graphics/RemoteDisplayListRecorder.cpp: (WebKit::RemoteDisplayListRecorder::drawFilteredImageBuffer):
shallawa
added
the
Layout and Rendering
|
EWS run on current version of this PR (hash d8a093a)
|
webkit-ews-buildbot
added
the
merging-blocked
smfr
reviewed
May 9, 2023
| @@ -359,12 +359,13 @@ void GraphicsContext::drawConsumingImageBuffer(RefPtr<ImageBuffer> image, const | |||
| ImageBuffer::drawConsuming(WTFMove(image), *this, destination, source, options); | |||
| } | |||
|
|
|||
| void GraphicsContext::drawFilteredImageBuffer(ImageBuffer* sourceImage, const FloatRect& sourceImageRect, Filter& filter, FilterResults& results) | |||
| void GraphicsContext::drawFilteredImageBuffer(ImageBuffer* sourceImage, const FloatRect& sourceImageRect, Filter& filter, const FilterResultsEnsurer& ensureFilterResults) | |||
| @@ -273,7 +273,7 @@ class GraphicsContext { | |||
| WEBCORE_EXPORT void drawConsumingImageBuffer(RefPtr<ImageBuffer>, const FloatRect& destination, const ImagePaintingOptions& = { }); | |||
| WEBCORE_EXPORT void drawConsumingImageBuffer(RefPtr<ImageBuffer>, const FloatRect& destination, const FloatRect& source, const ImagePaintingOptions& = { }); | |||
|
|
|||
| WEBCORE_EXPORT virtual void drawFilteredImageBuffer(ImageBuffer* sourceImage, const FloatRect& sourceImageRect, Filter&, FilterResults&); | |||
| WEBCORE_EXPORT virtual void drawFilteredImageBuffer(ImageBuffer* sourceImage, const FloatRect& sourceImageRect, Filter&, const FilterResultsEnsurer& = nullptr); | |||
There was a problem hiding this comment.
Initializing a reference to nullptr is pretty sketchy.
| @@ -49,6 +50,10 @@ class SVGFilter final : public Filter { | |||
|
|
|||
| FilterEffectVector effectsOfType(FilterFunction::Type) const final; | |||
|
|
|||
| FilterResults* results() { return m_results.get(); } | |||
| WEBCORE_EXPORT FilterResults& ensureResults(const FilterResultsCreator& createFilterResults = [] { return makeUnique<FilterResults>(); }); | |||
There was a problem hiding this comment.
Either this doesn’t compile, or it does somehow and returns a reference to a deleted object.
|
The same PR is opened here #13676. So close this one. |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
d8a093a
d8a093a