Skip to content

Move remaining shared WebCore mac files to ../cocoa - #77276

Open
annevk wants to merge 1 commit into
WebKit:mainfrom
annevk:eng/Move-remaining-shared-WebCore-mac-files-to-cocoa
Open

annevk wants to merge 1 commit into
WebKit:mainfrom
annevk:eng/Move-remaining-shared-WebCore-mac-files-to-cocoa

Conversation

@annevk

@annevk annevk commented Oct 16, 2026 •

Copy link
Copy Markdown
Contributor

c53e8b9

Move remaining shared WebCore mac files to ../cocoa
https://bugs.webkit.org/show_bug.cgi?id=327831
rdar://190224649

Reviewed by NOBODY (OOPS!).

Make it more self-evident which files are actually shared across ports.

All of these are compiled into the iOS build with code of their own, which
309708@main and related changes did not cover. This empties loader/mac and
history/mac.

SerializedPlatformDataCueMac becomes SerializedPlatformDataCueCocoa, and
FrameSelectionCocoa.mm guards its Mac-only part with PLATFORM(MAC) instead
of !PLATFORM(IOS_FAMILY). Addresses some of the style nits as well.

AudioSampleDataSource.mm drops an unused `using namespace JSC;`, which
leaked into SerializedPlatformDataCueCocoa.mm in the CMake build's larger
unified bundles and made JSValue ambiguous.

c53e8b9

Misc iOS, visionOS, tvOS & watchOS macOS Linux Windows Apple Internal
✅ 🧪 style ✅ 🛠 ios ✅ 🛠 mac ✅ 🛠 wpe ✅ 🛠 win ⏳ 🛠 ios-apple
✅ 🧪 bindings ✅ 🛠 ios-sim ✅ 🛠 mac-AS-debug ✅ 🧪 wpe-wk2 ⏳ 🧪 win-tests ⏳ 🛠 mac-apple
✅ 🧪 webkitperl ✅ 🧪 ios-wk2 loading 🧪 api-mac ✅ 🧪 api-wpe ⏳ 🛠 vision-apple
✅ 🧪 ios-wk2-wpt ⏳ 🧪 api-mac-debug
⏳ 🧪 api-ios ✅ 🧪 mac-wk2 ✅ 🛠 gtk3-gcc
⏳ 🛠 ios-safer-cpp ⏳ 🧪 mac-AS-debug-wk2 ✅ 🛠 gtk
✅ 🛠 vision ✅ 🧪 gtk-wk2
✅ 🛠 vision-sim ⏳ 🧪 mac-intel-wk2 ✅ 🧪 api-gtk
✅ 🧪 vision-wk2 ❌ 🛠 mac-safer-cpp ✅ 🛠 playstation
✅ 🛠 tv ✅ 🧪 mac-site-isolation
⏳ 🛠 tv-sim
✅ 🛠 watch
✅ 🛠 watch-sim

@annevk
annevk requested review from a team, cdumez and rniwa as code owners October 16, 2026 14:33
@annevk annevk self-assigned this Oct 16, 2026
@annevk annevk added the WebCore Misc. For miscellaneous bugs in the WebCore framework (and not JavaScriptCore or WebKit). label Oct 16, 2026
@webkit-ews-buildbot webkit-ews-buildbot added the merging-blocked Applied to prevent a change from being merged label Oct 16, 2026
https://bugs.webkit.org/show_bug.cgi?id=327831
rdar://190224649

Reviewed by NOBODY (OOPS!).

Make it more self-evident which files are actually shared across ports.

All of these are compiled into the iOS build with code of their own, which
309708@main and related changes did not cover. This empties loader/mac and
history/mac.

SerializedPlatformDataCueMac becomes SerializedPlatformDataCueCocoa, and
FrameSelectionCocoa.mm guards its Mac-only part with PLATFORM(MAC) instead
of !PLATFORM(IOS_FAMILY). Addresses some of the style nits as well.

AudioSampleDataSource.mm drops an unused `using namespace JSC;`, which
leaked into SerializedPlatformDataCueCocoa.mm in the CMake build's larger
unified bundles and made JSValue ambiguous.
@annevk annevk removed the merging-blocked Applied to prevent a change from being merged label Oct 16, 2026
@annevk
annevk force-pushed the eng/Move-remaining-shared-WebCore-mac-files-to-cocoa branch from ea8895f to c53e8b9 Compare October 16, 2026 15:19
@annevk annevk added the safe-merge-queue Applied to automatically send a pull-request to merge-queue after passing EWS checks label Oct 16, 2026
@webkit-ews-buildbot

Copy link
Copy Markdown
Collaborator

macOS Safer C++ Build #140358 (c53e8b9)

❌ Found 1 failing file with 1 issue. Please address these issues before landing. See WebKit Guidelines for Safer C++ Programming.
(cc @rniwa)

@webkit-ews-buildbot webkit-ews-buildbot added the merging-blocked Applied to prevent a change from being merged label Oct 16, 2026
@annevk annevk removed the safe-merge-queue Applied to automatically send a pull-request to merge-queue after passing EWS checks label Oct 16, 2026
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

merging-blocked Applied to prevent a change from being merged WebCore Misc. For miscellaneous bugs in the WebCore framework (and not JavaScriptCore or WebKit).

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants