Branch: refs/heads/main
Home: https://github.com/WebKit/WebKit
Commit: 53774f8c458f0109c18d3d44fc3d0267ddc1da95
https://github.com/WebKit/WebKit/commit/53774f8c458f0109c18d3d44fc3d0267ddc1da95
Author: Zak Ridouh <[email protected]>
Date: 2026-07-20 (Mon, 20 Jul 2026)
Changed paths:
M Source/WebKit/WebProcess/WebPage/Cocoa/PositionInformationForWebPage.h
M Source/WebKit/WebProcess/WebPage/Cocoa/PositionInformationForWebPage.mm
M Source/WebKit/WebProcess/WebPage/Cocoa/WebPageCocoa.mm
Log Message:
-----------
Dedupe windowWithDoubleClickEventListener to fix CMake macOS unified build
https://bugs.webkit.org/show_bug.cgi?id=319800
rdar://182686777
Reviewed by Elliott Williams.
windowWithDoubleClickEventListener() was defined as a file-local static
in both PositionInformationForWebPage.mm (pre-existing) and
WebPageCocoa.mm (added by c3785b72e0af, bug 319777). The two definitions
are identical. CMake's unified-source build bundles both .mm files into
the same translation unit (UnifiedSource-WebProcess-1-nonARC.mm), so the
duplicate static triggers a "redefinition" compile error. Xcode groups
the two files into different unified bundles, which is why the collision
was not caught before landing.
Declare the helper once in PositionInformationForWebPage.h, keep a single
external-linkage definition in PositionInformationForWebPage.mm, and
remove the duplicate from WebPageCocoa.mm (which already imports that
header). No behavior change.
* Source/WebKit/WebProcess/WebPage/Cocoa/PositionInformationForWebPage.h:
* Source/WebKit/WebProcess/WebPage/Cocoa/PositionInformationForWebPage.mm:
(WebKit::windowWithDoubleClickEventListener):
* Source/WebKit/WebProcess/WebPage/Cocoa/WebPageCocoa.mm:
(WebKit::windowWithDoubleClickEventListener): Deleted.
Canonical link: https://commits.webkit.org/317548@main
To unsubscribe from these emails, change your notification settings at
https://github.com/WebKit/WebKit/settings/notifications
