Changeset 286023 in webkit

Timestamp:

Nov 18, 2021, 12:58:02 PM (5 years ago)

Author:

graouts@webkit.org

Message:

[Model] add support for getting and setting the camera
​https://bugs.webkit.org/show_bug.cgi?id=233265
<rdar://problem/85426290>

Unreviewed build fix.

Fix the Montery build, making sure we guard calls to the new ARQL SPIs.

• UIProcess/Cocoa/ModelElementControllerCocoa.mm:

(WebKit::ModelElementController::getCameraForModelElement):
(WebKit::ModelElementController::setCameraForModelElement):

Location:

trunk/Source/WebKit

Files:

• ChangeLog (modified) (1 diff)
• UIProcess/Cocoa/ModelElementControllerCocoa.mm (modified) (3 diffs)

trunk/Source/WebKit/ChangeLog

@@ +1 @@
+2021-11-18  Antoine Quint  <graouts@webkit.org>
+
+        [Model] add support for getting and setting the camera
+        https://bugs.webkit.org/show_bug.cgi?id=233265
+        <rdar://problem/85426290>
+
+        Unreviewed build fix.
+
+        Fix the Montery build, making sure we guard calls to the new ARQL SPIs.
+
+        * UIProcess/Cocoa/ModelElementControllerCocoa.mm:
+        (WebKit::ModelElementController::getCameraForModelElement):
+        (WebKit::ModelElementController::setCameraForModelElement):
+
 2021-11-18  Per Arne  <pvollan@apple.com>
 

trunk/Source/WebKit/UIProcess/Cocoa/ModelElementControllerCocoa.mm

@@ -254 +254 @@
     }
 
+#if ENABLE(ARKIT_INLINE_PREVIEW_CAMERA_TRANSFORM)
     [preview getCameraTransform:makeBlockPtr([weakThis = WeakPtr { *this }, completionHandler = WTFMove(completionHandler)] (simd_float3 cameraTransform, NSError *error) mutable {
         if (error) {
@@ -268 +269 @@
         });
     }).get()];
+#else
+    callOnMainRunLoop([weakThis = WeakPtr { *this }, completionHandler = WTFMove(completionHandler), error = WebCore::ResourceError { WebCore::ResourceError::Type::General }] () mutable {
+        if (weakThis)
+            completionHandler(makeUnexpected(error));
+    });
+    return;
+#endif
 }
 
@@ -281 +289 @@
     }
 
+#if ENABLE(ARKIT_INLINE_PREVIEW_CAMERA_TRANSFORM)
     [preview setCameraTransform:simd_make_float3(camera.pitch, camera.yaw, camera.scale)];
+#endif
 
     callOnMainRunLoop([weakThis = WeakPtr { *this }, completionHandler = WTFMove(completionHandler)] () mutable {
         if (weakThis)
+#if ENABLE(ARKIT_INLINE_PREVIEW_CAMERA_TRANSFORM)
             completionHandler(true);
+#else
+            completionHandler(false);
+#endif
     });
 }