Changeset 242678 in webkit

Timestamp:

Mar 9, 2019, 8:34:19 PM (7 years ago)

Author:

Chris Dumez

Message:

Use modern async IPC with reply for device orientation permission
​https://bugs.webkit.org/show_bug.cgi?id=195529

Reviewed by Ryosuke Niwa.

• UIProcess/WebPageProxy.cpp:

(WebKit::WebPageProxy::requestDeviceOrientationAndMotionAccess):

• UIProcess/WebPageProxy.h:
• UIProcess/WebPageProxy.messages.in:
• WebProcess/WebPage/WebPage.cpp:

(WebKit::WebPage::shouldAllowDeviceOrientationAndMotionAccess):
(WebKit::nextDeviceOrientationAndMotionPermissionCallbackID): Deleted.
(WebKit::WebPage::didReceiveDeviceOrientationAndMotionAccessDecision): Deleted.

• WebProcess/WebPage/WebPage.h:
• WebProcess/WebPage/WebPage.messages.in:

Location:

trunk/Source/WebKit

Files:

• ChangeLog (modified) (1 diff)
• UIProcess/WebPageProxy.cpp (modified) (1 diff)
• UIProcess/WebPageProxy.h (modified) (1 diff)
• UIProcess/WebPageProxy.messages.in (modified) (1 diff)
• WebProcess/WebPage/WebPage.cpp (modified) (1 diff)
• WebProcess/WebPage/WebPage.h (modified) (2 diffs)
• WebProcess/WebPage/WebPage.messages.in (modified) (1 diff)

trunk/Source/WebKit/ChangeLog

@@ +1 @@
+2019-03-09  Chris Dumez  <cdumez@apple.com>
+
+        Use modern async IPC with reply for device orientation permission
+        https://bugs.webkit.org/show_bug.cgi?id=195529
+
+        Reviewed by Ryosuke Niwa.
+
+        * UIProcess/WebPageProxy.cpp:
+        (WebKit::WebPageProxy::requestDeviceOrientationAndMotionAccess):
+        * UIProcess/WebPageProxy.h:
+        * UIProcess/WebPageProxy.messages.in:
+        * WebProcess/WebPage/WebPage.cpp:
+        (WebKit::WebPage::shouldAllowDeviceOrientationAndMotionAccess):
+        (WebKit::nextDeviceOrientationAndMotionPermissionCallbackID): Deleted.
+        (WebKit::WebPage::didReceiveDeviceOrientationAndMotionAccessDecision): Deleted.
+        * WebProcess/WebPage/WebPage.h:
+        * WebProcess/WebPage/WebPage.messages.in:
+
 2019-03-09  Zalan Bujtas  <zalan@apple.com>
 

trunk/Source/WebKit/UIProcess/WebPageProxy.cpp

@@ -7176 +7176 @@
 
 #if ENABLE(DEVICE_ORIENTATION)
-void WebPageProxy::requestDeviceOrientationAndMotionAccess(WebCore::SecurityOriginData&& originData, uint64_t callbackID)
+void WebPageProxy::requestDeviceOrientationAndMotionAccess(WebCore::SecurityOriginData&& originData, CompletionHandler<void(bool)>&& completionHandler)
 {
     auto origin = API::SecurityOrigin::create(originData.securityOrigin());
-    m_uiClient->shouldAllowDeviceOrientationAndMotionAccess(*this, origin.get(), [this, weakThis = makeWeakPtr(*this), callbackID](bool granted) {
-        if (!weakThis || !isValid())
-            return;
-        m_process->send(Messages::WebPage::DidReceiveDeviceOrientationAndMotionAccessDecision(callbackID, granted), m_pageID);
-    });
+    m_uiClient->shouldAllowDeviceOrientationAndMotionAccess(*this, origin.get(), WTFMove(completionHandler));
 }
 #endif

trunk/Source/WebKit/UIProcess/WebPageProxy.h

@@ -1403 +1403 @@
 
 #if ENABLE(DEVICE_ORIENTATION)
-    void requestDeviceOrientationAndMotionAccess(WebCore::SecurityOriginData&&, uint64_t callbackID);
+    void requestDeviceOrientationAndMotionAccess(WebCore::SecurityOriginData&&, CompletionHandler<void(bool)>&&);
 #endif
 

trunk/Source/WebKit/UIProcess/WebPageProxy.messages.in

@@ -535 +535 @@
 
 #if ENABLE(DEVICE_ORIENTATION)
-    RequestDeviceOrientationAndMotionAccess(struct WebCore::SecurityOriginData origin, uint64_t callbackID);
+    RequestDeviceOrientationAndMotionAccess(struct WebCore::SecurityOriginData origin) -> (bool granted) Async
 #endif
 

trunk/Source/WebKit/WebProcess/WebPage/WebPage.cpp

@@ -6342 +6342 @@
 
 #if ENABLE(DEVICE_ORIENTATION)
-static uint64_t nextDeviceOrientationAndMotionPermissionCallbackID()
-{
-    static uint64_t nextCallbackID = 0;
-    return ++nextCallbackID;
-}
-
-void WebPage::shouldAllowDeviceOrientationAndMotionAccess(const WebCore::SecurityOrigin& origin, CompletionHandler<void(bool)>&& callback)
-{
-    auto callbackID = nextDeviceOrientationAndMotionPermissionCallbackID();
-    ASSERT(!m_deviceOrientationAndMotionPermissionCallbackMap.contains(callbackID));
-    m_deviceOrientationAndMotionPermissionCallbackMap.add(callbackID, WTFMove(callback));
-
-    send(Messages::WebPageProxy::RequestDeviceOrientationAndMotionAccess(origin.data(), callbackID));
-}
-
-void WebPage::didReceiveDeviceOrientationAndMotionAccessDecision(uint64_t callbackID, bool granted)
-{
-    auto callback = m_deviceOrientationAndMotionPermissionCallbackMap.take(callbackID);
-    ASSERT(callback);
-    callback(granted);
+void WebPage::shouldAllowDeviceOrientationAndMotionAccess(const WebCore::SecurityOrigin& origin, CompletionHandler<void(bool)>&& completionHandler)
+{
+    sendWithAsyncReply(Messages::WebPageProxy::RequestDeviceOrientationAndMotionAccess(origin.data()), WTFMove(completionHandler));
 }
 #endif

trunk/Source/WebKit/WebProcess/WebPage/WebPage.h

@@ -1211 +1211 @@
 #endif
 
-#if ENABLE(DEVICE_ORIENTATION)
-    void didReceiveDeviceOrientationAndMotionAccessDecision(uint64_t callbackID, bool granted);
-#endif
-
 #if !PLATFORM(COCOA) && !PLATFORM(WPE)
     static const char* interpretKeyEvent(const WebCore::KeyboardEvent*);
@@ -1845 +1841 @@
     HashMap<ShareSheetCallbackID, WTF::Function<void(bool completed)>> m_shareSheetResponseCallbackMap;
 
-#if ENABLE(DEVICE_ORIENTATION)
-    HashMap<uint64_t, WTF::CompletionHandler<void(bool granted)>> m_deviceOrientationAndMotionPermissionCallbackMap;
-#endif
-
 #if ENABLE(APPLICATION_MANIFEST)
     HashMap<uint64_t, uint64_t> m_applicationManifestFetchCallbackMap;

trunk/Source/WebKit/WebProcess/WebPage/WebPage.messages.in

@@ -364 +364 @@
     DidReceiveNotificationPermissionDecision(uint64_t notificationID, bool allowed)
 
-#if ENABLE(DEVICE_ORIENTATION)
-    DidReceiveDeviceOrientationAndMotionAccessDecision(uint64_t callbackID, bool granted)
-#endif
-
     # Printing.
     BeginPrinting(uint64_t frameID, struct WebKit::PrintInfo printInfo)