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

Port FilterEffect to the new IPC serialization format #21480

Merged
merged 1 commit into from
Dec 9, 2023

Conversation

cdumez
Copy link
Contributor

@cdumez cdumez commented Dec 8, 2023

edea595

Port FilterEffect to the new IPC serialization format
https://bugs.webkit.org/show_bug.cgi?id=266037

Reviewed by Brady Eidson.

* Source/WebCore/platform/graphics/filters/FEBlend.cpp:
(WebCore::FEBlend::create):
* Source/WebCore/platform/graphics/filters/FEBlend.h:
* Source/WebCore/platform/graphics/filters/FEColorMatrix.cpp:
(WebCore::FEColorMatrix::create):
* Source/WebCore/platform/graphics/filters/FEColorMatrix.h:
* Source/WebCore/platform/graphics/filters/FEComponentTransfer.cpp:
(WebCore::FEComponentTransfer::create):
* Source/WebCore/platform/graphics/filters/FEComponentTransfer.h:
* Source/WebCore/platform/graphics/filters/FEComposite.cpp:
(WebCore::FEComposite::create):
* Source/WebCore/platform/graphics/filters/FEComposite.h:
* Source/WebCore/platform/graphics/filters/FEConvolveMatrix.cpp:
(WebCore::FEConvolveMatrix::create):
* Source/WebCore/platform/graphics/filters/FEConvolveMatrix.h:
* Source/WebCore/platform/graphics/filters/FEDiffuseLighting.cpp:
(WebCore::FEDiffuseLighting::create):
* Source/WebCore/platform/graphics/filters/FEDiffuseLighting.h:
* Source/WebCore/platform/graphics/filters/FEDisplacementMap.cpp:
(WebCore::FEDisplacementMap::create):
* Source/WebCore/platform/graphics/filters/FEDisplacementMap.h:
* Source/WebCore/platform/graphics/filters/FEDropShadow.cpp:
(WebCore::FEDropShadow::create):
* Source/WebCore/platform/graphics/filters/FEDropShadow.h:
* Source/WebCore/platform/graphics/filters/FEFlood.cpp:
(WebCore::FEFlood::create):
* Source/WebCore/platform/graphics/filters/FEFlood.h:
* Source/WebCore/platform/graphics/filters/FEGaussianBlur.cpp:
(WebCore::FEGaussianBlur::create):
* Source/WebCore/platform/graphics/filters/FEGaussianBlur.h:
* Source/WebCore/platform/graphics/filters/FEImage.cpp:
(WebCore::FEImage::create):
* Source/WebCore/platform/graphics/filters/FEImage.h:
* Source/WebCore/platform/graphics/filters/FEMerge.cpp:
(WebCore::FEMerge::create):
* Source/WebCore/platform/graphics/filters/FEMerge.h:
* Source/WebCore/platform/graphics/filters/FEMorphology.cpp:
(WebCore::FEMorphology::create):
* Source/WebCore/platform/graphics/filters/FEMorphology.h:
* Source/WebCore/platform/graphics/filters/FEOffset.cpp:
(WebCore::FEOffset::create):
* Source/WebCore/platform/graphics/filters/FEOffset.h:
* Source/WebCore/platform/graphics/filters/FESpecularLighting.cpp:
(WebCore::FESpecularLighting::create):
* Source/WebCore/platform/graphics/filters/FESpecularLighting.h:
* Source/WebCore/platform/graphics/filters/FETile.cpp:
(WebCore::FETile::create):
* Source/WebCore/platform/graphics/filters/FETile.h:
* Source/WebCore/platform/graphics/filters/FETurbulence.cpp:
(WebCore::FETurbulence::create):
* Source/WebCore/platform/graphics/filters/FETurbulence.h:
* Source/WebCore/platform/graphics/filters/SourceAlpha.cpp:
(WebCore::SourceAlpha::create):
(WebCore::SourceAlpha::SourceAlpha):
* Source/WebCore/platform/graphics/filters/SourceAlpha.h:
* Source/WebCore/platform/graphics/filters/SourceGraphic.cpp:
(WebCore::SourceGraphic::create):
* Source/WebCore/platform/graphics/filters/SourceGraphic.h:
* Source/WebKit/Shared/WebCoreArgumentCoders.cpp:
(IPC::ArgumentCoder<FilterEffect>::encode): Deleted.
(IPC::ArgumentCoder<FilterEffect>::decode): Deleted.
* Source/WebKit/Shared/WebCoreArgumentCoders.h:
* Source/WebKit/Shared/WebCoreArgumentCoders.serialization.in:

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

a4da401

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
βœ… πŸ›  πŸ§ͺ unsafe-merge βœ… πŸ›  watch-sim

@cdumez cdumez self-assigned this Dec 8, 2023
@cdumez cdumez added the WebKit2 Bugs relating to the WebKit2 API layer label Dec 8, 2023
@cdumez cdumez marked this pull request as ready for review December 8, 2023 03:30
{
return adoptRef(*new FEBlend(mode));
Ref effect = adoptRef(*new FEBlend(mode));
effect->setOperatingColorSpace(colorSpace);
Copy link
Contributor

Choose a reason for hiding this comment

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

I think we should pass all the parameters into the constructor. I think we should make a FilterEffect constructor that requires a DestinationColorSpace and sets it in the constructor instead of requiring all the objects to modify after construction.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

It is a little annoying because setOperatingColorSpace() is a virtual function but I'll look into it.

@webkit-early-warning-system
Copy link
Collaborator

Starting EWS tests for 03bf0fb. Live statuses available at the PR page, #21480

@shallawa
Copy link
Contributor

shallawa commented Dec 8, 2023

@cdumez Nice! Thanks for cleaning this part of the filters.

@webkit-ews-buildbot webkit-ews-buildbot added the merging-blocked Applied to prevent a change from being merged label Dec 8, 2023
@cdumez
Copy link
Contributor Author

cdumez commented Dec 8, 2023

Weird, I have some iOS-only failures it seems. I don't think I had those in my previous iteration. Not quite sure what I messed up.

@cdumez cdumez removed the merging-blocked Applied to prevent a change from being merged label Dec 8, 2023
@webkit-ews-buildbot webkit-ews-buildbot added the merging-blocked Applied to prevent a change from being merged label Dec 8, 2023
@cdumez cdumez removed the merging-blocked Applied to prevent a change from being merged label Dec 9, 2023
@cdumez
Copy link
Contributor Author

cdumez commented Dec 9, 2023

Weird, I have some iOS-only failures it seems. I don't think I had those in my previous iteration. Not quite sure what I messed up.

I believe I figured it out.

@webkit-ews-buildbot webkit-ews-buildbot added the merging-blocked Applied to prevent a change from being merged label Dec 9, 2023
@cdumez cdumez removed the merging-blocked Applied to prevent a change from being merged label Dec 9, 2023
@cdumez cdumez added merge-queue Applied to send a pull request to merge-queue safe-merge-queue Applied to automatically send a pull-request to merge-queue after passing EWS checks unsafe-merge-queue Applied to send a pull request to merge-queue, but skip building and testing and removed merge-queue Applied to send a pull request to merge-queue safe-merge-queue Applied to automatically send a pull-request to merge-queue after passing EWS checks labels Dec 9, 2023
https://bugs.webkit.org/show_bug.cgi?id=266037

Reviewed by Brady Eidson.

* Source/WebCore/platform/graphics/filters/FEBlend.cpp:
(WebCore::FEBlend::create):
* Source/WebCore/platform/graphics/filters/FEBlend.h:
* Source/WebCore/platform/graphics/filters/FEColorMatrix.cpp:
(WebCore::FEColorMatrix::create):
* Source/WebCore/platform/graphics/filters/FEColorMatrix.h:
* Source/WebCore/platform/graphics/filters/FEComponentTransfer.cpp:
(WebCore::FEComponentTransfer::create):
* Source/WebCore/platform/graphics/filters/FEComponentTransfer.h:
* Source/WebCore/platform/graphics/filters/FEComposite.cpp:
(WebCore::FEComposite::create):
* Source/WebCore/platform/graphics/filters/FEComposite.h:
* Source/WebCore/platform/graphics/filters/FEConvolveMatrix.cpp:
(WebCore::FEConvolveMatrix::create):
* Source/WebCore/platform/graphics/filters/FEConvolveMatrix.h:
* Source/WebCore/platform/graphics/filters/FEDiffuseLighting.cpp:
(WebCore::FEDiffuseLighting::create):
* Source/WebCore/platform/graphics/filters/FEDiffuseLighting.h:
* Source/WebCore/platform/graphics/filters/FEDisplacementMap.cpp:
(WebCore::FEDisplacementMap::create):
* Source/WebCore/platform/graphics/filters/FEDisplacementMap.h:
* Source/WebCore/platform/graphics/filters/FEDropShadow.cpp:
(WebCore::FEDropShadow::create):
* Source/WebCore/platform/graphics/filters/FEDropShadow.h:
* Source/WebCore/platform/graphics/filters/FEFlood.cpp:
(WebCore::FEFlood::create):
* Source/WebCore/platform/graphics/filters/FEFlood.h:
* Source/WebCore/platform/graphics/filters/FEGaussianBlur.cpp:
(WebCore::FEGaussianBlur::create):
* Source/WebCore/platform/graphics/filters/FEGaussianBlur.h:
* Source/WebCore/platform/graphics/filters/FEImage.cpp:
(WebCore::FEImage::create):
* Source/WebCore/platform/graphics/filters/FEImage.h:
* Source/WebCore/platform/graphics/filters/FEMerge.cpp:
(WebCore::FEMerge::create):
* Source/WebCore/platform/graphics/filters/FEMerge.h:
* Source/WebCore/platform/graphics/filters/FEMorphology.cpp:
(WebCore::FEMorphology::create):
* Source/WebCore/platform/graphics/filters/FEMorphology.h:
* Source/WebCore/platform/graphics/filters/FEOffset.cpp:
(WebCore::FEOffset::create):
* Source/WebCore/platform/graphics/filters/FEOffset.h:
* Source/WebCore/platform/graphics/filters/FESpecularLighting.cpp:
(WebCore::FESpecularLighting::create):
* Source/WebCore/platform/graphics/filters/FESpecularLighting.h:
* Source/WebCore/platform/graphics/filters/FETile.cpp:
(WebCore::FETile::create):
* Source/WebCore/platform/graphics/filters/FETile.h:
* Source/WebCore/platform/graphics/filters/FETurbulence.cpp:
(WebCore::FETurbulence::create):
* Source/WebCore/platform/graphics/filters/FETurbulence.h:
* Source/WebCore/platform/graphics/filters/SourceAlpha.cpp:
(WebCore::SourceAlpha::create):
(WebCore::SourceAlpha::SourceAlpha):
* Source/WebCore/platform/graphics/filters/SourceAlpha.h:
* Source/WebCore/platform/graphics/filters/SourceGraphic.cpp:
(WebCore::SourceGraphic::create):
* Source/WebCore/platform/graphics/filters/SourceGraphic.h:
* Source/WebKit/Shared/WebCoreArgumentCoders.cpp:
(IPC::ArgumentCoder<FilterEffect>::encode): Deleted.
(IPC::ArgumentCoder<FilterEffect>::decode): Deleted.
* Source/WebKit/Shared/WebCoreArgumentCoders.h:
* Source/WebKit/Shared/WebCoreArgumentCoders.serialization.in:

Canonical link: https://commits.webkit.org/271793@main
@webkit-commit-queue
Copy link
Collaborator

Committed 271793@main (edea595): https://commits.webkit.org/271793@main

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

@webkit-commit-queue webkit-commit-queue merged commit edea595 into WebKit:main Dec 9, 2023
@webkit-commit-queue webkit-commit-queue removed the unsafe-merge-queue Applied to send a pull request to merge-queue, but skip building and testing label Dec 9, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
WebKit2 Bugs relating to the WebKit2 API layer
Projects
None yet
7 participants