Generate serialization of NSShadow #24079

ddkilzer · 2024-02-08T17:31:08Z

`c7ecac1`

Generate serialization of NSShadow
https://bugs.webkit.org/show_bug.cgi?id=268963
<rdar://107553244>

Reviewed by Brady Eidson.

* Source/WebCore/PAL/pal/ios/UIKitSoftLink.mm:
- Export PAL::getNSShadowClass() for use in WebKit.

* Source/WebKit/DerivedSources-input.xcfilelist:
* Source/WebKit/DerivedSources.make:
- Add CoreIPCNSShadow.serialization.in.
* Source/WebKit/Shared/Cocoa/ArgumentCodersCocoa.h:
- Add predeclaration for NSShadow class.
- Add NSShadow to enum class NSType.
(IPC::getClass<PlatformColor>): Add.
(IPC::getClass<NSShadow>): Add.
* Source/WebKit/Shared/Cocoa/ArgumentCodersCocoa.mm:
(IPC::getClass<PlatformColor>): Add.
- Provide method to get UIColor.class since it's soft-linked on
  non-AppKit platforms.
(IPC::getClass<NSShadow>): Add.
- Provide method to get NSShadow.class since it's soft-linked on
  non-AppKit platforms.
(IPC::typeFromObject):
- Switch from WebCore::CocoaColor to PlatformColorClass.
- Update to handle NSShadow.
(IPC::shouldEnableStrictMode):
- Remove reference to NSShadow.
* Source/WebKit/Shared/Cocoa/CoreIPCNSCFObject.h:
* Source/WebKit/Shared/Cocoa/CoreIPCNSCFObject.mm:
(WebKit::valueFromID):
- Add CoreIPCNSShadow.
* Source/WebKit/Shared/Cocoa/CoreIPCNSShadow.h: Copied from Source/WebKit/Shared/Cocoa/CoreIPCTypes.h.
(WebKit::CoreIPCNSShadow::CoreIPCNSShadow):
* Source/WebKit/Shared/Cocoa/CoreIPCNSShadow.mm: Copied from Source/WebKit/Shared/Cocoa/CoreIPCTypes.h.
(WebKit::CoreIPCNSShadow::CoreIPCNSShadow):
(WebKit::CoreIPCNSShadow::toID const):
* Source/WebKit/Shared/Cocoa/CoreIPCNSShadow.serialization.in: Added.
* Source/WebKit/Shared/Cocoa/CoreIPCTypes.h:
- Include CoreIPCNSShadow.h.
* Source/WebKit/WebKit.xcodeproj/project.pbxproj:
- Add CoreIPCNSShadow.* files to the project.

* Tools/TestWebKitAPI/Tests/IPC/IPCSerialization.mm:
(ObjCHolderForTesting::encode const):
- Add RetainPtr<NSShadow> to variant for testing.
(runTestNS):
(runTestCFWithExpectedResult):
(runTestCF):
- Change lambdas to static functions so we could start to break apart
  the IPC.Serialization.Basic test, which is way too big.
(TEST(IPCSerialization, Basic)):
- Move lambdas out of of this test function.
(TEST(IPCSerialization, NSShadow)): Add.
- Test serialization of NSShadow.
(TEST(IPCSerialization, SecureCoding)):
- Remove duplicate runTestNS lambda.

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

9cf09a2

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
	~~🛠 watch~~
✅ 🛠 🧪 unsafe-merge	~~🛠 watch-sim~~

Source/WebKit/Shared/Cocoa/CoreIPCNSShadow.h

webkit-early-warning-system · 2024-02-08T17:34:51Z

EWS run on previous version of this PR (hash 213e84b)

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

webkit-early-warning-system · 2024-02-09T03:08:57Z

EWS run on current version of this PR (hash 3493fda)

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
⏳ 🧪 webkitpy	🧪 ios-wk2-wpt	⏳ 🧪 mac-wk1	🛠 gtk
⏳ 🛠 🧪 jsc	🧪 api-ios	⏳ 🧪 mac-wk2	🧪 gtk-wk2
⏳ 🛠 🧪 jsc-arm64	⏳ 🛠 tv	🧪 mac-AS-debug-wk2	🧪 api-gtk
🧪 services	⏳ 🛠 tv-sim	⏳ 🧪 mac-wk2-stress	⏳ 🛠 jsc-armv7
	⏳ 🛠 watch		⏳ 🧪 jsc-armv7-tests
	⏳ 🛠 watch-sim

webkit-early-warning-system · 2024-02-09T03:08:58Z

EWS run on previous version of this PR (hash 3493fda)

Misc	iOS, tvOS & watchOS	macOS	Linux	Windows
❌ 🧪 style	❌ 🛠 ios	~~🛠 mac~~	✅ 🛠 wpe	~~🛠 wincairo~~
	❌ 🛠 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~~	~~🧪 mac-wk2-stress~~
	~~🛠 watch~~
	~~🛠 watch-sim~~

webkit-early-warning-system · 2024-02-09T03:19:33Z

EWS run on current version of this PR (hash d2d4175)

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
⏳ 🧪 webkitpy	🧪 ios-wk2-wpt	⏳ 🧪 mac-wk1	🛠 gtk
⏳ 🛠 🧪 jsc	🧪 api-ios	⏳ 🧪 mac-wk2	🧪 gtk-wk2
⏳ 🛠 🧪 jsc-arm64	⏳ 🛠 tv	🧪 mac-AS-debug-wk2	🧪 api-gtk
🧪 services	⏳ 🛠 tv-sim	⏳ 🧪 mac-wk2-stress	⏳ 🛠 jsc-armv7
	⏳ 🛠 watch		⏳ 🧪 jsc-armv7-tests
	⏳ 🛠 watch-sim

webkit-early-warning-system · 2024-02-09T03:19:33Z

EWS run on previous version of this PR (hash d2d4175)

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

webkit-early-warning-system · 2024-02-09T04:42:50Z

EWS run on previous version of this PR (hash fce2df9)

Misc	iOS, tvOS & watchOS	macOS	Linux	Windows
✅ 🧪 style	❌ 🛠 ios	~~🛠 mac~~	✅ 🛠 wpe	~~🛠 wincairo~~
	❌ 🛠 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~~	~~🧪 mac-wk2-stress~~
	~~🛠 watch~~
	~~🛠 watch-sim~~

webkit-early-warning-system · 2024-02-09T05:10:27Z

Starting EWS tests for 9d69f7f. Live statuses available at the PR page, #24079

webkit-early-warning-system · 2024-02-09T05:10:28Z

EWS run on previous version of this PR (hash 9d69f7f)

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

webkit-early-warning-system · 2024-02-09T05:41:12Z

EWS run on previous version of this PR (hash 36b2aba)

Misc	iOS, tvOS & watchOS	macOS	Linux	Windows
✅ 🧪 style	❌ 🛠 ios	~~🛠 mac~~	~~🛠 wpe~~	~~🛠 wincairo~~
	❌ 🛠 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~~	~~🧪 mac-wk2-stress~~
	~~🛠 watch~~
	~~🛠 watch-sim~~

webkit-early-warning-system · 2024-02-09T15:51:09Z

EWS run on previous version of this PR (hash 23980a5)

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

webkit-early-warning-system · 2024-02-10T00:01:49Z

EWS run on previous version of this PR (hash d6d0cc8)

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
	✅ 🛠 watch
	~~🛠 watch-sim~~

webkit-early-warning-system · 2024-02-10T01:50:14Z

EWS run on previous version of this PR (hash 7133fe4)

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~~
	~~🛠 watch~~
	~~🛠 watch-sim~~

webkit-early-warning-system · 2024-02-10T01:59:21Z

EWS run on previous version of this PR (hash 12a3f25)

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~~
	~~🛠 watch~~
	~~🛠 watch-sim~~

webkit-early-warning-system · 2024-02-10T02:18:32Z

EWS run on previous version of this PR (hash 7082b84)

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
	✅ 🛠 watch
	✅ 🛠 watch-sim

ddkilzer · 2024-02-10T16:27:53Z

This is interesting. The test passes on macOS with NSColor, but fails on iOS with UIColor:

{
    "Skipped": [],
    "Failed": [
        {
            "name": "TestIPC.IPCSerialization.NSShadow",
            "output": "/Volumes/Data/worker/iOS-17-Simulator-Build-EWS/build/Tools/TestWebKitAPI/Tests/IPC/IPCSerialization.mm:760Value of: holder == result  Actual: falseExpected: true\n"
        }
    ],
    "Crashed": [],
    "Timedout": []
}

webkit-early-warning-system · 2024-02-16T18:05:21Z

EWS run on current version of this PR (hash 9cf09a2)

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
	~~🛠 watch~~
✅ 🛠 🧪 unsafe-merge	~~🛠 watch-sim~~

achristensen07 · 2024-02-16T18:47:06Z

Source/WebKit/Shared/Cocoa/ArgumentCodersCocoa.h

@@ -31,6 +31,7 @@
 #if PLATFORM(COCOA)

 #import "WKKeyedCoder.h"
+#import <WebCore/AttributedString.h>


This is a lot to include just for the definition of PlatformColor

https://bugs.webkit.org/show_bug.cgi?id=268963 <rdar://107553244> Reviewed by Brady Eidson. * Source/WebCore/PAL/pal/ios/UIKitSoftLink.mm: - Export PAL::getNSShadowClass() for use in WebKit. * Source/WebKit/DerivedSources-input.xcfilelist: * Source/WebKit/DerivedSources.make: - Add CoreIPCNSShadow.serialization.in. * Source/WebKit/Shared/Cocoa/ArgumentCodersCocoa.h: - Add predeclaration for NSShadow class. - Add NSShadow to enum class NSType. (IPC::getClass<PlatformColor>): Add. (IPC::getClass<NSShadow>): Add. * Source/WebKit/Shared/Cocoa/ArgumentCodersCocoa.mm: (IPC::getClass<PlatformColor>): Add. - Provide method to get UIColor.class since it's soft-linked on non-AppKit platforms. (IPC::getClass<NSShadow>): Add. - Provide method to get NSShadow.class since it's soft-linked on non-AppKit platforms. (IPC::typeFromObject): - Switch from WebCore::CocoaColor to PlatformColorClass. - Update to handle NSShadow. (IPC::shouldEnableStrictMode): - Remove reference to NSShadow. * Source/WebKit/Shared/Cocoa/CoreIPCNSCFObject.h: * Source/WebKit/Shared/Cocoa/CoreIPCNSCFObject.mm: (WebKit::valueFromID): - Add CoreIPCNSShadow. * Source/WebKit/Shared/Cocoa/CoreIPCNSShadow.h: Copied from Source/WebKit/Shared/Cocoa/CoreIPCTypes.h. (WebKit::CoreIPCNSShadow::CoreIPCNSShadow): * Source/WebKit/Shared/Cocoa/CoreIPCNSShadow.mm: Copied from Source/WebKit/Shared/Cocoa/CoreIPCTypes.h. (WebKit::CoreIPCNSShadow::CoreIPCNSShadow): (WebKit::CoreIPCNSShadow::toID const): * Source/WebKit/Shared/Cocoa/CoreIPCNSShadow.serialization.in: Added. * Source/WebKit/Shared/Cocoa/CoreIPCTypes.h: - Include CoreIPCNSShadow.h. * Source/WebKit/WebKit.xcodeproj/project.pbxproj: - Add CoreIPCNSShadow.* files to the project. * Tools/TestWebKitAPI/Tests/IPC/IPCSerialization.mm: (ObjCHolderForTesting::encode const): - Add RetainPtr<NSShadow> to variant for testing. (runTestNS): (runTestCFWithExpectedResult): (runTestCF): - Change lambdas to static functions so we could start to break apart the IPC.Serialization.Basic test, which is way too big. (TEST(IPCSerialization, Basic)): - Move lambdas out of of this test function. (TEST(IPCSerialization, NSShadow)): Add. - Test serialization of NSShadow. (TEST(IPCSerialization, SecureCoding)): - Remove duplicate runTestNS lambda. Canonical link: https://commits.webkit.org/274870@main

webkit-commit-queue · 2024-02-16T20:32:35Z

Committed 274870@main (c7ecac1): https://commits.webkit.org/274870@main

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

ddkilzer self-assigned this Feb 8, 2024

ddkilzer added the WebKit2 Bugs relating to the WebKit2 API layer label Feb 8, 2024

ddkilzer requested review from achristensen07 and beidson February 8, 2024 17:32

ddkilzer marked this pull request as draft February 8, 2024 17:32

ddkilzer commented Feb 8, 2024

View reviewed changes

Source/WebKit/Shared/Cocoa/CoreIPCNSShadow.h Outdated Show resolved Hide resolved

webkit-ews-buildbot added the merging-blocked Applied to prevent a change from being merged label Feb 8, 2024