Branch: refs/heads/main
  Home:   https://github.com/WebKit/WebKit
  Commit: a5e93ee0a9dc6ef8cab18418510e2c5035b13343
      
https://github.com/WebKit/WebKit/commit/a5e93ee0a9dc6ef8cab18418510e2c5035b13343
  Author: Alex Christensen <achristen...@apple.com>
  Date:   2025-08-27 (Wed, 27 Aug 2025)

  Changed paths:
    M Source/WebCore/bindings/js/DOMWrapperWorld.h
    M Source/WebCore/page/LocalDOMWindow.cpp
    M Source/WebCore/page/WebKitJSHandle.idl
    M Source/WebCore/page/WebKitNamespace.idl
    M Source/WebCore/page/WebKitSerializedNode.idl
    M Source/WebKit/Shared/ContentWorldData.serialization.in
    M Source/WebKit/Shared/ContentWorldShared.h
    M Source/WebKit/UIProcess/API/APIContentWorld.h
    M Source/WebKit/UIProcess/API/Cocoa/WKContentWorld.mm
    M Source/WebKit/UIProcess/API/Cocoa/_WKContentWorldConfiguration.h
    M Source/WebKit/WebProcess/InjectedBundle/InjectedBundleScriptWorld.cpp
    M Source/WebKit/WebProcess/InjectedBundle/InjectedBundleScriptWorld.h
    M Source/WebKit/WebProcess/UserContent/WebUserContentController.cpp
    M Source/WebKit/WebProcess/WebPage/WebPage.cpp
    M Tools/TestWebKitAPI/Tests/WebKitCocoa/JSHandle.mm
    M Tools/TestWebKitAPI/Tests/WebKitCocoa/SerializedNode.mm

  Log Message:
  -----------
  Re-merge 298725@main
https://bugs.webkit.org/show_bug.cgi?id=297989
rdar://159308797

Unreviewed.

It was reverted in 298733@main because it broke the internal builds.
I fixed that by replacing this:
WK_API_AVAILABLE(WK_MAC_TBA, WK_IOS_TBA, WK_XROS_TBA)
with this:
WK_API_AVAILABLE(macos(WK_MAC_TBA), ios(WK_IOS_TBA), visionos(WK_XROS_TBA))

* Source/WebCore/bindings/js/DOMWrapperWorld.h:
(WebCore::DOMWrapperWorld::allowJSHandleCreation const):
(WebCore::DOMWrapperWorld::setAllowJSHandleCreation):
(WebCore::DOMWrapperWorld::setAllowNodeSerialization):
(WebCore::DOMWrapperWorld::allowNodeSerialization const):
(WebCore::DOMWrapperWorld::setNodeInfoEnabled): Deleted.
(WebCore::DOMWrapperWorld::nodeInfoEnabled const): Deleted.
* Source/WebCore/page/LocalDOMWindow.cpp:
(WebCore::LocalDOMWindow::shouldHaveWebKitNamespaceForWorld):
* Source/WebCore/page/WebKitJSHandle.idl:
* Source/WebCore/page/WebKitNamespace.idl:
* Source/WebCore/page/WebKitSerializedNode.idl:
* Source/WebKit/Shared/ContentWorldData.serialization.in:
* Source/WebKit/Shared/ContentWorldShared.h:
* Source/WebKit/UIProcess/API/APIContentWorld.h:
* Source/WebKit/UIProcess/API/Cocoa/WKContentWorld.mm:
(+[WKContentWorld _worldWithConfiguration:]):
* Source/WebKit/UIProcess/API/Cocoa/_WKContentWorldConfiguration.h:
* Source/WebKit/WebProcess/InjectedBundle/InjectedBundleScriptWorld.cpp:
(WebKit::InjectedBundleScriptWorld::setAllowJSHandleCreation):
(WebKit::InjectedBundleScriptWorld::setAllowNodeSerialization):
(WebKit::InjectedBundleScriptWorld::setNodeInfoEnabled): Deleted.
* Source/WebKit/WebProcess/InjectedBundle/InjectedBundleScriptWorld.h:
* Source/WebKit/WebProcess/UserContent/WebUserContentController.cpp:
(WebKit::WebUserContentController::addContentWorld):
* Source/WebKit/WebProcess/WebPage/WebPage.cpp:
(WebKit::m_textAnimationController):
* Tools/TestWebKitAPI/Tests/WebKitCocoa/JSHandle.mm:
(TestWebKitAPI::TEST(JSHandle, Basic)):
* Tools/TestWebKitAPI/Tests/WebKitCocoa/SerializedNode.mm:
(TestWebKitAPI::TEST(SerializedNode, Basic)):

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



To unsubscribe from these emails, change your notification settings at 
https://github.com/WebKit/WebKit/settings/notifications
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to