Changeset 286081 in webkit

Timestamp:

Nov 19, 2021, 2:41:30 PM (5 years ago)

Author:

graouts@webkit.org

Message:

[Model] Reduce use of callOnMainRunLoop in ModelElementControllerCocoa
​https://bugs.webkit.org/show_bug.cgi?id=233376

Reviewed by Wenson Hsieh.

We only need to use callOnMainRunLoop inside of blocks.

• UIProcess/Cocoa/ModelElementControllerCocoa.mm:

(WebKit::ModelElementController::getCameraForModelElement):
(WebKit::ModelElementController::setCameraForModelElement):
(WebKit::ModelElementController::isPlayingAnimationForModelElement):
(WebKit::ModelElementController::setAnimationIsPlayingForModelElement):

Location:

trunk/Source/WebKit

Files:

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

trunk/Source/WebKit/ChangeLog

@@ +1 @@
+2021-11-19  Antoine Quint  <graouts@webkit.org>
+
+        [Model] Reduce use of callOnMainRunLoop in ModelElementControllerCocoa
+        https://bugs.webkit.org/show_bug.cgi?id=233376
+
+        Reviewed by Wenson Hsieh.
+
+        We only need to use callOnMainRunLoop inside of blocks.
+
+        * UIProcess/Cocoa/ModelElementControllerCocoa.mm:
+        (WebKit::ModelElementController::getCameraForModelElement):
+        (WebKit::ModelElementController::setCameraForModelElement):
+        (WebKit::ModelElementController::isPlayingAnimationForModelElement):
+        (WebKit::ModelElementController::setAnimationIsPlayingForModelElement):
+
 2021-11-19  Chris Dumez  <cdumez@apple.com>
 

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

@@ -247 +247 @@
     auto* preview = previewForModelIdentifier(modelIdentifier);
     if (!previewHasCameraSupport(preview)) {
-        callOnMainRunLoop([weakThis = WeakPtr { *this }, completionHandler = WTFMove(completionHandler), error = WebCore::ResourceError { WebCore::ResourceError::Type::General }] () mutable {
-            if (weakThis)
-                completionHandler(makeUnexpected(error));
-        });
+        completionHandler(makeUnexpected(WebCore::ResourceError { WebCore::ResourceError::Type::General }));
         return;
     }
@@ -257 +254 @@
     [preview getCameraTransform:makeBlockPtr([weakThis = WeakPtr { *this }, completionHandler = WTFMove(completionHandler)] (simd_float3 cameraTransform, NSError *error) mutable {
         if (error) {
-            callOnMainRunLoop([weakThis = WTFMove(weakThis), completionHandler = WTFMove(completionHandler), error = WebCore::ResourceError { WebCore::ResourceError::Type::General }] () mutable {
+            callOnMainRunLoop([weakThis = WTFMove(weakThis), completionHandler = WTFMove(completionHandler)] () mutable {
                 if (weakThis)
-                    completionHandler(makeUnexpected(error));
+                    completionHandler(makeUnexpected(WebCore::ResourceError { WebCore::ResourceError::Type::General }));
             });
             return;
@@ -270 +267 @@
     }).get()];
 #else
-    callOnMainRunLoop([weakThis = WeakPtr { *this }, completionHandler = WTFMove(completionHandler), error = WebCore::ResourceError { WebCore::ResourceError::Type::General }] () mutable {
-        if (weakThis)
-            completionHandler(makeUnexpected(error));
-    });
-    return;
+    ASSERT_NOT_REACHED();
 #endif
 }
@@ -282 +275 @@
     auto* preview = previewForModelIdentifier(modelIdentifier);
     if (!previewHasCameraSupport(preview)) {
-        callOnMainRunLoop([weakThis = WeakPtr { *this }, completionHandler = WTFMove(completionHandler)] () mutable {
-            if (weakThis)
-                completionHandler(false);
-        });
+        completionHandler(false);
         return;
     }
@@ -291 +281 @@
 #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
-    });
+    completionHandler(true);
+#else
+    ASSERT_NOT_REACHED();
+#endif
 }
 
@@ -316 +300 @@
     auto* preview = previewForModelIdentifier(modelIdentifier);
     if (!previewHasAnimationSupport(preview)) {
-        callOnMainRunLoop([weakThis = WeakPtr { *this }, completionHandler = WTFMove(completionHandler), error = WebCore::ResourceError { WebCore::ResourceError::Type::General }] () mutable {
-            if (weakThis)
-                completionHandler(makeUnexpected(error));
-        });
-        return;
-    }
-
-#if ENABLE(ARKIT_INLINE_PREVIEW_ANIMATIONS_CONTROL)
-    auto isPlaying = [preview isPlaying];
-#else
-    auto isPlaying = false;
-#endif
-    callOnMainRunLoop([isPlaying, weakThis = WeakPtr { *this }, completionHandler = WTFMove(completionHandler)] () mutable {
-        if (weakThis)
-            completionHandler(isPlaying);
-    });
+        completionHandler(makeUnexpected(WebCore::ResourceError { WebCore::ResourceError::Type::General }));
+        return;
+    }
+
+#if ENABLE(ARKIT_INLINE_PREVIEW_ANIMATIONS_CONTROL)
+    completionHandler([preview isPlaying]);
+#else
+    ASSERT_NOT_REACHED();
+#endif
 }
 
@@ -338 +315 @@
     auto* preview = previewForModelIdentifier(modelIdentifier);
     if (!previewHasAnimationSupport(preview)) {
-        callOnMainRunLoop([weakThis = WeakPtr { *this }, completionHandler = WTFMove(completionHandler)] () mutable {
-            if (weakThis)
-                completionHandler(false);
-        });
+        completionHandler(false);
         return;
     }
@@ -353 +327 @@
     }).get()];
 #else
-    callOnMainRunLoop([weakThis = WeakPtr { *this }, completionHandler = WTFMove(completionHandler)] () mutable {
-        if (weakThis)
-            completionHandler(false);
-    });
+    ASSERT_NOT_REACHED();
 #endif
 }