Diff
Modified: trunk/Source/WebKit/ChangeLog (261298 => 261299)
--- trunk/Source/WebKit/ChangeLog 2020-05-07 16:39:57 UTC (rev 261298)
+++ trunk/Source/WebKit/ChangeLog 2020-05-07 16:50:59 UTC (rev 261299)
@@ -1,3 +1,107 @@
+2020-05-07 Chris Dumez <[email protected]>
+
+ Simplify several IPC sending call sites in the UIProcess
+ https://bugs.webkit.org/show_bug.cgi?id=211575
+
+ Reviewed by Alex Christensen.
+
+ Simplify several IPC sending call sites in the UIProcess by leveraging the fact
+ that WebPageProxy subclasses IPC::MessageSender.
+
+ * UIProcess/Cocoa/TextCheckingController.mm:
+ (WebKit::TextCheckingController::replaceRelativeToSelection):
+ (WebKit::TextCheckingController::removeAnnotationRelativeToSelection):
+ * UIProcess/Cocoa/WebPageProxyCocoa.mm:
+ (WebKit::WebPageProxy::performDictionaryLookupAtLocation):
+ (WebKit::WebPageProxy::performDictionaryLookupOfCurrentSelection):
+ (WebKit::WebPageProxy::insertDictatedTextAsync):
+ (WebKit::WebPageProxy::speakingErrorOccurred):
+ (WebKit::WebPageProxy::boundaryEventOccurred):
+ (WebKit::WebPageProxy::voicesDidChange):
+ * UIProcess/GeolocationPermissionRequestManagerProxy.cpp:
+ (WebKit::GeolocationPermissionRequestManagerProxy::didReceiveGeolocationPermissionDecision):
+ * UIProcess/Inspector/RemoteWebInspectorProxy.cpp:
+ (WebKit::RemoteWebInspectorProxy::setDiagnosticLoggingAvailable):
+ * UIProcess/Inspector/WebInspectorProxy.cpp:
+ (WebKit::WebInspectorProxy::setDiagnosticLoggingAvailable):
+ * UIProcess/Inspector/gtk/RemoteWebInspectorProxyGtk.cpp:
+ (WebKit::remoteFileReplaceContentsCallback):
+ * UIProcess/Inspector/gtk/WebInspectorProxyGtk.cpp:
+ (WebKit::fileReplaceContentsCallback):
+ * UIProcess/Inspector/mac/RemoteWebInspectorProxyMac.mm:
+ (WebKit::RemoteWebInspectorProxy::platformSave):
+ (WebKit::RemoteWebInspectorProxy::platformAppend):
+ * UIProcess/Inspector/mac/WebInspectorProxyMac.mm:
+ (WebKit::WebInspectorProxy::platformSave):
+ (WebKit::WebInspectorProxy::platformAppend):
+ * UIProcess/Notifications/NotificationPermissionRequestManagerProxy.cpp:
+ (WebKit::NotificationPermissionRequestManagerProxy::createRequest):
+ * UIProcess/UserMediaPermissionRequestManagerProxy.cpp:
+ (WebKit::UserMediaPermissionRequestManagerProxy::captureDevicesChanged):
+ (WebKit::UserMediaPermissionRequestManagerProxy::denyRequest):
+ * UIProcess/WebFrameProxy.cpp:
+ (WebKit::WebFrameProxy::collapseSelection):
+ * UIProcess/WebFullScreenManagerProxy.cpp:
+ (WebKit::WebFullScreenManagerProxy::willEnterFullScreen):
+ (WebKit::WebFullScreenManagerProxy::didEnterFullScreen):
+ (WebKit::WebFullScreenManagerProxy::willExitFullScreen):
+ (WebKit::WebFullScreenManagerProxy::didExitFullScreen):
+ (WebKit::WebFullScreenManagerProxy::setAnimatingFullScreen):
+ (WebKit::WebFullScreenManagerProxy::requestExitFullScreen):
+ (WebKit::WebFullScreenManagerProxy::saveScrollPosition):
+ (WebKit::WebFullScreenManagerProxy::restoreScrollPosition):
+ (WebKit::WebFullScreenManagerProxy::setFullscreenInsets):
+ (WebKit::WebFullScreenManagerProxy::setFullscreenAutoHideDuration):
+ (WebKit::WebFullScreenManagerProxy::setFullscreenControlsHidden):
+ * UIProcess/gtk/WebPageProxyGtk.cpp:
+ (WebKit::WebPageProxy::getCenterForZoomGesture):
+ * UIProcess/ios/SmartMagnificationController.mm:
+ (WebKit::SmartMagnificationController::handleSmartMagnificationGesture):
+ * UIProcess/ios/WKContentViewInteraction.mm:
+ (-[WKContentView ensurePositionInformationIsUpToDate:]):
+ * UIProcess/ios/WebPageProxyIOS.mm:
+ (WebKit::WebPageProxy::handleTwoFingerTapAtPoint):
+ (WebKit::WebPageProxy::handleStylusSingleTapAtPoint):
+ (WebKit::WebPageProxy::registerUIProcessAccessibilityTokens):
+ (WebKit::WebPageProxy::willStartUserTriggeredZooming):
+ (WebKit::WebPageProxy::potentialTapAtPosition):
+ (WebKit::WebPageProxy::commitPotentialTap):
+ (WebKit::WebPageProxy::cancelPotentialTap):
+ (WebKit::WebPageProxy::tapHighlightAtPosition):
+ (WebKit::WebPageProxy::handleTap):
+ (WebKit::WebPageProxy::didRecognizeLongPress):
+ (WebKit::WebPageProxy::handleDoubleTapForDoubleClickAtPoint):
+ (WebKit::WebPageProxy::inspectorNodeSearchMovedToPosition):
+ (WebKit::WebPageProxy::inspectorNodeSearchEndedAtPosition):
+ (WebKit::WebPageProxy::blurFocusedElement):
+ (WebKit::WebPageProxy::setIsShowingInputViewForFocusedElement):
+ (WebKit::WebPageProxy::setFocusedElementValue):
+ (WebKit::WebPageProxy::setFocusedElementValueAsNumber):
+ (WebKit::WebPageProxy::setFocusedElementSelectedIndex):
+ (WebKit::WebPageProxy::computePagesForPrintingAndDrawToPDF):
+ (WebKit::WebPageProxy::contentSizeCategoryDidChange):
+ (WebKit::WebPageProxy::generateSyntheticEditingCommand):
+ * UIProcess/mac/ViewGestureControllerMac.mm:
+ (WebKit::ViewGestureController::handleMagnificationGestureEvent):
+ (WebKit::ViewGestureController::handleSmartMagnificationGesture):
+ * UIProcess/mac/WebPageProxyMac.mm:
+ (WebKit::WebPageProxy::windowAndViewFramesChanged):
+ (WebKit::WebPageProxy::setMainFrameIsScrollable):
+ (WebKit::WebPageProxy::attributedSubstringForCharacterRangeAsync):
+ (WebKit::WebPageProxy::fontAtSelection):
+ (WebKit::WebPageProxy::stringSelectionForPasteboard):
+ (WebKit::WebPageProxy::dataSelectionForPasteboard):
+ (WebKit::WebPageProxy::readSelectionFromPasteboard):
+ (WebKit::WebPageProxy::replaceSelectionWithPasteboardData):
+ (WebKit::WebPageProxy::sendComplexTextInputToPlugin):
+ (WebKit::WebPageProxy::uppercaseWord):
+ (WebKit::WebPageProxy::lowercaseWord):
+ (WebKit::WebPageProxy::capitalizeWord):
+ (WebKit::WebPageProxy::setSmartInsertDeleteEnabled):
+ (WebKit::WebPageProxy::registerUIProcessAccessibilityTokens):
+ (WebKit::WebPageProxy::shouldDelayWindowOrderingForEvent):
+ (WebKit::WebPageProxy::acceptsFirstMouse):
+
2020-05-07 Commit Queue <[email protected]>
Unreviewed, reverting r260769.
Modified: trunk/Source/WebKit/UIProcess/Cocoa/TextCheckingController.mm (261298 => 261299)
--- trunk/Source/WebKit/UIProcess/Cocoa/TextCheckingController.mm 2020-05-07 16:39:57 UTC (rev 261298)
+++ trunk/Source/WebKit/UIProcess/Cocoa/TextCheckingController.mm 2020-05-07 16:50:59 UTC (rev 261299)
@@ -44,7 +44,7 @@
if (!m_page.hasRunningProcess())
return;
- m_page.process().send(Messages::TextCheckingControllerProxy::ReplaceRelativeToSelection({ annotatedString, nil }, selectionOffset, length, relativeReplacementLocation, relativeReplacementLength), m_page.webPageID());
+ m_page.send(Messages::TextCheckingControllerProxy::ReplaceRelativeToSelection({ annotatedString, nil }, selectionOffset, length, relativeReplacementLocation, relativeReplacementLength));
}
void TextCheckingController::removeAnnotationRelativeToSelection(NSString *annotationName, int64_t selectionOffset, uint64_t length)
@@ -52,7 +52,7 @@
if (!m_page.hasRunningProcess())
return;
- m_page.process().send(Messages::TextCheckingControllerProxy::RemoveAnnotationRelativeToSelection(annotationName, selectionOffset, length), m_page.webPageID());
+ m_page.send(Messages::TextCheckingControllerProxy::RemoveAnnotationRelativeToSelection(annotationName, selectionOffset, length));
}
} // namespace WebKit
Modified: trunk/Source/WebKit/UIProcess/Cocoa/WebPageProxyCocoa.mm (261298 => 261299)
--- trunk/Source/WebKit/UIProcess/Cocoa/WebPageProxyCocoa.mm 2020-05-07 16:39:57 UTC (rev 261298)
+++ trunk/Source/WebKit/UIProcess/Cocoa/WebPageProxyCocoa.mm 2020-05-07 16:50:59 UTC (rev 261299)
@@ -231,7 +231,7 @@
if (!hasRunningProcess())
return;
- process().send(Messages::WebPage::PerformDictionaryLookupAtLocation(point), m_webPageID);
+ send(Messages::WebPage::PerformDictionaryLookupAtLocation(point));
}
void WebPageProxy::performDictionaryLookupOfCurrentSelection()
@@ -239,7 +239,7 @@
if (!hasRunningProcess())
return;
- process().send(Messages::WebPage::PerformDictionaryLookupOfCurrentSelection(), m_webPageID);
+ send(Messages::WebPage::PerformDictionaryLookupOfCurrentSelection());
}
void WebPageProxy::insertDictatedTextAsync(const String& text, const EditingRange& replacementRange, const Vector<TextAlternativeWithRange>& dictationAlternativesWithRange, InsertTextOptions&& options)
@@ -259,7 +259,7 @@
return;
}
- process().send(Messages::WebPage::InsertDictatedTextAsync { text, replacementRange, dictationAlternatives, WTFMove(options) }, m_webPageID);
+ send(Messages::WebPage::InsertDictatedTextAsync { text, replacementRange, dictationAlternatives, WTFMove(options) });
}
#if ENABLE(APPLE_PAY)
@@ -313,17 +313,17 @@
void WebPageProxy::speakingErrorOccurred(WebCore::PlatformSpeechSynthesisUtterance&)
{
- process().send(Messages::WebPage::SpeakingErrorOccurred(), m_webPageID);
+ send(Messages::WebPage::SpeakingErrorOccurred());
}
void WebPageProxy::boundaryEventOccurred(WebCore::PlatformSpeechSynthesisUtterance&, WebCore::SpeechBoundary speechBoundary, unsigned charIndex)
{
- process().send(Messages::WebPage::BoundaryEventOccurred(speechBoundary == WebCore::SpeechBoundary::SpeechWordBoundary, charIndex), m_webPageID);
+ send(Messages::WebPage::BoundaryEventOccurred(speechBoundary == WebCore::SpeechBoundary::SpeechWordBoundary, charIndex));
}
void WebPageProxy::voicesDidChange()
{
- process().send(Messages::WebPage::VoicesDidChange(), m_webPageID);
+ send(Messages::WebPage::VoicesDidChange());
}
#endif // ENABLE(SPEECH_SYNTHESIS)
Modified: trunk/Source/WebKit/UIProcess/GeolocationPermissionRequestManagerProxy.cpp (261298 => 261299)
--- trunk/Source/WebKit/UIProcess/GeolocationPermissionRequestManagerProxy.cpp 2020-05-07 16:39:57 UTC (rev 261298)
+++ trunk/Source/WebKit/UIProcess/GeolocationPermissionRequestManagerProxy.cpp 2020-05-07 16:50:59 UTC (rev 261299)
@@ -66,7 +66,7 @@
String authorizationToken = allowed ? createCanonicalUUIDString() : String();
if (!authorizationToken.isNull())
m_validAuthorizationTokens.add(authorizationToken);
- m_page.process().send(Messages::WebPage::DidReceiveGeolocationPermissionDecision(geolocationID, authorizationToken), m_page.webPageID());
+ m_page.send(Messages::WebPage::DidReceiveGeolocationPermissionDecision(geolocationID, authorizationToken));
#else
UNUSED_PARAM(allowed);
#endif
Modified: trunk/Source/WebKit/UIProcess/Inspector/RemoteWebInspectorProxy.cpp (261298 => 261299)
--- trunk/Source/WebKit/UIProcess/Inspector/RemoteWebInspectorProxy.cpp 2020-05-07 16:39:57 UTC (rev 261298)
+++ trunk/Source/WebKit/UIProcess/Inspector/RemoteWebInspectorProxy.cpp 2020-05-07 16:50:59 UTC (rev 261299)
@@ -57,7 +57,7 @@
void RemoteWebInspectorProxy::setDiagnosticLoggingAvailable(bool available)
{
#if ENABLE(INSPECTOR_TELEMETRY)
- m_inspectorPage->process().send(Messages::RemoteWebInspectorUI::SetDiagnosticLoggingAvailable(available), m_inspectorPage->webPageID());
+ m_inspectorPage->send(Messages::RemoteWebInspectorUI::SetDiagnosticLoggingAvailable(available));
#else
UNUSED_PARAM(available);
#endif
Modified: trunk/Source/WebKit/UIProcess/Inspector/WebInspectorProxy.cpp (261298 => 261299)
--- trunk/Source/WebKit/UIProcess/Inspector/WebInspectorProxy.cpp 2020-05-07 16:39:57 UTC (rev 261298)
+++ trunk/Source/WebKit/UIProcess/Inspector/WebInspectorProxy.cpp 2020-05-07 16:50:59 UTC (rev 261299)
@@ -647,7 +647,7 @@
void WebInspectorProxy::setDiagnosticLoggingAvailable(bool available)
{
#if ENABLE(INSPECTOR_TELEMETRY)
- m_inspectorPage->process().send(Messages::WebInspectorUI::SetDiagnosticLoggingAvailable(available), m_inspectorPage->webPageID());
+ m_inspectorPage->send(Messages::WebInspectorUI::SetDiagnosticLoggingAvailable(available));
#else
UNUSED_PARAM(available);
#endif
Modified: trunk/Source/WebKit/UIProcess/Inspector/gtk/RemoteWebInspectorProxyGtk.cpp (261298 => 261299)
--- trunk/Source/WebKit/UIProcess/Inspector/gtk/RemoteWebInspectorProxyGtk.cpp 2020-05-07 16:39:57 UTC (rev 261298)
+++ trunk/Source/WebKit/UIProcess/Inspector/gtk/RemoteWebInspectorProxyGtk.cpp 2020-05-07 16:50:59 UTC (rev 261299)
@@ -109,7 +109,7 @@
auto* page = static_cast<WebPageProxy*>(userData);
GUniquePtr<char> path(g_file_get_path(file));
- page->process().send(Messages::RemoteWebInspectorUI::DidSave(path.get()), page->webPageID());
+ page->send(Messages::RemoteWebInspectorUI::DidSave(path.get()));
}
void RemoteWebInspectorProxy::platformSave(const String& suggestedURL, const String& content, bool base64Encoded, bool forceSaveDialog)
Modified: trunk/Source/WebKit/UIProcess/Inspector/gtk/WebInspectorProxyGtk.cpp (261298 => 261299)
--- trunk/Source/WebKit/UIProcess/Inspector/gtk/WebInspectorProxyGtk.cpp 2020-05-07 16:39:57 UTC (rev 261298)
+++ trunk/Source/WebKit/UIProcess/Inspector/gtk/WebInspectorProxyGtk.cpp 2020-05-07 16:50:59 UTC (rev 261299)
@@ -480,7 +480,7 @@
auto* page = static_cast<WebPageProxy*>(userData);
GUniquePtr<char> path(g_file_get_path(file));
- page->process().send(Messages::WebInspectorUI::DidSave(path.get()), page->webPageID());
+ page->send(Messages::WebInspectorUI::DidSave(path.get()));
}
void WebInspectorProxy::platformSave(const String& suggestedURL, const String& content, bool base64Encoded, bool forceSaveDialog)
Modified: trunk/Source/WebKit/UIProcess/Inspector/mac/RemoteWebInspectorProxyMac.mm (261298 => 261299)
--- trunk/Source/WebKit/UIProcess/Inspector/mac/RemoteWebInspectorProxyMac.mm 2020-05-07 16:39:57 UTC (rev 261298)
+++ trunk/Source/WebKit/UIProcess/Inspector/mac/RemoteWebInspectorProxyMac.mm 2020-05-07 16:50:59 UTC (rev 261299)
@@ -180,7 +180,7 @@
} else
[contentCopy writeToURL:actualURL atomically:YES encoding:NSUTF8StringEncoding error:NULL];
- m_inspectorPage->process().send(Messages::RemoteWebInspectorUI::DidSave([actualURL absoluteString]), m_inspectorPage->webPageID());
+ m_inspectorPage->send(Messages::RemoteWebInspectorUI::DidSave([actualURL absoluteString]));
};
if (!forceSaveDialog) {
@@ -228,7 +228,7 @@
[handle closeFile];
WebPageProxy* inspectorPage = webView()->_page.get();
- inspectorPage->process().send(Messages::RemoteWebInspectorUI::DidAppend([actualURL absoluteString]), inspectorPage->webPageID());
+ inspectorPage->send(Messages::RemoteWebInspectorUI::DidAppend([actualURL absoluteString]));
}
void RemoteWebInspectorProxy::platformSetSheetRect(const FloatRect& rect)
Modified: trunk/Source/WebKit/UIProcess/Inspector/mac/WebInspectorProxyMac.mm (261298 => 261299)
--- trunk/Source/WebKit/UIProcess/Inspector/mac/WebInspectorProxyMac.mm 2020-05-07 16:39:57 UTC (rev 261298)
+++ trunk/Source/WebKit/UIProcess/Inspector/mac/WebInspectorProxyMac.mm 2020-05-07 16:50:59 UTC (rev 261299)
@@ -502,7 +502,7 @@
} else
[contentCopy writeToURL:actualURL atomically:YES encoding:NSUTF8StringEncoding error:NULL];
- m_inspectorPage->process().send(Messages::WebInspectorUI::DidSave([actualURL absoluteString]), m_inspectorPage->webPageID());
+ m_inspectorPage->send(Messages::WebInspectorUI::DidSave([actualURL absoluteString]));
};
if (!forceSaveDialog) {
@@ -547,7 +547,7 @@
[handle writeData:[content dataUsingEncoding:NSUTF8StringEncoding]];
[handle closeFile];
- m_inspectorPage->process().send(Messages::WebInspectorUI::DidAppend([actualURL absoluteString]), m_inspectorPage->webPageID());
+ m_inspectorPage->send(Messages::WebInspectorUI::DidAppend([actualURL absoluteString]));
}
void WebInspectorProxy::windowFrameDidChange()
Modified: trunk/Source/WebKit/UIProcess/Notifications/NotificationPermissionRequestManagerProxy.cpp (261298 => 261299)
--- trunk/Source/WebKit/UIProcess/Notifications/NotificationPermissionRequestManagerProxy.cpp 2020-05-07 16:39:57 UTC (rev 261298)
+++ trunk/Source/WebKit/UIProcess/Notifications/NotificationPermissionRequestManagerProxy.cpp 2020-05-07 16:50:59 UTC (rev 261299)
@@ -50,7 +50,7 @@
{
auto request = NotificationPermissionRequest::create([this, notificationID, page = makeRef(m_page)](bool allowed) {
m_pendingRequests.take(notificationID);
- page->process().send(Messages::WebPage::DidReceiveNotificationPermissionDecision(notificationID, allowed), page->webPageID());
+ page->send(Messages::WebPage::DidReceiveNotificationPermissionDecision(notificationID, allowed));
});
m_pendingRequests.add(notificationID, request.ptr());
return request;
Modified: trunk/Source/WebKit/UIProcess/UserMediaPermissionRequestManagerProxy.cpp (261298 => 261299)
--- trunk/Source/WebKit/UIProcess/UserMediaPermissionRequestManagerProxy.cpp 2020-05-07 16:39:57 UTC (rev 261298)
+++ trunk/Source/WebKit/UIProcess/UserMediaPermissionRequestManagerProxy.cpp 2020-05-07 16:50:59 UTC (rev 261299)
@@ -152,7 +152,7 @@
if (!m_page.hasRunningProcess())
return;
- m_page.process().send(Messages::WebPage::CaptureDevicesChanged(), m_page.webPageID());
+ m_page.send(Messages::WebPage::CaptureDevicesChanged());
}
#endif
@@ -198,7 +198,7 @@
m_deniedRequests.append(DeniedRequest { request.mainFrameID(), request.userMediaDocumentSecurityOrigin(), request.topLevelDocumentSecurityOrigin(), request.requiresAudioCapture(), request.requiresVideoCapture(), request.requiresDisplayCapture() });
#if ENABLE(MEDIA_STREAM)
- m_page.process().send(Messages::WebPage::UserMediaAccessWasDenied(request.userMediaID(), toWebCore(reason), invalidConstraint), m_page.webPageID());
+ m_page.send(Messages::WebPage::UserMediaAccessWasDenied(request.userMediaID(), toWebCore(reason), invalidConstraint));
#else
UNUSED_PARAM(reason);
UNUSED_PARAM(invalidConstraint);
Modified: trunk/Source/WebKit/UIProcess/WebFrameProxy.cpp (261298 => 261299)
--- trunk/Source/WebKit/UIProcess/WebFrameProxy.cpp 2020-05-07 16:39:57 UTC (rev 261298)
+++ trunk/Source/WebKit/UIProcess/WebFrameProxy.cpp 2020-05-07 16:50:59 UTC (rev 261299)
@@ -263,7 +263,7 @@
if (!m_page)
return;
- m_page->process().send(Messages::WebPage::CollapseSelectionInFrame(m_frameID), m_page->webPageID());
+ m_page->send(Messages::WebPage::CollapseSelectionInFrame(m_frameID));
}
#endif
Modified: trunk/Source/WebKit/UIProcess/WebFullScreenManagerProxy.cpp (261298 => 261299)
--- trunk/Source/WebKit/UIProcess/WebFullScreenManagerProxy.cpp 2020-05-07 16:39:57 UTC (rev 261298)
+++ trunk/Source/WebKit/UIProcess/WebFullScreenManagerProxy.cpp 2020-05-07 16:50:59 UTC (rev 261299)
@@ -56,13 +56,13 @@
void WebFullScreenManagerProxy::willEnterFullScreen()
{
m_page.fullscreenClient().willEnterFullscreen(&m_page);
- m_page.process().send(Messages::WebFullScreenManager::WillEnterFullScreen(), m_page.webPageID());
+ m_page.send(Messages::WebFullScreenManager::WillEnterFullScreen());
}
void WebFullScreenManagerProxy::didEnterFullScreen()
{
m_page.fullscreenClient().didEnterFullscreen(&m_page);
- m_page.process().send(Messages::WebFullScreenManager::DidEnterFullScreen(), m_page.webPageID());
+ m_page.send(Messages::WebFullScreenManager::DidEnterFullScreen());
if (m_page.isControlledByAutomation()) {
if (WebAutomationSession* automationSession = m_page.process().processPool().automationSession())
@@ -73,13 +73,13 @@
void WebFullScreenManagerProxy::willExitFullScreen()
{
m_page.fullscreenClient().willExitFullscreen(&m_page);
- m_page.process().send(Messages::WebFullScreenManager::WillExitFullScreen(), m_page.webPageID());
+ m_page.send(Messages::WebFullScreenManager::WillExitFullScreen());
}
void WebFullScreenManagerProxy::didExitFullScreen()
{
m_page.fullscreenClient().didExitFullscreen(&m_page);
- m_page.process().send(Messages::WebFullScreenManager::DidExitFullScreen(), m_page.webPageID());
+ m_page.send(Messages::WebFullScreenManager::DidExitFullScreen());
if (m_page.isControlledByAutomation()) {
if (WebAutomationSession* automationSession = m_page.process().processPool().automationSession())
@@ -89,12 +89,12 @@
void WebFullScreenManagerProxy::setAnimatingFullScreen(bool animating)
{
- m_page.process().send(Messages::WebFullScreenManager::SetAnimatingFullScreen(animating), m_page.webPageID());
+ m_page.send(Messages::WebFullScreenManager::SetAnimatingFullScreen(animating));
}
void WebFullScreenManagerProxy::requestExitFullScreen()
{
- m_page.process().send(Messages::WebFullScreenManager::RequestExitFullScreen(), m_page.webPageID());
+ m_page.send(Messages::WebFullScreenManager::RequestExitFullScreen());
}
void WebFullScreenManagerProxy::supportsFullScreen(bool withKeyboard, CompletionHandler<void(bool)>&& completionHandler)
@@ -108,27 +108,27 @@
void WebFullScreenManagerProxy::saveScrollPosition()
{
- m_page.process().send(Messages::WebFullScreenManager::SaveScrollPosition(), m_page.webPageID());
+ m_page.send(Messages::WebFullScreenManager::SaveScrollPosition());
}
void WebFullScreenManagerProxy::restoreScrollPosition()
{
- m_page.process().send(Messages::WebFullScreenManager::RestoreScrollPosition(), m_page.webPageID());
+ m_page.send(Messages::WebFullScreenManager::RestoreScrollPosition());
}
void WebFullScreenManagerProxy::setFullscreenInsets(const WebCore::FloatBoxExtent& insets)
{
- m_page.process().send(Messages::WebFullScreenManager::SetFullscreenInsets(insets), m_page.webPageID());
+ m_page.send(Messages::WebFullScreenManager::SetFullscreenInsets(insets));
}
void WebFullScreenManagerProxy::setFullscreenAutoHideDuration(Seconds duration)
{
- m_page.process().send(Messages::WebFullScreenManager::SetFullscreenAutoHideDuration(duration), m_page.webPageID());
+ m_page.send(Messages::WebFullScreenManager::SetFullscreenAutoHideDuration(duration));
}
void WebFullScreenManagerProxy::setFullscreenControlsHidden(bool hidden)
{
- m_page.process().send(Messages::WebFullScreenManager::SetFullscreenControlsHidden(hidden), m_page.webPageID());
+ m_page.send(Messages::WebFullScreenManager::SetFullscreenControlsHidden(hidden));
}
void WebFullScreenManagerProxy::close()
Modified: trunk/Source/WebKit/UIProcess/gtk/WebPageProxyGtk.cpp (261298 => 261299)
--- trunk/Source/WebKit/UIProcess/gtk/WebPageProxyGtk.cpp 2020-05-07 16:39:57 UTC (rev 261298)
+++ trunk/Source/WebKit/UIProcess/gtk/WebPageProxyGtk.cpp 2020-05-07 16:50:59 UTC (rev 261299)
@@ -159,7 +159,7 @@
void WebPageProxy::getCenterForZoomGesture(const WebCore::IntPoint& centerInViewCoordinates, WebCore::IntPoint& center)
{
- process().sendSync(Messages::WebPage::GetCenterForZoomGesture(centerInViewCoordinates), Messages::WebPage::GetCenterForZoomGesture::Reply(center), m_webPageID);
+ sendSync(Messages::WebPage::GetCenterForZoomGesture(centerInViewCoordinates), Messages::WebPage::GetCenterForZoomGesture::Reply(center));
}
bool WebPageProxy::makeGLContextCurrent()
Modified: trunk/Source/WebKit/UIProcess/ios/SmartMagnificationController.mm (261298 => 261299)
--- trunk/Source/WebKit/UIProcess/ios/SmartMagnificationController.mm 2020-05-07 16:39:57 UTC (rev 261298)
+++ trunk/Source/WebKit/UIProcess/ios/SmartMagnificationController.mm 2020-05-07 16:50:59 UTC (rev 261299)
@@ -63,7 +63,7 @@
void SmartMagnificationController::handleSmartMagnificationGesture(FloatPoint origin)
{
- m_webPageProxy.process().send(Messages::ViewGestureGeometryCollector::CollectGeometryForSmartMagnificationGesture(origin), m_webPageProxy.webPageID());
+ m_webPageProxy.send(Messages::ViewGestureGeometryCollector::CollectGeometryForSmartMagnificationGesture(origin));
}
void SmartMagnificationController::handleResetMagnificationGesture(FloatPoint origin)
Modified: trunk/Source/WebKit/UIProcess/ios/WKContentViewInteraction.mm (261298 => 261299)
--- trunk/Source/WebKit/UIProcess/ios/WKContentViewInteraction.mm 2020-05-07 16:39:57 UTC (rev 261298)
+++ trunk/Source/WebKit/UIProcess/ios/WKContentViewInteraction.mm 2020-05-07 16:50:59 UTC (rev 261299)
@@ -2216,7 +2216,7 @@
if ([self _hasValidOutstandingPositionInformationRequest:request])
return connection->waitForAndDispatchImmediately<Messages::WebPageProxy::DidReceivePositionInformation>(_page->webPageID(), 1_s, IPC::WaitForOption::InterruptWaitingIfSyncMessageArrives);
- bool receivedResponse = _page->process().sendSync(Messages::WebPage::GetPositionInformation(request), Messages::WebPage::GetPositionInformation::Reply(_positionInformation), _page->webPageID(), 1_s, IPC::SendSyncOption::ForceDispatchWhenDestinationIsWaitingForUnboundedSyncReply);
+ bool receivedResponse = _page->sendSync(Messages::WebPage::GetPositionInformation(request), Messages::WebPage::GetPositionInformation::Reply(_positionInformation), 1_s, IPC::SendSyncOption::ForceDispatchWhenDestinationIsWaitingForUnboundedSyncReply);
_hasValidPositionInformation = receivedResponse && _positionInformation.canBeValid;
// FIXME: We need to clean up these handlers in the event that we are not able to collect data, or if the WebProcess crashes.
Modified: trunk/Source/WebKit/UIProcess/ios/WebPageProxyIOS.mm (261298 => 261299)
--- trunk/Source/WebKit/UIProcess/ios/WebPageProxyIOS.mm 2020-05-07 16:39:57 UTC (rev 261298)
+++ trunk/Source/WebKit/UIProcess/ios/WebPageProxyIOS.mm 2020-05-07 16:50:59 UTC (rev 261299)
@@ -622,12 +622,12 @@
void WebPageProxy::handleTwoFingerTapAtPoint(const WebCore::IntPoint& point, OptionSet<WebEvent::Modifier> modifiers, uint64_t requestID)
{
- process().send(Messages::WebPage::HandleTwoFingerTapAtPoint(point, modifiers, requestID), m_webPageID);
+ send(Messages::WebPage::HandleTwoFingerTapAtPoint(point, modifiers, requestID));
}
void WebPageProxy::handleStylusSingleTapAtPoint(const WebCore::IntPoint& point, uint64_t requestID)
{
- process().send(Messages::WebPage::HandleStylusSingleTapAtPoint(point, requestID), m_webPageID);
+ send(Messages::WebPage::HandleStylusSingleTapAtPoint(point, requestID));
}
void WebPageProxy::selectWithTwoTouches(const WebCore::IntPoint from, const WebCore::IntPoint to, uint32_t gestureType, uint32_t gestureState, WTF::Function<void (const WebCore::IntPoint&, uint32_t, uint32_t, uint32_t, CallbackBase::Error)>&& callbackFunction)
@@ -848,7 +848,7 @@
if (!hasRunningProcess())
return;
- process().send(Messages::WebPage::RegisterUIProcessAccessibilityTokens(elementToken, windowToken), m_webPageID);
+ send(Messages::WebPage::RegisterUIProcessAccessibilityTokens(elementToken, windowToken));
}
void WebPageProxy::pluginFocusOrWindowFocusChanged(uint64_t, bool)
@@ -881,58 +881,58 @@
void WebPageProxy::willStartUserTriggeredZooming()
{
- process().send(Messages::WebPage::WillStartUserTriggeredZooming(), m_webPageID);
+ send(Messages::WebPage::WillStartUserTriggeredZooming());
}
void WebPageProxy::potentialTapAtPosition(const WebCore::FloatPoint& position, bool shouldRequestMagnificationInformation, uint64_t& requestID)
{
hideValidationMessage();
- process().send(Messages::WebPage::PotentialTapAtPosition(requestID, position, shouldRequestMagnificationInformation), m_webPageID);
+ send(Messages::WebPage::PotentialTapAtPosition(requestID, position, shouldRequestMagnificationInformation));
}
void WebPageProxy::commitPotentialTap(OptionSet<WebEvent::Modifier> modifiers, TransactionID layerTreeTransactionIdAtLastTouchStart, WebCore::PointerID pointerId)
{
- process().send(Messages::WebPage::CommitPotentialTap(modifiers, layerTreeTransactionIdAtLastTouchStart, pointerId), m_webPageID);
+ send(Messages::WebPage::CommitPotentialTap(modifiers, layerTreeTransactionIdAtLastTouchStart, pointerId));
}
void WebPageProxy::cancelPotentialTap()
{
- process().send(Messages::WebPage::CancelPotentialTap(), m_webPageID);
+ send(Messages::WebPage::CancelPotentialTap());
}
void WebPageProxy::tapHighlightAtPosition(const WebCore::FloatPoint& position, uint64_t& requestID)
{
- process().send(Messages::WebPage::TapHighlightAtPosition(requestID, position), m_webPageID);
+ send(Messages::WebPage::TapHighlightAtPosition(requestID, position));
}
void WebPageProxy::handleTap(const FloatPoint& location, OptionSet<WebEvent::Modifier> modifiers, TransactionID layerTreeTransactionIdAtLastTouchStart)
{
- process().send(Messages::WebPage::HandleTap(roundedIntPoint(location), modifiers, layerTreeTransactionIdAtLastTouchStart), m_webPageID);
+ send(Messages::WebPage::HandleTap(roundedIntPoint(location), modifiers, layerTreeTransactionIdAtLastTouchStart));
}
void WebPageProxy::didRecognizeLongPress()
{
- process().send(Messages::WebPage::DidRecognizeLongPress(), m_webPageID);
+ send(Messages::WebPage::DidRecognizeLongPress());
}
void WebPageProxy::handleDoubleTapForDoubleClickAtPoint(const WebCore::IntPoint& point, OptionSet<WebEvent::Modifier> modifiers, TransactionID layerTreeTransactionIdAtLastTouchStart)
{
- process().send(Messages::WebPage::HandleDoubleTapForDoubleClickAtPoint(point, modifiers, layerTreeTransactionIdAtLastTouchStart), m_webPageID);
+ send(Messages::WebPage::HandleDoubleTapForDoubleClickAtPoint(point, modifiers, layerTreeTransactionIdAtLastTouchStart));
}
void WebPageProxy::inspectorNodeSearchMovedToPosition(const WebCore::FloatPoint& position)
{
- process().send(Messages::WebPage::InspectorNodeSearchMovedToPosition(position), m_webPageID);
+ send(Messages::WebPage::InspectorNodeSearchMovedToPosition(position));
}
void WebPageProxy::inspectorNodeSearchEndedAtPosition(const WebCore::FloatPoint& position)
{
- process().send(Messages::WebPage::InspectorNodeSearchEndedAtPosition(position), m_webPageID);
+ send(Messages::WebPage::InspectorNodeSearchEndedAtPosition(position));
}
void WebPageProxy::blurFocusedElement()
{
- process().send(Messages::WebPage::BlurFocusedElement(), m_webPageID);
+ send(Messages::WebPage::BlurFocusedElement());
}
FloatSize WebPageProxy::screenSize()
@@ -977,7 +977,7 @@
void WebPageProxy::setIsShowingInputViewForFocusedElement(bool showingInputView)
{
- process().send(Messages::WebPage::SetIsShowingInputViewForFocusedElement(showingInputView), m_webPageID);
+ send(Messages::WebPage::SetIsShowingInputViewForFocusedElement(showingInputView));
}
void WebPageProxy::updateInputContextAfterBlurringAndRefocusingElement()
@@ -1069,17 +1069,17 @@
void WebPageProxy::setFocusedElementValue(const String& value)
{
- process().send(Messages::WebPage::SetFocusedElementValue(value), m_webPageID);
+ send(Messages::WebPage::SetFocusedElementValue(value));
}
void WebPageProxy::setFocusedElementValueAsNumber(double value)
{
- process().send(Messages::WebPage::SetFocusedElementValueAsNumber(value), m_webPageID);
+ send(Messages::WebPage::SetFocusedElementValueAsNumber(value));
}
void WebPageProxy::setFocusedElementSelectedIndex(uint32_t index, bool allowMultipleSelection)
{
- process().send(Messages::WebPage::SetFocusedElementSelectedIndex(index, allowMultipleSelection), m_webPageID);
+ send(Messages::WebPage::SetFocusedElementSelectedIndex(index, allowMultipleSelection));
}
void WebPageProxy::didPerformDictionaryLookup(const DictionaryPopupInfo& dictionaryPopupInfo)
@@ -1143,13 +1143,13 @@
uint32_t pageCount = 0;
auto callbackID = m_callbacks.put(WTFMove(callback), m_process->throttler().backgroundActivity("WebPageProxy::computePagesForPrintingAndDrawToPDF"_s));
- process().sendSync(Messages::WebPage::ComputePagesForPrintingAndDrawToPDF(frameID, printInfo, callbackID), Messages::WebPage::ComputePagesForPrintingAndDrawToPDF::Reply(pageCount), m_webPageID, Seconds::infinity());
+ sendSync(Messages::WebPage::ComputePagesForPrintingAndDrawToPDF(frameID, printInfo, callbackID), Messages::WebPage::ComputePagesForPrintingAndDrawToPDF::Reply(pageCount), Seconds::infinity());
return pageCount;
}
void WebPageProxy::contentSizeCategoryDidChange(const String& contentSizeCategory)
{
- process().send(Messages::WebPage::ContentSizeCategoryDidChange(contentSizeCategory), m_webPageID);
+ send(Messages::WebPage::ContentSizeCategoryDidChange(contentSizeCategory));
}
void WebPageProxy::generateSyntheticEditingCommand(WebKit::SyntheticEditingCommandType command)
@@ -1157,7 +1157,7 @@
if (!hasRunningProcess())
return;
- process().send(Messages::WebPage::GenerateSyntheticEditingCommand(command), m_webPageID);
+ send(Messages::WebPage::GenerateSyntheticEditingCommand(command));
}
void WebPageProxy::updateEditorState(const EditorState& editorState)
Modified: trunk/Source/WebKit/UIProcess/mac/ViewGestureControllerMac.mm (261298 => 261299)
--- trunk/Source/WebKit/UIProcess/mac/ViewGestureControllerMac.mm 2020-05-07 16:39:57 UTC (rev 261298)
+++ trunk/Source/WebKit/UIProcess/mac/ViewGestureControllerMac.mm 2020-05-07 16:50:59 UTC (rev 261299)
@@ -144,7 +144,7 @@
// FIXME: We drop the first frame of the gesture on the floor, because we don't have the visible content bounds yet.
m_magnification = m_webPageProxy.pageScaleFactor();
- m_webPageProxy.process().send(Messages::ViewGestureGeometryCollector::CollectGeometryForMagnificationGesture(), m_webPageProxy.webPageID());
+ m_webPageProxy.send(Messages::ViewGestureGeometryCollector::CollectGeometryForMagnificationGesture());
m_lastMagnificationGestureWasSmartMagnification = false;
return;
@@ -198,7 +198,7 @@
if (m_activeGestureType != ViewGestureType::None)
return;
- m_webPageProxy.process().send(Messages::ViewGestureGeometryCollector::CollectGeometryForSmartMagnificationGesture(origin), m_webPageProxy.webPageID());
+ m_webPageProxy.send(Messages::ViewGestureGeometryCollector::CollectGeometryForSmartMagnificationGesture(origin));
}
static float maximumRectangleComponentDelta(FloatRect a, FloatRect b)
Modified: trunk/Source/WebKit/UIProcess/mac/WebPageProxyMac.mm (261298 => 261299)
--- trunk/Source/WebKit/UIProcess/mac/WebPageProxyMac.mm 2020-05-07 16:39:57 UTC (rev 261298)
+++ trunk/Source/WebKit/UIProcess/mac/WebPageProxyMac.mm 2020-05-07 16:50:59 UTC (rev 261299)
@@ -174,7 +174,7 @@
// In case the UI client overrides getWindowFrame(), we call it here to make sure we send the appropriate window frame.
m_uiClient->windowFrame(*this, [this, protectedThis = makeRef(*this), viewFrameInWindowCoordinates, accessibilityViewCoordinates] (FloatRect windowFrameInScreenCoordinates) {
FloatRect windowFrameInUnflippedScreenCoordinates = pageClient().convertToUserSpace(windowFrameInScreenCoordinates);
- process().send(Messages::WebPage::WindowAndViewFramesChanged(windowFrameInScreenCoordinates, windowFrameInUnflippedScreenCoordinates, viewFrameInWindowCoordinates, accessibilityViewCoordinates), m_webPageID);
+ send(Messages::WebPage::WindowAndViewFramesChanged(windowFrameInScreenCoordinates, windowFrameInUnflippedScreenCoordinates, viewFrameInWindowCoordinates, accessibilityViewCoordinates));
});
}
@@ -183,7 +183,7 @@
if (!hasRunningProcess())
return;
- process().send(Messages::WebPage::SetMainFrameIsScrollable(isScrollable), m_webPageID);
+ send(Messages::WebPage::SetMainFrameIsScrollable(isScrollable));
}
void WebPageProxy::attributedSubstringForCharacterRangeAsync(const EditingRange& range, Function<void(const WebCore::AttributedString&, const EditingRange&, CallbackBase::Error)>&& callbackFunction)
@@ -195,7 +195,7 @@
auto callbackID = m_callbacks.put(WTFMove(callbackFunction), m_process->throttler().backgroundActivity("WebPageProxy::attributedSubstringForCharacterRangeAsync"_s));
- process().send(Messages::WebPage::AttributedSubstringForCharacterRangeAsync(range, callbackID), m_webPageID);
+ send(Messages::WebPage::AttributedSubstringForCharacterRangeAsync(range, callbackID));
}
void WebPageProxy::attributedStringForCharacterRangeCallback(const WebCore::AttributedString& string, const EditingRange& actualRange, CallbackID callbackID)
@@ -220,7 +220,7 @@
}
auto callbackID = m_callbacks.put(WTFMove(callback), m_process->throttler().backgroundActivity("WebPageProxy::fontAtSelection"_s));
- process().send(Messages::WebPage::FontAtSelection(callbackID), m_webPageID);
+ send(Messages::WebPage::FontAtSelection(callbackID));
}
void WebPageProxy::fontAtSelectionCallback(const FontInfo& fontInfo, double fontSize, bool selectionHasMultipleFonts, CallbackID callbackID)
@@ -241,7 +241,7 @@
return value;
const Seconds messageTimeout(20);
- process().sendSync(Messages::WebPage::GetStringSelectionForPasteboard(), Messages::WebPage::GetStringSelectionForPasteboard::Reply(value), m_webPageID, messageTimeout);
+ sendSync(Messages::WebPage::GetStringSelectionForPasteboard(), Messages::WebPage::GetStringSelectionForPasteboard::Reply(value), messageTimeout);
return value;
}
@@ -252,8 +252,7 @@
SharedMemory::Handle handle;
uint64_t size = 0;
const Seconds messageTimeout(20);
- process().sendSync(Messages::WebPage::GetDataSelectionForPasteboard(pasteboardType),
- Messages::WebPage::GetDataSelectionForPasteboard::Reply(handle, size), m_webPageID, messageTimeout);
+ sendSync(Messages::WebPage::GetDataSelectionForPasteboard(pasteboardType), Messages::WebPage::GetDataSelectionForPasteboard::Reply(handle, size), messageTimeout);
MESSAGE_CHECK_WITH_RETURN_VALUE(!handle.isNull(), nullptr);
// SharedMemory::Handle::size() is rounded up to the nearest page.
MESSAGE_CHECK_WITH_RETURN_VALUE(size <= handle.size(), nullptr);
@@ -271,7 +270,7 @@
bool result = false;
const Seconds messageTimeout(20);
- process().sendSync(Messages::WebPage::ReadSelectionFromPasteboard(pasteboardName), Messages::WebPage::ReadSelectionFromPasteboard::Reply(result), m_webPageID, messageTimeout);
+ sendSync(Messages::WebPage::ReadSelectionFromPasteboard(pasteboardName), Messages::WebPage::ReadSelectionFromPasteboard::Reply(result), messageTimeout);
return result;
}
@@ -278,7 +277,7 @@
#if ENABLE(SERVICE_CONTROLS)
void WebPageProxy::replaceSelectionWithPasteboardData(const Vector<String>& types, const IPC::DataReference& data)
{
- process().send(Messages::WebPage::ReplaceSelectionWithPasteboardData(types, data), m_webPageID);
+ send(Messages::WebPage::ReplaceSelectionWithPasteboardData(types, data));
}
#endif
@@ -319,22 +318,22 @@
if (!hasRunningProcess())
return;
- process().send(Messages::WebPage::SendComplexTextInputToPlugin(pluginComplexTextInputIdentifier, textInput), m_webPageID);
+ send(Messages::WebPage::SendComplexTextInputToPlugin(pluginComplexTextInputIdentifier, textInput));
}
void WebPageProxy::uppercaseWord()
{
- process().send(Messages::WebPage::UppercaseWord(), m_webPageID);
+ send(Messages::WebPage::UppercaseWord());
}
void WebPageProxy::lowercaseWord()
{
- process().send(Messages::WebPage::LowercaseWord(), m_webPageID);
+ send(Messages::WebPage::LowercaseWord());
}
void WebPageProxy::capitalizeWord()
{
- process().send(Messages::WebPage::CapitalizeWord(), m_webPageID);
+ send(Messages::WebPage::CapitalizeWord());
}
void WebPageProxy::setSmartInsertDeleteEnabled(bool isSmartInsertDeleteEnabled)
@@ -344,7 +343,7 @@
TextChecker::setSmartInsertDeleteEnabled(isSmartInsertDeleteEnabled);
m_isSmartInsertDeleteEnabled = isSmartInsertDeleteEnabled;
- process().send(Messages::WebPage::SetSmartInsertDeleteEnabled(isSmartInsertDeleteEnabled), m_webPageID);
+ send(Messages::WebPage::SetSmartInsertDeleteEnabled(isSmartInsertDeleteEnabled));
}
void WebPageProxy::didPerformDictionaryLookup(const DictionaryPopupInfo& dictionaryPopupInfo)
@@ -380,7 +379,7 @@
if (!hasRunningProcess())
return;
- process().send(Messages::WebPage::RegisterUIProcessAccessibilityTokens(elementToken, windowToken), m_webPageID);
+ send(Messages::WebPage::RegisterUIProcessAccessibilityTokens(elementToken, windowToken));
}
void WebPageProxy::pluginFocusOrWindowFocusChanged(uint64_t pluginComplexTextInputIdentifier, bool pluginHasFocusAndWindowHasFocus)
@@ -409,7 +408,7 @@
bool result = false;
const Seconds messageTimeout(3);
- process().sendSync(Messages::WebPage::ShouldDelayWindowOrderingEvent(event), Messages::WebPage::ShouldDelayWindowOrderingEvent::Reply(result), m_webPageID, messageTimeout);
+ sendSync(Messages::WebPage::ShouldDelayWindowOrderingEvent(event), Messages::WebPage::ShouldDelayWindowOrderingEvent::Reply(result), messageTimeout);
return result;
}
@@ -420,7 +419,7 @@
bool result = false;
const Seconds messageTimeout(3);
- process().sendSync(Messages::WebPage::AcceptsFirstMouse(eventNumber, event), Messages::WebPage::AcceptsFirstMouse::Reply(result), m_webPageID, messageTimeout);
+ sendSync(Messages::WebPage::AcceptsFirstMouse(eventNumber, event), Messages::WebPage::AcceptsFirstMouse::Reply(result), messageTimeout);
return result;
}
