Branch: refs/heads/main
Home: https://github.com/WebKit/WebKit
Commit: 22cf38e52362dfec24edcbeb57e472db7dd5b61d
https://github.com/WebKit/WebKit/commit/22cf38e52362dfec24edcbeb57e472db7dd5b61d
Author: Sam Weinig <[email protected]>
Date: 2025-10-14 (Tue, 14 Oct 2025)
Changed paths:
M Source/WTF/wtf/PlatformEnable.h
M Source/WTF/wtf/PlatformEnableCocoa.h
M Source/WTF/wtf/PlatformHave.h
M Source/WebCore/Headers.cmake
M Source/WebCore/Modules/model-element/DDModelPlayer.h
M Source/WebCore/Modules/model-element/DDModelPlayer.mm
M Source/WebCore/Modules/model-element/HTMLModelElement.cpp
M Source/WebCore/Modules/model-element/HTMLModelElement.h
M Source/WebCore/Modules/model-element/HTMLModelElement.idl
M Source/WebCore/Modules/model-element/ModelPlayer.cpp
M Source/WebCore/Modules/model-element/ModelPlayer.h
A Source/WebCore/Modules/model-element/ModelPlayerAccessibilityChildren.h
M Source/WebCore/Modules/model-element/ModelPlayerClient.h
A Source/WebCore/Modules/model-element/ModelPlayerIdentifier.h
M Source/WebCore/Modules/model-element/ModelPlayerTransformState.h
M Source/WebCore/Modules/model-element/PlaceholderModelPlayer.cpp
M Source/WebCore/Modules/model-element/PlaceholderModelPlayer.h
M Source/WebCore/Modules/model-element/dummy/DummyModelPlayer.cpp
M Source/WebCore/Modules/model-element/dummy/DummyModelPlayer.h
M Source/WebCore/Modules/model-element/scenekit/SceneKitModelPlayer.h
M Source/WebCore/Modules/model-element/scenekit/SceneKitModelPlayer.mm
M Source/WebCore/WebCore.xcodeproj/project.pbxproj
M Source/WebCore/accessibility/AXCoreObject.h
M Source/WebCore/accessibility/AccessibilityObject.cpp
M Source/WebCore/accessibility/AccessibilityObject.h
M Source/WebCore/accessibility/ios/WebAccessibilityObjectWrapperIOS.mm
M Source/WebCore/accessibility/isolatedtree/AXIsolatedObject.cpp
M Source/WebCore/accessibility/isolatedtree/AXIsolatedObject.h
M Source/WebCore/accessibility/mac/WebAccessibilityObjectWrapperMac.mm
M Source/WebCore/page/ChromeClient.h
M Source/WebCore/page/DragController.cpp
M Source/WebCore/page/EventHandler.h
M Source/WebCore/page/StageModeOperations.h
M Source/WebCore/page/ios/EventHandlerIOS.mm
M Source/WebCore/platform/DragItem.h
M Source/WebCore/platform/graphics/GraphicsLayer.h
R Source/WebCore/platform/graphics/ModelPlayerIdentifier.h
M Source/WebCore/platform/graphics/ca/GraphicsLayerCA.cpp
M Source/WebCore/platform/graphics/ca/GraphicsLayerCA.h
M Source/WebCore/rendering/RenderLayerBacking.cpp
M Source/WebCore/rendering/RenderModel.cpp
M Source/WebKit/GPUProcess/graphics/Model/ModelObjectHeap.cpp
M Source/WebKit/GPUProcess/graphics/Model/ModelObjectHeap.h
M Source/WebKit/GPUProcess/graphics/Model/RemoteDDMesh.cpp
M Source/WebKit/GPUProcess/graphics/Model/RemoteDDMesh.h
M Source/WebKit/GPUProcess/graphics/Model/RemoteDDMesh.messages.in
M Source/WebKit/GPUProcess/graphics/WebGPU/RemoteGPU.cpp
M Source/WebKit/GPUProcess/graphics/WebGPU/RemoteGPU.messages.in
M Source/WebKit/ModelProcess/cocoa/ModelProcessModelPlayerProxy.h
M Source/WebKit/ModelProcess/cocoa/ModelProcessModelPlayerProxy.mm
M Source/WebKit/WebProcess/GPU/graphics/Model/RemoteDDMeshProxy.cpp
M Source/WebKit/WebProcess/GPU/graphics/WebGPU/RemoteGPUProxy.cpp
M Source/WebKit/WebProcess/Model/ARKitInlinePreviewModelPlayer.h
M Source/WebKit/WebProcess/Model/ARKitInlinePreviewModelPlayer.mm
M Source/WebKit/WebProcess/Model/ModelProcessModelPlayer.cpp
M Source/WebKit/WebProcess/Model/ModelProcessModelPlayer.h
M Source/WebKit/WebProcess/Model/WebModelPlayerProvider.cpp
Log Message:
-----------
[Model Cleanup] Cleanup Model #ifdefs
https://bugs.webkit.org/show_bug.cgi?id=300587
Reviewed by Mike Wyrzykowski.
As a first pass at cleaning up the model code, this replaces #ifdefs
like ENABLE(MODEL_PROCESS), which WebCore should not know about, with
feature specific macros. Specifically, we add:
- ENABLE(MODEL_CONTEXT)
- ENABLE(MODEL_ELEMENT_ACCESSIBILITY)
- ENABLE(MODEL_ELEMENT_ANIMATIONS_CONTROL)
- ENABLE(MODEL_ELEMENT_BOUNDING_BOX)
- ENABLE(MODEL_ELEMENT_ENTITY_TRANSFORM)
- ENABLE(MODEL_ELEMENT_ENVIRONMENT_MAP)
- ENABLE(MODEL_ELEMENT_PORTAL)
- ENABLE(MODEL_ELEMENT_STAGE_MODE)
- ENABLE(MODEL_ELEMENT_STAGE_MODE_INTERACTION)
Additionally:
- The ModelPlayer::identifier() and ModelPlayerClient::didUnload() functions
have been made unconditional, as they are universally implementable.
- The model accessibility children type has been abstracted into a new
struct, ModelPlayerAccessibilityChildren to remove cocoa specific types
from the model interfaces.
- ENABLE(GPUP_MODEL) has been renamed ENABLE(GPU_PROCESS_MODEL) to be
consistent with other GPU Process enable macros.
- Fixed some sorting issues in wtf/Platform* headers.
- Added FIXMEs for improper use of ENALBE macros in PlatformHave.h
- Fixed define for HAVE_SCENEKIT back to 1.
- Moved ModelPlayerIdentifier out of platform and into Modules/model-element
to be next to ModelPlayer and friends.
There remains more to do in follow ups:
- Remove usage of ENABLE(GPU_PROCESS_MODEL) in WebCore. This probably means
moving all the DD prefixed code to WebKit.
- Add better runtime settings for use by HTMLModelElement.idl. It currently
uses `EnabledBySetting=ModelProcessEnabled` which is improper.
* Source/WTF/wtf/PlatformEnable.h:
* Source/WTF/wtf/PlatformEnableCocoa.h:
* Source/WTF/wtf/PlatformHave.h:
* Source/WebCore/Headers.cmake:
* Source/WebCore/Modules/model-element/DDModelPlayer.h:
* Source/WebCore/Modules/model-element/DDModelPlayer.mm:
* Source/WebCore/Modules/model-element/HTMLModelElement.cpp:
* Source/WebCore/Modules/model-element/HTMLModelElement.h:
* Source/WebCore/Modules/model-element/HTMLModelElement.idl:
* Source/WebCore/Modules/model-element/ModelPlayer.cpp:
* Source/WebCore/Modules/model-element/ModelPlayer.h:
* Source/WebCore/Modules/model-element/ModelPlayerAccessibilityChildren.h:
Added.
* Source/WebCore/Modules/model-element/ModelPlayerClient.h:
* Source/WebCore/Modules/model-element/ModelPlayerIdentifier.h: Renamed from
Source/WebCore/platform/graphics/ModelPlayerIdentifier.h.
* Source/WebCore/Modules/model-element/ModelPlayerTransformState.h:
* Source/WebCore/Modules/model-element/PlaceholderModelPlayer.cpp:
* Source/WebCore/Modules/model-element/PlaceholderModelPlayer.h:
* Source/WebCore/Modules/model-element/dummy/DummyModelPlayer.cpp:
* Source/WebCore/Modules/model-element/dummy/DummyModelPlayer.h:
* Source/WebCore/Modules/model-element/scenekit/SceneKitModelPlayer.h:
* Source/WebCore/Modules/model-element/scenekit/SceneKitModelPlayer.mm:
* Source/WebCore/WebCore.xcodeproj/project.pbxproj:
* Source/WebCore/accessibility/AXCoreObject.h:
* Source/WebCore/accessibility/AccessibilityObject.cpp:
* Source/WebCore/accessibility/AccessibilityObject.h:
* Source/WebCore/accessibility/ios/WebAccessibilityObjectWrapperIOS.mm:
* Source/WebCore/accessibility/isolatedtree/AXIsolatedObject.cpp:
* Source/WebCore/accessibility/isolatedtree/AXIsolatedObject.h:
* Source/WebCore/accessibility/mac/WebAccessibilityObjectWrapperMac.mm:
* Source/WebCore/page/ChromeClient.h:
* Source/WebCore/page/DragController.cpp:
* Source/WebCore/page/EventHandler.h:
* Source/WebCore/page/StageModeOperations.h:
* Source/WebCore/page/ios/EventHandlerIOS.mm:
* Source/WebCore/platform/DragItem.h:
* Source/WebCore/platform/graphics/GraphicsLayer.h:
* Source/WebCore/platform/graphics/ca/GraphicsLayerCA.cpp:
* Source/WebCore/platform/graphics/ca/GraphicsLayerCA.h:
* Source/WebCore/rendering/RenderLayerBacking.cpp:
* Source/WebCore/rendering/RenderModel.cpp:
* Source/WebKit/GPUProcess/graphics/Model/ModelObjectHeap.cpp:
* Source/WebKit/GPUProcess/graphics/Model/ModelObjectHeap.h:
* Source/WebKit/GPUProcess/graphics/Model/RemoteDDMesh.cpp:
* Source/WebKit/GPUProcess/graphics/Model/RemoteDDMesh.h:
* Source/WebKit/GPUProcess/graphics/Model/RemoteDDMesh.messages.in:
* Source/WebKit/GPUProcess/graphics/WebGPU/RemoteGPU.cpp:
* Source/WebKit/GPUProcess/graphics/WebGPU/RemoteGPU.messages.in:
* Source/WebKit/ModelProcess/cocoa/ModelProcessModelPlayerProxy.h:
* Source/WebKit/ModelProcess/cocoa/ModelProcessModelPlayerProxy.mm:
* Source/WebKit/WebProcess/GPU/graphics/Model/RemoteDDMeshProxy.cpp:
* Source/WebKit/WebProcess/GPU/graphics/WebGPU/RemoteGPUProxy.cpp:
* Source/WebKit/WebProcess/Model/ARKitInlinePreviewModelPlayer.h:
* Source/WebKit/WebProcess/Model/ARKitInlinePreviewModelPlayer.mm:
* Source/WebKit/WebProcess/Model/ModelProcessModelPlayer.cpp:
* Source/WebKit/WebProcess/Model/ModelProcessModelPlayer.h:
* Source/WebKit/WebProcess/Model/WebModelPlayerProvider.cpp:
Canonical link: https://commits.webkit.org/301487@main
To unsubscribe from these emails, change your notification settings at
https://github.com/WebKit/WebKit/settings/notifications
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
