[webkit-changes] [WebKit/WebKit] 9a4085: [WebXR] Port PlatformXR::FrameData to new serializ...

Dan Glastonbury noreply at github.com
Mon Dec 11 21:46:59 PST 2023


  Branch: refs/heads/main
  Home:   https://github.com/WebKit/WebKit
  Commit: 9a4085b2914ed55f4dd95684333d61c8511faa14
      https://github.com/WebKit/WebKit/commit/9a4085b2914ed55f4dd95684333d61c8511faa14
  Author: Dan Glastonbury <djg at apple.com>
  Date:   2023-12-11 (Mon, 11 Dec 2023)

  Changed paths:
    M Source/WebCore/Modules/webxr/WebXRFrame.cpp
    M Source/WebCore/Modules/webxr/WebXRFrame.h
    M Source/WebCore/Modules/webxr/WebXRGamepad.cpp
    M Source/WebCore/Modules/webxr/WebXRGamepad.h
    M Source/WebCore/Modules/webxr/WebXRHand.cpp
    M Source/WebCore/Modules/webxr/WebXRHand.h
    M Source/WebCore/Modules/webxr/WebXRInputSource.cpp
    M Source/WebCore/Modules/webxr/WebXRInputSource.h
    M Source/WebCore/Modules/webxr/WebXRInputSourceArray.h
    M Source/WebCore/Modules/webxr/WebXRInputSpace.cpp
    M Source/WebCore/Modules/webxr/WebXRInputSpace.h
    M Source/WebCore/Modules/webxr/WebXRJointSpace.cpp
    M Source/WebCore/Modules/webxr/WebXRJointSpace.h
    M Source/WebCore/Modules/webxr/WebXRLayer.h
    M Source/WebCore/Modules/webxr/WebXROpaqueFramebuffer.cpp
    M Source/WebCore/Modules/webxr/WebXROpaqueFramebuffer.h
    M Source/WebCore/Modules/webxr/WebXRSession.cpp
    M Source/WebCore/Modules/webxr/WebXRSession.h
    M Source/WebCore/Modules/webxr/WebXRSystem.cpp
    M Source/WebCore/Modules/webxr/WebXRWebGLLayer.cpp
    M Source/WebCore/Modules/webxr/WebXRWebGLLayer.h
    M Source/WebCore/platform/xr/PlatformXR.h
    M Source/WebCore/platform/xr/cocoa/PlatformXRPose.cpp
    M Source/WebCore/platform/xr/cocoa/PlatformXRPose.h
    M Source/WebCore/platform/xr/openxr/OpenXRInput.cpp
    M Source/WebCore/platform/xr/openxr/OpenXRInput.h
    M Source/WebCore/platform/xr/openxr/OpenXRInputSource.cpp
    M Source/WebCore/platform/xr/openxr/OpenXRInputSource.h
    M Source/WebCore/platform/xr/openxr/OpenXRLayer.cpp
    M Source/WebCore/platform/xr/openxr/OpenXRLayer.h
    M Source/WebCore/platform/xr/openxr/OpenXRUtils.h
    M Source/WebCore/platform/xr/openxr/PlatformXROpenXR.cpp
    M Source/WebCore/platform/xr/openxr/PlatformXROpenXR.h
    M Source/WebCore/testing/WebFakeXRDevice.cpp
    M Source/WebCore/testing/WebFakeXRDevice.h
    M Source/WebCore/testing/WebFakeXRInputController.cpp
    M Source/WebCore/testing/WebFakeXRInputController.h
    M Source/WebKit/CMakeLists.txt
    M Source/WebKit/DerivedSources-input.xcfilelist
    M Source/WebKit/DerivedSources.make
    M Source/WebKit/Scripts/webkit/messages.py
    A Source/WebKit/Shared/XR/PlatformXR.serialization.in
    M Source/WebKit/Shared/XR/XRSystem.serialization.in
    M Source/WebKit/UIProcess/XR/PlatformXRSystem.cpp
    M Source/WebKit/UIProcess/XR/PlatformXRSystem.h
    M Source/WebKit/UIProcess/XR/PlatformXRSystem.messages.in
    M Source/WebKit/UIProcess/XR/ios/PlatformXRARKit.mm
    M Source/WebKit/UIProcess/XR/ios/WKARPresentationSession.h
    M Source/WebKit/UIProcess/XR/ios/WKARPresentationSession.mm
    M Source/WebKit/WebKit.xcodeproj/project.pbxproj

  Log Message:
  -----------
  [WebXR] Port PlatformXR::FrameData to new serialization format
https://bugs.webkit.org/show_bug.cgi?id=266202
rdar://119474838

Reviewed by Brady Eidson.

Port PlatformXR::FrameData and it's related member structs to use automatically
generated IPC serialization and remove the explicit encode/decode functions.

Due to constraints imposed by generate-serializers.py,
PlatformXR::Device::FrameData has been moved to PlatformXR::FrameData.

* Source/WebCore/Modules/webxr/WebXRFrame.cpp:
(WebCore::WebXRFrame::getViewerPose):
(WebCore::WebXRFrame::matrixFromPose):
* Source/WebCore/Modules/webxr/WebXRFrame.h:
* Source/WebCore/Modules/webxr/WebXRGamepad.cpp:
(WebCore::WebXRGamepad::WebXRGamepad):
* Source/WebCore/Modules/webxr/WebXRGamepad.h:
* Source/WebCore/Modules/webxr/WebXRHand.cpp:
(WebCore::WebXRHand::updateFromInputSource):
* Source/WebCore/Modules/webxr/WebXRHand.h:
* Source/WebCore/Modules/webxr/WebXRInputSource.cpp:
(WebCore::WebXRInputSource::create):
(WebCore::WebXRInputSource::WebXRInputSource):
(WebCore::WebXRInputSource::update):
* Source/WebCore/Modules/webxr/WebXRInputSource.h:
* Source/WebCore/Modules/webxr/WebXRInputSourceArray.h:
* Source/WebCore/Modules/webxr/WebXRInputSpace.cpp:
(WebCore::WebXRInputSpace::create):
(WebCore::WebXRInputSpace::WebXRInputSpace):
* Source/WebCore/Modules/webxr/WebXRInputSpace.h:
(WebCore::WebXRInputSpace::setPose):
* Source/WebCore/Modules/webxr/WebXRJointSpace.cpp:
(WebCore::WebXRJointSpace::create):
(WebCore::WebXRJointSpace::WebXRJointSpace):
(WebCore::WebXRJointSpace::updateFromJoint):
* Source/WebCore/Modules/webxr/WebXRJointSpace.h:
* Source/WebCore/Modules/webxr/WebXRLayer.h:
* Source/WebCore/Modules/webxr/WebXROpaqueFramebuffer.cpp:
(WebCore::WebXROpaqueFramebuffer::startFrame):
* Source/WebCore/Modules/webxr/WebXROpaqueFramebuffer.h:
* Source/WebCore/Modules/webxr/WebXRSession.cpp:
(WebCore::WebXRSession::sessionDidInitializeInputSources):
(WebCore::WebXRSession::onFrame):
* Source/WebCore/Modules/webxr/WebXRSession.h:
* Source/WebCore/Modules/webxr/WebXRSystem.cpp:
(WebCore::WebXRSystem::DummyInlineDevice::requestFrame):
* Source/WebCore/Modules/webxr/WebXRWebGLLayer.cpp:
(WebCore::WebXRWebGLLayer::startFrame):
* Source/WebCore/Modules/webxr/WebXRWebGLLayer.h:
* Source/WebCore/platform/xr/PlatformXR.h:
(PlatformXR::FrameData::copy const):
(PlatformXR::Device::FrameData::FloatQuaternion::encode const): Deleted.
(PlatformXR::Device::FrameData::FloatQuaternion::decode): Deleted.
(PlatformXR::Device::FrameData::Pose::encode const): Deleted.
(PlatformXR::Device::FrameData::Pose::decode): Deleted.
(PlatformXR::Device::FrameData::Fov::encode const): Deleted.
(PlatformXR::Device::FrameData::Fov::decode): Deleted.
(PlatformXR::Device::FrameData::View::encode const): Deleted.
(PlatformXR::Device::FrameData::View::decode): Deleted.
(PlatformXR::Device::FrameData::StageParameters::encode const): Deleted.
(PlatformXR::Device::FrameData::StageParameters::decode): Deleted.
(PlatformXR::Device::FrameData::LayerData::encode const): Deleted.
(PlatformXR::Device::FrameData::LayerData::decode): Deleted.
(PlatformXR::Device::FrameData::InputSourceButton::encode const): Deleted.
(PlatformXR::Device::FrameData::InputSourceButton::decode): Deleted.
(PlatformXR::Device::FrameData::InputSourcePose::encode const): Deleted.
(PlatformXR::Device::FrameData::InputSourcePose::decode): Deleted.
(PlatformXR::Device::FrameData::InputSourceHandJoint::encode const): Deleted.
(PlatformXR::Device::FrameData::InputSourceHandJoint::decode): Deleted.
(PlatformXR::Device::FrameData::InputSource::encode const): Deleted.
(PlatformXR::Device::FrameData::InputSource::decode): Deleted.
(PlatformXR::Device::FrameData::encode const): Deleted.
(PlatformXR::Device::FrameData::decode): Deleted.
(PlatformXR::Device::FrameData::copy const): Deleted.
* Source/WebCore/platform/xr/cocoa/PlatformXRPose.cpp:
(PlatformXRPose::orientation const):
(PlatformXRPose::pose const):
* Source/WebCore/platform/xr/cocoa/PlatformXRPose.h:
* Source/WebCore/platform/xr/openxr/OpenXRInput.cpp:
(PlatformXR::OpenXRInput::collectInputSources const):
* Source/WebCore/platform/xr/openxr/OpenXRInput.h:
* Source/WebCore/platform/xr/openxr/OpenXRInputSource.cpp:
(PlatformXR::OpenXRInputSource::getInputSource const):
(PlatformXR::OpenXRInputSource::getPose const):
(PlatformXR::OpenXRInputSource::getButton const):
* Source/WebCore/platform/xr/openxr/OpenXRInputSource.h:
* Source/WebCore/platform/xr/openxr/OpenXRLayer.cpp:
(PlatformXR::OpenXRLayerProjection::startFrame):
* Source/WebCore/platform/xr/openxr/OpenXRLayer.h:
* Source/WebCore/platform/xr/openxr/OpenXRUtils.h:
(PlatformXR::XrPosefToPose):
(PlatformXR::xrViewToPose):
* Source/WebCore/platform/xr/openxr/PlatformXROpenXR.cpp:
(PlatformXR::OpenXRDevice::requestFrame):
* Source/WebCore/platform/xr/openxr/PlatformXROpenXR.h:
* Source/WebCore/testing/WebFakeXRDevice.cpp:
(WebCore::FakeXRView::setFieldOfView):
(WebCore::SimulatedXRDevice::setViews):
(WebCore::SimulatedXRDevice::setViewerOrigin):
(WebCore::SimulatedXRDevice::frameTimerFired):
(WebCore::WebFakeXRDevice::setViews):
(WebCore::WebFakeXRDevice::parseRigidTransform):
* Source/WebCore/testing/WebFakeXRDevice.h:
* Source/WebCore/testing/WebFakeXRInputController.cpp:
* Source/WebCore/testing/WebFakeXRInputController.h:
* Source/WebKit/CMakeLists.txt:
* Source/WebKit/DerivedSources-input.xcfilelist:
* Source/WebKit/DerivedSources.make:
* Source/WebKit/Scripts/webkit/messages.py:
(headers_for_type):
* Source/WebKit/Shared/XR/PlatformXR.serialization.in: Added.
* Source/WebKit/Shared/XR/XRSystem.serialization.in:
* Source/WebKit/UIProcess/XR/PlatformXRSystem.cpp:
(WebKit::PlatformXRSystem::requestFrame):
* Source/WebKit/UIProcess/XR/PlatformXRSystem.h:
* Source/WebKit/UIProcess/XR/PlatformXRSystem.messages.in:
* Source/WebKit/UIProcess/XR/ios/PlatformXRARKit.mm:
(WebKit::ARKitCoordinator::renderLoop):
* Source/WebKit/UIProcess/XR/ios/WKARPresentationSession.h:
* Source/WebKit/UIProcess/XR/ios/WKARPresentationSession.mm:
(-[_WKARPresentationSession collectInputSources]):
(-[_WKTransientGestureRecognizer _platformXRInputSourceFromTransientAction:actionIdentifier:]):
(-[_WKTransientGestureRecognizer collectInputSources]):
* Source/WebKit/WebKit.xcodeproj/project.pbxproj:

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




More information about the webkit-changes mailing list