Diff
Modified: trunk/Source/WebKit/ChangeLog (249434 => 249435)
--- trunk/Source/WebKit/ChangeLog 2019-09-03 18:25:27 UTC (rev 249434)
+++ trunk/Source/WebKit/ChangeLog 2019-09-03 18:37:36 UTC (rev 249435)
@@ -1,3 +1,145 @@
+2019-09-03 Chris Dumez <cdu...@apple.com>
+
+ Rename WebPage::pageID() to WebPage::identifier()
+ https://bugs.webkit.org/show_bug.cgi?id=201428
+
+ Reviewed by Antti Koivisto.
+
+ * Shared/API/Cocoa/WKBrowsingContextHandle.mm:
+ (-[WKBrowsingContextHandle _initWithPage:]):
+ * WebProcess/ApplePay/WebPaymentCoordinator.cpp:
+ (WebKit::WebPaymentCoordinator::WebPaymentCoordinator):
+ (WebKit::WebPaymentCoordinator::showPaymentUI):
+ (WebKit::WebPaymentCoordinator::messageSenderDestinationID const):
+ * WebProcess/Network/WebLoaderStrategy.cpp:
+ (WebKit::WebLoaderStrategy::loadResourceSynchronously):
+ (WebKit::WebLoaderStrategy::preconnectTo):
+ * WebProcess/Notifications/WebNotificationManager.cpp:
+ (WebKit::WebNotificationManager::show):
+ (WebKit::WebNotificationManager::cancel):
+ (WebKit::WebNotificationManager::clearNotifications):
+ (WebKit::WebNotificationManager::didDestroyNotification):
+ * WebProcess/WebAuthentication/WebAuthenticatorCoordinator.cpp:
+ (WebKit::WebAuthenticatorCoordinator::WebAuthenticatorCoordinator):
+ * WebProcess/WebCoreSupport/WebChromeClient.cpp:
+ (WebKit::WebChromeClient::windowRect):
+ (WebKit::WebChromeClient::focusedFrameChanged):
+ (WebKit::WebChromeClient::createWindow):
+ (WebKit::WebChromeClient::testProcessIncomingSyncMessagesWhenWaitingForSyncReply):
+ (WebKit::WebChromeClient::toolbarsVisible):
+ (WebKit::WebChromeClient::statusbarVisible):
+ (WebKit::WebChromeClient::menubarVisible):
+ (WebKit::WebChromeClient::wrapCryptoKey const):
+ (WebKit::WebChromeClient::unwrapCryptoKey const):
+ (WebKit::WebChromeClient::signedPublicKeyAndChallengeString const):
+ * WebProcess/WebCoreSupport/WebColorChooser.cpp:
+ (WebKit::WebColorChooser::WebColorChooser):
+ (WebKit::WebColorChooser::reattachColorChooser):
+ (WebKit::WebColorChooser::setSelectedColor):
+ (WebKit::WebColorChooser::endChooser):
+ * WebProcess/WebCoreSupport/WebDataListSuggestionPicker.cpp:
+ (WebKit::WebDataListSuggestionPicker::handleKeydownWithIdentifier):
+ (WebKit::WebDataListSuggestionPicker::close):
+ (WebKit::WebDataListSuggestionPicker::displayWithActivationType):
+ * WebProcess/WebCoreSupport/WebFrameLoaderClient.cpp:
+ (WebKit::WebFrameLoaderClient::pageID const):
+ (WebKit::WebFrameLoaderClient::dispatchDidFailProvisionalLoad):
+ (WebKit::WebFrameLoaderClient::dispatchDidFailLoad):
+ * WebProcess/WebCoreSupport/WebPopupMenu.cpp:
+ (WebKit::WebPopupMenu::show):
+ (WebKit::WebPopupMenu::hide):
+ * WebProcess/WebCoreSupport/WebSearchPopupMenu.cpp:
+ (WebKit::WebSearchPopupMenu::saveRecentSearches):
+ (WebKit::WebSearchPopupMenu::loadRecentSearches):
+ * WebProcess/WebCoreSupport/ios/WebFrameLoaderClientIOS.mm:
+ (WebKit::WebFrameLoaderClient::createPreviewLoaderClient):
+ * WebProcess/WebPage/Cocoa/TextCheckingControllerProxy.mm:
+ (WebKit::TextCheckingControllerProxy::TextCheckingControllerProxy):
+ (WebKit::TextCheckingControllerProxy::~TextCheckingControllerProxy):
+ * WebProcess/WebPage/Cocoa/WebRemoteObjectRegistry.cpp:
+ (WebKit::WebRemoteObjectRegistry::WebRemoteObjectRegistry):
+ (WebKit::WebRemoteObjectRegistry::close):
+ * WebProcess/WebPage/EventDispatcher.cpp:
+ (WebKit::EventDispatcher::addScrollingTreeForPage):
+ (WebKit::EventDispatcher::removeScrollingTreeForPage):
+ (WebKit::EventDispatcher::clearQueuedTouchEventsForPage):
+ (WebKit::EventDispatcher::getQueuedTouchEventsForPage):
+ * WebProcess/WebPage/RemoteLayerTree/RemoteLayerTreeDrawingArea.mm:
+ (WebKit::RemoteLayerTreeDrawingArea::RemoteLayerTreeDrawingArea):
+ (WebKit::RemoteLayerTreeDrawingArea::flushLayers):
+ * WebProcess/WebPage/RemoteLayerTree/RemoteScrollingCoordinator.mm:
+ (WebKit::RemoteScrollingCoordinator::RemoteScrollingCoordinator):
+ (WebKit::RemoteScrollingCoordinator::~RemoteScrollingCoordinator):
+ * WebProcess/WebPage/RemoteWebInspectorUI.cpp:
+ (WebKit::RemoteWebInspectorUI::sendMessageToBackend):
+ (WebKit::RemoteWebInspectorUI::changeSheetRect):
+ (WebKit::RemoteWebInspectorUI::startWindowDrag):
+ (WebKit::RemoteWebInspectorUI::bringToFront):
+ (WebKit::RemoteWebInspectorUI::closeWindow):
+ (WebKit::RemoteWebInspectorUI::reopen):
+ (WebKit::RemoteWebInspectorUI::resetState):
+ (WebKit::RemoteWebInspectorUI::openInNewTab):
+ (WebKit::RemoteWebInspectorUI::save):
+ (WebKit::RemoteWebInspectorUI::append):
+ (WebKit::RemoteWebInspectorUI::showCertificate):
+ * WebProcess/WebPage/ViewGestureGeometryCollector.cpp:
+ (WebKit::ViewGestureGeometryCollector::ViewGestureGeometryCollector):
+ (WebKit::ViewGestureGeometryCollector::~ViewGestureGeometryCollector):
+ * WebProcess/WebPage/WebBackForwardListProxy.cpp:
+ (WebKit::WebBackForwardListProxy::itemAtIndex):
+ (WebKit::WebBackForwardListProxy::backListCount const):
+ (WebKit::WebBackForwardListProxy::forwardListCount const):
+ * WebProcess/WebPage/WebInspector.cpp:
+ (WebKit::WebInspector::openLocalInspectorFrontend):
+ (WebKit::WebInspector::closeFrontendConnection):
+ (WebKit::WebInspector::bringToFront):
+ (WebKit::WebInspector::elementSelectionChanged):
+ (WebKit::WebInspector::timelineRecordingChanged):
+ (WebKit::WebInspector::setMockCaptureDevicesEnabledOverride):
+ (WebKit::WebInspector::updateDockingAvailability):
+ * WebProcess/WebPage/WebPage.cpp:
+ (WebKit::WebPage::WebPage):
+ (WebKit::m_textAutoSizingAdjustmentTimer):
+ (WebKit::WebPage::messageSenderDestinationID const):
+ (WebKit::WebPage::close):
+ (WebKit::WebPage::goToBackForwardItem):
+ (WebKit::WebPage::setFixedLayoutSize):
+ (WebKit::WebPage::freezeLayerTree):
+ (WebKit::WebPage::unfreezeLayerTree):
+ (WebKit::WebPage::restoreSessionInternal):
+ (WebKit::WebPage::setCurrentHistoryItemForReattach):
+ (WebKit::WebPage::updateIsInWindow):
+ (WebKit::WebPage::setActivityState):
+ (WebKit::WebPage::mainFrameDidLayout):
+ (WebKit::WebPage::didCommitLoad):
+ (WebKit::WebPage::hasStorageAccess):
+ (WebKit::WebPage::requestStorageAccess):
+ (WebKit::WebPage::textInputContextsInRect):
+ (WebKit::WebPage::elementForTextInputContext):
+ * WebProcess/WebPage/WebPage.h:
+ (WebKit::WebPage::identifier const):
+ (WebKit::WebPage::pageID const): Deleted.
+ * WebProcess/WebPage/WebPageInspectorTarget.cpp:
+ (WebKit::WebPageInspectorTarget::identifier const):
+ * WebProcess/WebPage/mac/WKAccessibilityWebPageObjectBase.mm:
+ (-[WKAccessibilityWebPageObjectBase setWebPage:]):
+ * WebProcess/WebPage/mac/WebPageMac.mm:
+ (WebKit::WebPage::executeKeypressCommandsInternal):
+ * WebProcess/WebProcess.cpp:
+ (WebKit::WebProcess::transformObjectsToHandles):
+ * WebProcess/WebStorage/StorageNamespaceImpl.cpp:
+ (WebKit::StorageNamespaceImpl::copy):
+ * WebProcess/WebStorage/WebStorageNamespaceProvider.cpp:
+ (WebKit::WebStorageNamespaceProvider::createSessionStorageNamespace):
+ * WebProcess/cocoa/PlaybackSessionManager.mm:
+ (WebKit::PlaybackSessionManager::PlaybackSessionManager):
+ (WebKit::PlaybackSessionManager::~PlaybackSessionManager):
+ (WebKit::PlaybackSessionManager::invalidate):
+ * WebProcess/cocoa/VideoFullscreenManager.mm:
+ (WebKit::VideoFullscreenManager::VideoFullscreenManager):
+ (WebKit::VideoFullscreenManager::~VideoFullscreenManager):
+ (WebKit::VideoFullscreenManager::invalidate):
+
2019-09-03 Antoine Quint <grao...@apple.com>
[iOS] Treat a two-finger single tap as if the user tapped with the Cmd key pressed
Modified: trunk/Source/WebKit/Shared/API/Cocoa/WKBrowsingContextHandle.mm (249434 => 249435)
--- trunk/Source/WebKit/Shared/API/Cocoa/WKBrowsingContextHandle.mm 2019-09-03 18:25:27 UTC (rev 249434)
+++ trunk/Source/WebKit/Shared/API/Cocoa/WKBrowsingContextHandle.mm 2019-09-03 18:37:36 UTC (rev 249435)
@@ -39,7 +39,7 @@
- (id)_initWithPage:(WebKit::WebPage&)page
{
- return [self _initWithPageProxyID:page.webPageProxyIdentifier() andWebPageID:page.pageID()];
+ return [self _initWithPageProxyID:page.webPageProxyIdentifier() andWebPageID:page.identifier()];
}
- (id)_initWithPageProxyID:(WebKit::WebPageProxyIdentifier)pageProxyID andWebPageID:(WebCore::PageIdentifier)webPageID
Modified: trunk/Source/WebKit/WebProcess/ApplePay/WebPaymentCoordinator.cpp (249434 => 249435)
--- trunk/Source/WebKit/WebProcess/ApplePay/WebPaymentCoordinator.cpp 2019-09-03 18:25:27 UTC (rev 249434)
+++ trunk/Source/WebKit/WebProcess/ApplePay/WebPaymentCoordinator.cpp 2019-09-03 18:37:36 UTC (rev 249435)
@@ -43,7 +43,7 @@
WebPaymentCoordinator::WebPaymentCoordinator(WebPage& webPage)
: m_webPage(webPage)
{
- WebProcess::singleton().addMessageReceiver(Messages::WebPaymentCoordinator::messageReceiverName(), m_webPage.pageID(), *this);
+ WebProcess::singleton().addMessageReceiver(Messages::WebPaymentCoordinator::messageReceiverName(), m_webPage.identifier(), *this);
}
WebPaymentCoordinator::~WebPaymentCoordinator()
@@ -96,7 +96,7 @@
linkIconURLStrings.append(linkIconURL.string());
bool result;
- if (!sendSync(Messages::WebPaymentCoordinatorProxy::ShowPaymentUI(m_webPage.pageID(), m_webPage.sessionID(), originatingURL.string(), linkIconURLStrings, paymentRequest), Messages::WebPaymentCoordinatorProxy::ShowPaymentUI::Reply(result)))
+ if (!sendSync(Messages::WebPaymentCoordinatorProxy::ShowPaymentUI(m_webPage.identifier(), m_webPage.sessionID(), originatingURL.string(), linkIconURLStrings, paymentRequest), Messages::WebPaymentCoordinatorProxy::ShowPaymentUI::Reply(result)))
return false;
return result;
@@ -168,7 +168,7 @@
uint64_t WebPaymentCoordinator::messageSenderDestinationID() const
{
- return m_webPage.pageID().toUInt64();
+ return m_webPage.identifier().toUInt64();
}
void WebPaymentCoordinator::validateMerchant(const String& validationURLString)
Modified: trunk/Source/WebKit/WebProcess/InjectedBundle/API/glib/WebKitWebExtension.cpp (249434 => 249435)
--- trunk/Source/WebKit/WebProcess/InjectedBundle/API/glib/WebKitWebExtension.cpp 2019-09-03 18:25:27 UTC (rev 249434)
+++ trunk/Source/WebKit/WebProcess/InjectedBundle/API/glib/WebKitWebExtension.cpp 2019-09-03 18:37:36 UTC (rev 249435)
@@ -224,7 +224,7 @@
WebKitWebExtensionPrivate* priv = extension->priv;
WebPageMap::const_iterator end = priv->pages.end();
for (WebPageMap::const_iterator it = priv->pages.begin(); it != end; ++it)
- if (it->key->pageID().toUInt64() == pageID)
+ if (it->key->identifier().toUInt64() == pageID)
return it->value.get();
return 0;
Modified: trunk/Source/WebKit/WebProcess/InjectedBundle/API/glib/WebKitWebPage.cpp (249434 => 249435)
--- trunk/Source/WebKit/WebProcess/InjectedBundle/API/glib/WebKitWebPage.cpp 2019-09-03 18:25:27 UTC (rev 249434)
+++ trunk/Source/WebKit/WebProcess/InjectedBundle/API/glib/WebKitWebPage.cpp 2019-09-03 18:37:36 UTC (rev 249435)
@@ -249,7 +249,7 @@
}
webkitURIRequestGetResourceRequest(request.get(), resourceRequest);
- resourceRequest.setInitiatingPageID(page.pageID());
+ resourceRequest.setInitiatingPageID(page.identifier());
API::Dictionary::MapType message;
message.set(String::fromUTF8("Page"), &page);
@@ -764,7 +764,7 @@
{
g_return_val_if_fail(WEBKIT_IS_WEB_PAGE(webPage), 0);
- return webPage->priv->webPage->pageID().toUInt64();
+ return webPage->priv->webPage->identifier().toUInt64();
}
/**
Modified: trunk/Source/WebKit/WebProcess/Network/WebLoaderStrategy.cpp (249434 => 249435)
--- trunk/Source/WebKit/WebProcess/Network/WebLoaderStrategy.cpp 2019-09-03 18:25:27 UTC (rev 249434)
+++ trunk/Source/WebKit/WebProcess/Network/WebLoaderStrategy.cpp 2019-09-03 18:37:36 UTC (rev 249435)
@@ -521,7 +521,7 @@
WebFrame* webFrame = webFrameLoaderClient ? webFrameLoaderClient->webFrame() : nullptr;
WebPage* webPage = webFrame ? webFrame->page() : nullptr;
- auto pageID = webPage ? webPage->pageID() : PageIdentifier { };
+ auto pageID = webPage ? webPage->identifier() : PageIdentifier { };
auto frameID = webFrame ? webFrame->frameID() : FrameIdentifier { };
auto sessionID = webPage ? webPage->sessionID() : PAL::SessionID::defaultSessionID();
@@ -670,7 +670,7 @@
NetworkResourceLoadParameters parameters { webPage->sessionID() };
parameters.request = ResourceRequest { url };
- parameters.webPageID = webPage->pageID();
+ parameters.webPageID = webPage->identifier();
parameters.webFrameID = webFrame->frameID();
parameters.parentPID = presentingApplicationPID();
parameters.storedCredentialsPolicy = storedCredentialsPolicy;
Modified: trunk/Source/WebKit/WebProcess/Notifications/WebNotificationManager.cpp (249434 => 249435)
--- trunk/Source/WebKit/WebProcess/Notifications/WebNotificationManager.cpp 2019-09-03 18:25:27 UTC (rev 249434)
+++ trunk/Source/WebKit/WebProcess/Notifications/WebNotificationManager.cpp 2019-09-03 18:37:36 UTC (rev 249435)
@@ -150,7 +150,7 @@
auto it = m_notificationContextMap.add(notification->scriptExecutionContext(), Vector<uint64_t>()).iterator;
it->value.append(notificationID);
- m_process.parentProcessConnection()->send(Messages::WebPageProxy::ShowNotification(notification->title(), notification->body(), notification->icon().string(), notification->tag(), notification->lang(), notification->dir(), notification->scriptExecutionContext()->securityOrigin()->toString(), notificationID), page->pageID());
+ m_process.parentProcessConnection()->send(Messages::WebPageProxy::ShowNotification(notification->title(), notification->body(), notification->icon().string(), notification->tag(), notification->lang(), notification->dir(), notification->scriptExecutionContext()->securityOrigin()->toString(), notificationID), page->identifier());
return true;
#else
UNUSED_PARAM(notification);
@@ -169,7 +169,7 @@
if (!notificationID)
return;
- m_process.parentProcessConnection()->send(Messages::WebPageProxy::CancelNotification(notificationID), page->pageID());
+ m_process.parentProcessConnection()->send(Messages::WebPageProxy::CancelNotification(notificationID), page->identifier());
#else
UNUSED_PARAM(notification);
UNUSED_PARAM(page);
@@ -184,7 +184,7 @@
return;
Vector<uint64_t>& notificationIDs = it->value;
- m_process.parentProcessConnection()->send(Messages::WebPageProxy::ClearNotifications(notificationIDs), page->pageID());
+ m_process.parentProcessConnection()->send(Messages::WebPageProxy::ClearNotifications(notificationIDs), page->identifier());
size_t count = notificationIDs.size();
for (size_t i = 0; i < count; ++i) {
RefPtr<Notification> notification = m_notificationIDMap.take(notificationIDs[i]);
@@ -210,7 +210,7 @@
m_notificationIDMap.remove(notificationID);
removeNotificationFromContextMap(notificationID, notification);
- m_process.parentProcessConnection()->send(Messages::WebPageProxy::DidDestroyNotification(notificationID), page->pageID());
+ m_process.parentProcessConnection()->send(Messages::WebPageProxy::DidDestroyNotification(notificationID), page->identifier());
#else
UNUSED_PARAM(notification);
UNUSED_PARAM(page);
Modified: trunk/Source/WebKit/WebProcess/WebAuthentication/WebAuthenticatorCoordinator.cpp (249434 => 249435)
--- trunk/Source/WebKit/WebProcess/WebAuthentication/WebAuthenticatorCoordinator.cpp 2019-09-03 18:25:27 UTC (rev 249434)
+++ trunk/Source/WebKit/WebProcess/WebAuthentication/WebAuthenticatorCoordinator.cpp 2019-09-03 18:37:36 UTC (rev 249435)
@@ -40,7 +40,7 @@
WebAuthenticatorCoordinator::WebAuthenticatorCoordinator(WebPage& webPage)
: m_webPage(webPage)
{
- WebProcess::singleton().addMessageReceiver(Messages::WebAuthenticatorCoordinator::messageReceiverName(), m_webPage.pageID(), *this);
+ WebProcess::singleton().addMessageReceiver(Messages::WebAuthenticatorCoordinator::messageReceiverName(), m_webPage.identifier(), *this);
}
WebAuthenticatorCoordinator::~WebAuthenticatorCoordinator()
Modified: trunk/Source/WebKit/WebProcess/WebCoreSupport/WebChromeClient.cpp (249434 => 249435)
--- trunk/Source/WebKit/WebProcess/WebCoreSupport/WebChromeClient.cpp 2019-09-03 18:25:27 UTC (rev 249434)
+++ trunk/Source/WebKit/WebProcess/WebCoreSupport/WebChromeClient.cpp 2019-09-03 18:37:36 UTC (rev 249435)
@@ -180,7 +180,7 @@
FloatRect newWindowFrame;
- if (!WebProcess::singleton().parentProcessConnection()->sendSync(Messages::WebPageProxy::GetWindowFrame(), Messages::WebPageProxy::GetWindowFrame::Reply(newWindowFrame), m_page.pageID()))
+ if (!WebProcess::singleton().parentProcessConnection()->sendSync(Messages::WebPageProxy::GetWindowFrame(), Messages::WebPageProxy::GetWindowFrame::Reply(newWindowFrame), m_page.identifier()))
return FloatRect();
return newWindowFrame;
@@ -265,7 +265,7 @@
{
WebFrame* webFrame = frame ? WebFrame::fromCoreFrame(*frame) : nullptr;
- WebProcess::singleton().parentProcessConnection()->send(Messages::WebPageProxy::FocusedFrameChanged(webFrame ? makeOptional(webFrame->frameID()) : WTF::nullopt), m_page.pageID());
+ WebProcess::singleton().parentProcessConnection()->send(Messages::WebPageProxy::FocusedFrameChanged(webFrame ? makeOptional(webFrame->frameID()) : WTF::nullopt), m_page.identifier());
}
Page* WebChromeClient::createWindow(Frame& frame, const FrameLoadRequest& request, const WindowFeatures& windowFeatures, const NavigationAction& navigationAction)
@@ -292,7 +292,7 @@
Optional<PageIdentifier> newPageID;
Optional<WebPageCreationParameters> parameters;
- if (!webProcess.parentProcessConnection()->sendSync(Messages::WebPageProxy::CreateNewPage(webFrame->info(), webFrame->page()->webPageProxyIdentifier(), request.resourceRequest(), windowFeatures, navigationActionData), Messages::WebPageProxy::CreateNewPage::Reply(newPageID, parameters), m_page.pageID()))
+ if (!webProcess.parentProcessConnection()->sendSync(Messages::WebPageProxy::CreateNewPage(webFrame->info(), webFrame->page()->webPageProxyIdentifier(), request.resourceRequest(), windowFeatures, navigationActionData), Messages::WebPageProxy::CreateNewPage::Reply(newPageID, parameters), m_page.identifier()))
return nullptr;
if (!newPageID)
@@ -299,7 +299,7 @@
return nullptr;
ASSERT(parameters);
if (parameters->sessionID == m_page.sessionID())
- parameters->oldPageID = m_page.pageID();
+ parameters->oldPageID = m_page.identifier();
webProcess.createWebPage(*newPageID, WTFMove(*parameters));
return webProcess.webPage(*newPageID)->corePage();
@@ -309,7 +309,7 @@
{
IPC::UnboundedSynchronousIPCScope unboundedSynchronousIPCScope;
bool handled = false;
- if (!WebProcess::singleton().ensureNetworkProcessConnection().connection().sendSync(Messages::NetworkConnectionToWebProcess::TestProcessIncomingSyncMessagesWhenWaitingForSyncReply(m_page.pageID()), Messages::NetworkConnectionToWebProcess::TestProcessIncomingSyncMessagesWhenWaitingForSyncReply::Reply(handled), 0))
+ if (!WebProcess::singleton().ensureNetworkProcessConnection().connection().sendSync(Messages::NetworkConnectionToWebProcess::TestProcessIncomingSyncMessagesWhenWaitingForSyncReply(m_page.identifier()), Messages::NetworkConnectionToWebProcess::TestProcessIncomingSyncMessagesWhenWaitingForSyncReply::Reply(handled), 0))
return false;
return handled;
}
@@ -346,7 +346,7 @@
return toolbarsVisibility == API::InjectedBundle::PageUIClient::UIElementVisibility::Visible;
bool toolbarsAreVisible = true;
- if (!WebProcess::singleton().parentProcessConnection()->sendSync(Messages::WebPageProxy::GetToolbarsAreVisible(), Messages::WebPageProxy::GetToolbarsAreVisible::Reply(toolbarsAreVisible), m_page.pageID()))
+ if (!WebProcess::singleton().parentProcessConnection()->sendSync(Messages::WebPageProxy::GetToolbarsAreVisible(), Messages::WebPageProxy::GetToolbarsAreVisible::Reply(toolbarsAreVisible), m_page.identifier()))
return true;
return toolbarsAreVisible;
@@ -364,7 +364,7 @@
return statusbarVisibility == API::InjectedBundle::PageUIClient::UIElementVisibility::Visible;
bool statusBarIsVisible = true;
- if (!WebProcess::singleton().parentProcessConnection()->sendSync(Messages::WebPageProxy::GetStatusBarIsVisible(), Messages::WebPageProxy::GetStatusBarIsVisible::Reply(statusBarIsVisible), m_page.pageID()))
+ if (!WebProcess::singleton().parentProcessConnection()->sendSync(Messages::WebPageProxy::GetStatusBarIsVisible(), Messages::WebPageProxy::GetStatusBarIsVisible::Reply(statusBarIsVisible), m_page.identifier()))
return true;
return statusBarIsVisible;
@@ -393,7 +393,7 @@
return menubarVisibility == API::InjectedBundle::PageUIClient::UIElementVisibility::Visible;
bool menuBarIsVisible = true;
- if (!WebProcess::singleton().parentProcessConnection()->sendSync(Messages::WebPageProxy::GetMenuBarIsVisible(), Messages::WebPageProxy::GetMenuBarIsVisible::Reply(menuBarIsVisible), m_page.pageID()))
+ if (!WebProcess::singleton().parentProcessConnection()->sendSync(Messages::WebPageProxy::GetMenuBarIsVisible(), Messages::WebPageProxy::GetMenuBarIsVisible::Reply(menuBarIsVisible), m_page.identifier()))
return true;
return menuBarIsVisible;
@@ -1185,7 +1185,7 @@
bool WebChromeClient::wrapCryptoKey(const Vector<uint8_t>& key, Vector<uint8_t>& wrappedKey) const
{
bool succeeded;
- if (!WebProcess::singleton().parentProcessConnection()->sendSync(Messages::WebPageProxy::WrapCryptoKey(key), Messages::WebPageProxy::WrapCryptoKey::Reply(succeeded, wrappedKey), m_page.pageID()))
+ if (!WebProcess::singleton().parentProcessConnection()->sendSync(Messages::WebPageProxy::WrapCryptoKey(key), Messages::WebPageProxy::WrapCryptoKey::Reply(succeeded, wrappedKey), m_page.identifier()))
return false;
return succeeded;
}
@@ -1193,7 +1193,7 @@
bool WebChromeClient::unwrapCryptoKey(const Vector<uint8_t>& wrappedKey, Vector<uint8_t>& key) const
{
bool succeeded;
- if (!WebProcess::singleton().parentProcessConnection()->sendSync(Messages::WebPageProxy::UnwrapCryptoKey(wrappedKey), Messages::WebPageProxy::UnwrapCryptoKey::Reply(succeeded, key), m_page.pageID()))
+ if (!WebProcess::singleton().parentProcessConnection()->sendSync(Messages::WebPageProxy::UnwrapCryptoKey(wrappedKey), Messages::WebPageProxy::UnwrapCryptoKey::Reply(succeeded, key), m_page.identifier()))
return false;
return succeeded;
}
@@ -1203,7 +1203,7 @@
String WebChromeClient::signedPublicKeyAndChallengeString(unsigned keySizeIndex, const String& challengeString, const URL& url) const
{
String result;
- if (!WebProcess::singleton().parentProcessConnection()->sendSync(Messages::WebPageProxy::SignedPublicKeyAndChallengeString(keySizeIndex, challengeString, url), Messages::WebPageProxy::SignedPublicKeyAndChallengeString::Reply(result), m_page.pageID()))
+ if (!WebProcess::singleton().parentProcessConnection()->sendSync(Messages::WebPageProxy::SignedPublicKeyAndChallengeString(keySizeIndex, challengeString, url), Messages::WebPageProxy::SignedPublicKeyAndChallengeString::Reply(result), m_page.identifier()))
return emptyString();
return result;
}
Modified: trunk/Source/WebKit/WebProcess/WebCoreSupport/WebColorChooser.cpp (249434 => 249435)
--- trunk/Source/WebKit/WebProcess/WebCoreSupport/WebColorChooser.cpp 2019-09-03 18:25:27 UTC (rev 249434)
+++ trunk/Source/WebKit/WebProcess/WebCoreSupport/WebColorChooser.cpp 2019-09-03 18:37:36 UTC (rev 249435)
@@ -42,7 +42,7 @@
, m_page(page)
{
m_page->setActiveColorChooser(this);
- WebProcess::singleton().parentProcessConnection()->send(Messages::WebPageProxy::ShowColorPicker(initialColor, client->elementRectRelativeToRootView(), client->suggestedColors()), m_page->pageID());
+ WebProcess::singleton().parentProcessConnection()->send(Messages::WebPageProxy::ShowColorPicker(initialColor, client->elementRectRelativeToRootView(), client->suggestedColors()), m_page->identifier());
}
WebColorChooser::~WebColorChooser()
@@ -74,7 +74,7 @@
m_page->setActiveColorChooser(this);
ASSERT(m_colorChooserClient);
- WebProcess::singleton().parentProcessConnection()->send(Messages::WebPageProxy::ShowColorPicker(color, m_colorChooserClient->elementRectRelativeToRootView(), m_colorChooserClient->suggestedColors()), m_page->pageID());
+ WebProcess::singleton().parentProcessConnection()->send(Messages::WebPageProxy::ShowColorPicker(color, m_colorChooserClient->elementRectRelativeToRootView(), m_colorChooserClient->suggestedColors()), m_page->identifier());
}
void WebColorChooser::setSelectedColor(const Color& color)
@@ -85,7 +85,7 @@
if (m_page->activeColorChooser() != this)
return;
- WebProcess::singleton().parentProcessConnection()->send(Messages::WebPageProxy::SetColorPickerColor(color), m_page->pageID());
+ WebProcess::singleton().parentProcessConnection()->send(Messages::WebPageProxy::SetColorPickerColor(color), m_page->identifier());
}
void WebColorChooser::endChooser()
@@ -93,7 +93,7 @@
if (!m_page)
return;
- WebProcess::singleton().parentProcessConnection()->send(Messages::WebPageProxy::EndColorPicker(), m_page->pageID());
+ WebProcess::singleton().parentProcessConnection()->send(Messages::WebPageProxy::EndColorPicker(), m_page->identifier());
}
} // namespace WebKit
Modified: trunk/Source/WebKit/WebProcess/WebCoreSupport/WebDataListSuggestionPicker.cpp (249434 => 249435)
--- trunk/Source/WebKit/WebProcess/WebCoreSupport/WebDataListSuggestionPicker.cpp 2019-09-03 18:25:27 UTC (rev 249434)
+++ trunk/Source/WebKit/WebProcess/WebCoreSupport/WebDataListSuggestionPicker.cpp 2019-09-03 18:37:36 UTC (rev 249435)
@@ -47,7 +47,7 @@
void WebDataListSuggestionPicker::handleKeydownWithIdentifier(const WTF::String& key)
{
- WebProcess::singleton().parentProcessConnection()->send(Messages::WebPageProxy::HandleKeydownInDataList(key), m_page->pageID());
+ WebProcess::singleton().parentProcessConnection()->send(Messages::WebPageProxy::HandleKeydownInDataList(key), m_page->identifier());
}
void WebDataListSuggestionPicker::didSelectOption(const WTF::String& selectedOption)
@@ -62,7 +62,7 @@
void WebDataListSuggestionPicker::close()
{
- WebProcess::singleton().parentProcessConnection()->send(Messages::WebPageProxy::EndDataListSuggestions(), m_page->pageID());
+ WebProcess::singleton().parentProcessConnection()->send(Messages::WebPageProxy::EndDataListSuggestions(), m_page->identifier());
}
void WebDataListSuggestionPicker::displayWithActivationType(DataListSuggestionActivationType type)
@@ -75,7 +75,7 @@
m_page->setActiveDataListSuggestionPicker(this);
DataListSuggestionInformation info = { type, m_dataListSuggestionsClient->suggestions(), m_dataListSuggestionsClient->elementRectInRootViewCoordinates() };
- WebProcess::singleton().parentProcessConnection()->send(Messages::WebPageProxy::ShowDataListSuggestions(info), m_page->pageID());
+ WebProcess::singleton().parentProcessConnection()->send(Messages::WebPageProxy::ShowDataListSuggestions(info), m_page->identifier());
}
} // namespace WebKit
Modified: trunk/Source/WebKit/WebProcess/WebCoreSupport/WebFrameLoaderClient.cpp (249434 => 249435)
--- trunk/Source/WebKit/WebProcess/WebCoreSupport/WebFrameLoaderClient.cpp 2019-09-03 18:25:27 UTC (rev 249434)
+++ trunk/Source/WebKit/WebProcess/WebCoreSupport/WebFrameLoaderClient.cpp 2019-09-03 18:37:36 UTC (rev 249435)
@@ -115,7 +115,7 @@
Optional<PageIdentifier> WebFrameLoaderClient::pageID() const
{
if (m_frame && m_frame->page())
- return m_frame->page()->pageID();
+ return m_frame->page()->identifier();
return WTF::nullopt;
}
@@ -546,7 +546,7 @@
if (!webPage)
return;
- RELEASE_LOG(Network, "%p - WebFrameLoaderClient::dispatchDidFailProvisionalLoad: (pageID = %" PRIu64 ", frameID = %" PRIu64 ")", this, webPage->pageID().toUInt64(), m_frame->frameID().toUInt64());
+ RELEASE_LOG(Network, "%p - WebFrameLoaderClient::dispatchDidFailProvisionalLoad: (pageID = %" PRIu64 ", frameID = %" PRIu64 ")", this, webPage->identifier().toUInt64(), m_frame->frameID().toUInt64());
RefPtr<API::Object> userData;
@@ -582,7 +582,7 @@
if (!webPage)
return;
- RELEASE_LOG(Network, "%p - WebFrameLoaderClient::dispatchDidFailLoad: (pageID = %" PRIu64 ", frameID = %" PRIu64 ")", this, webPage->pageID().toUInt64(), m_frame->frameID().toUInt64());
+ RELEASE_LOG(Network, "%p - WebFrameLoaderClient::dispatchDidFailLoad: (pageID = %" PRIu64 ", frameID = %" PRIu64 ")", this, webPage->identifier().toUInt64(), m_frame->frameID().toUInt64());
RefPtr<API::Object> userData;
Modified: trunk/Source/WebKit/WebProcess/WebCoreSupport/WebPopupMenu.cpp (249434 => 249435)
--- trunk/Source/WebKit/WebProcess/WebCoreSupport/WebPopupMenu.cpp 2019-09-03 18:25:27 UTC (rev 249434)
+++ trunk/Source/WebKit/WebProcess/WebCoreSupport/WebPopupMenu.cpp 2019-09-03 18:37:36 UTC (rev 249435)
@@ -111,7 +111,7 @@
PlatformPopupMenuData platformData;
setUpPlatformData(pageCoordinates, platformData);
- WebProcess::singleton().parentProcessConnection()->send(Messages::WebPageProxy::ShowPopupMenu(pageCoordinates, static_cast<uint64_t>(m_popupClient->menuStyle().textDirection()), items, index, platformData), m_page->pageID());
+ WebProcess::singleton().parentProcessConnection()->send(Messages::WebPageProxy::ShowPopupMenu(pageCoordinates, static_cast<uint64_t>(m_popupClient->menuStyle().textDirection()), items, index, platformData), m_page->identifier());
}
void WebPopupMenu::hide()
@@ -119,7 +119,7 @@
if (!m_page || !m_popupClient)
return;
- WebProcess::singleton().parentProcessConnection()->send(Messages::WebPageProxy::HidePopupMenu(), m_page->pageID());
+ WebProcess::singleton().parentProcessConnection()->send(Messages::WebPageProxy::HidePopupMenu(), m_page->identifier());
m_page->setActivePopupMenu(nullptr);
m_popupClient->popupDidHide();
}
Modified: trunk/Source/WebKit/WebProcess/WebCoreSupport/WebSearchPopupMenu.cpp (249434 => 249435)
--- trunk/Source/WebKit/WebProcess/WebCoreSupport/WebSearchPopupMenu.cpp 2019-09-03 18:25:27 UTC (rev 249434)
+++ trunk/Source/WebKit/WebProcess/WebCoreSupport/WebSearchPopupMenu.cpp 2019-09-03 18:37:36 UTC (rev 249435)
@@ -56,7 +56,7 @@
if (!page)
return;
- WebProcess::singleton().parentProcessConnection()->send(Messages::WebPageProxy::SaveRecentSearches(name, searchItems), page->pageID());
+ WebProcess::singleton().parentProcessConnection()->send(Messages::WebPageProxy::SaveRecentSearches(name, searchItems), page->identifier());
}
void WebSearchPopupMenu::loadRecentSearches(const AtomString& name, Vector<RecentSearch>& resultItems)
@@ -68,7 +68,7 @@
if (!page)
return;
- WebProcess::singleton().parentProcessConnection()->sendSync(Messages::WebPageProxy::LoadRecentSearches(name), Messages::WebPageProxy::LoadRecentSearches::Reply(resultItems), page->pageID());
+ WebProcess::singleton().parentProcessConnection()->sendSync(Messages::WebPageProxy::LoadRecentSearches(name), Messages::WebPageProxy::LoadRecentSearches::Reply(resultItems), page->identifier());
}
bool WebSearchPopupMenu::enabled()
Modified: trunk/Source/WebKit/WebProcess/WebCoreSupport/ios/WebFrameLoaderClientIOS.mm (249434 => 249435)
--- trunk/Source/WebKit/WebProcess/WebCoreSupport/ios/WebFrameLoaderClientIOS.mm 2019-09-03 18:25:27 UTC (rev 249434)
+++ trunk/Source/WebKit/WebProcess/WebCoreSupport/ios/WebFrameLoaderClientIOS.mm 2019-09-03 18:37:36 UTC (rev 249435)
@@ -74,7 +74,7 @@
if (!webPage)
return nullptr;
- return WebPreviewLoaderClient::create(fileName, uti, webPage->pageID());
+ return WebPreviewLoaderClient::create(fileName, uti, webPage->identifier());
}
#endif
Modified: trunk/Source/WebKit/WebProcess/WebPage/Cocoa/TextCheckingControllerProxy.mm (249434 => 249435)
--- trunk/Source/WebKit/WebProcess/WebPage/Cocoa/TextCheckingControllerProxy.mm 2019-09-03 18:25:27 UTC (rev 249434)
+++ trunk/Source/WebKit/WebProcess/WebPage/Cocoa/TextCheckingControllerProxy.mm 2019-09-03 18:37:36 UTC (rev 249435)
@@ -57,12 +57,12 @@
TextCheckingControllerProxy::TextCheckingControllerProxy(WebPage& page)
: m_page(page)
{
- WebProcess::singleton().addMessageReceiver(Messages::TextCheckingControllerProxy::messageReceiverName(), m_page.pageID(), *this);
+ WebProcess::singleton().addMessageReceiver(Messages::TextCheckingControllerProxy::messageReceiverName(), m_page.identifier(), *this);
}
TextCheckingControllerProxy::~TextCheckingControllerProxy()
{
- WebProcess::singleton().removeMessageReceiver(Messages::TextCheckingControllerProxy::messageReceiverName(), m_page.pageID());
+ WebProcess::singleton().removeMessageReceiver(Messages::TextCheckingControllerProxy::messageReceiverName(), m_page.identifier());
}
static OptionSet<DocumentMarker::MarkerType> relevantMarkerTypes()
Modified: trunk/Source/WebKit/WebProcess/WebPage/Cocoa/WebRemoteObjectRegistry.cpp (249434 => 249435)
--- trunk/Source/WebKit/WebProcess/WebPage/Cocoa/WebRemoteObjectRegistry.cpp 2019-09-03 18:25:27 UTC (rev 249434)
+++ trunk/Source/WebKit/WebProcess/WebPage/Cocoa/WebRemoteObjectRegistry.cpp 2019-09-03 18:37:36 UTC (rev 249435)
@@ -35,7 +35,7 @@
: RemoteObjectRegistry(remoteObjectRegistry)
, m_page(page)
{
- WebProcess::singleton().addMessageReceiver(Messages::RemoteObjectRegistry::messageReceiverName(), m_page.pageID(), *this);
+ WebProcess::singleton().addMessageReceiver(Messages::RemoteObjectRegistry::messageReceiverName(), m_page.identifier(), *this);
page.setRemoteObjectRegistry(this);
}
@@ -47,7 +47,7 @@
void WebRemoteObjectRegistry::close()
{
if (m_page.remoteObjectRegistry() == this) {
- WebProcess::singleton().removeMessageReceiver(Messages::RemoteObjectRegistry::messageReceiverName(), m_page.pageID());
+ WebProcess::singleton().removeMessageReceiver(Messages::RemoteObjectRegistry::messageReceiverName(), m_page.identifier());
m_page.setRemoteObjectRegistry(nullptr);
}
}
Modified: trunk/Source/WebKit/WebProcess/WebPage/CoordinatedGraphics/DrawingAreaCoordinatedGraphics.cpp (249434 => 249435)
--- trunk/Source/WebKit/WebProcess/WebPage/CoordinatedGraphics/DrawingAreaCoordinatedGraphics.cpp 2019-09-03 18:25:27 UTC (rev 249434)
+++ trunk/Source/WebKit/WebProcess/WebPage/CoordinatedGraphics/DrawingAreaCoordinatedGraphics.cpp 2019-09-03 18:37:36 UTC (rev 249435)
@@ -545,7 +545,7 @@
// In order to ensure that we get a unique DisplayRefreshMonitor per-DrawingArea (necessary because ThreadedDisplayRefreshMonitor
// is driven by the ThreadedCompositor of the drawing area), give each page a unique DisplayID derived from WebPage's unique ID.
- m_webPage.windowScreenDidChange(std::numeric_limits<uint32_t>::max() - m_webPage.pageID().toUInt64());
+ m_webPage.windowScreenDidChange(std::numeric_limits<uint32_t>::max() - m_webPage.identifier().toUInt64());
ASSERT(!m_layerTreeHost);
if (m_previousLayerTreeHost) {
Modified: trunk/Source/WebKit/WebProcess/WebPage/EventDispatcher.cpp (249434 => 249435)
--- trunk/Source/WebKit/WebProcess/WebPage/EventDispatcher.cpp 2019-09-03 18:25:27 UTC (rev 249434)
+++ trunk/Source/WebKit/WebProcess/WebPage/EventDispatcher.cpp 2019-09-03 18:37:36 UTC (rev 249435)
@@ -68,18 +68,18 @@
LockHolder locker(m_scrollingTreesMutex);
ASSERT(webPage->corePage()->scrollingCoordinator());
- ASSERT(!m_scrollingTrees.contains(webPage->pageID()));
+ ASSERT(!m_scrollingTrees.contains(webPage->identifier()));
AsyncScrollingCoordinator& scrollingCoordinator = downcast<AsyncScrollingCoordinator>(*webPage->corePage()->scrollingCoordinator());
- m_scrollingTrees.set(webPage->pageID(), downcast<ThreadedScrollingTree>(scrollingCoordinator.scrollingTree()));
+ m_scrollingTrees.set(webPage->identifier(), downcast<ThreadedScrollingTree>(scrollingCoordinator.scrollingTree()));
}
void EventDispatcher::removeScrollingTreeForPage(WebPage* webPage)
{
LockHolder locker(m_scrollingTreesMutex);
- ASSERT(m_scrollingTrees.contains(webPage->pageID()));
+ ASSERT(m_scrollingTrees.contains(webPage->identifier()));
- m_scrollingTrees.remove(webPage->pageID());
+ m_scrollingTrees.remove(webPage->identifier());
}
#endif
@@ -155,13 +155,13 @@
void EventDispatcher::clearQueuedTouchEventsForPage(const WebPage& webPage)
{
LockHolder locker(&m_touchEventsLock);
- m_touchEvents.remove(webPage.pageID());
+ m_touchEvents.remove(webPage.identifier());
}
void EventDispatcher::getQueuedTouchEventsForPage(const WebPage& webPage, TouchEventQueue& destinationQueue)
{
LockHolder locker(&m_touchEventsLock);
- destinationQueue = m_touchEvents.take(webPage.pageID());
+ destinationQueue = m_touchEvents.take(webPage.identifier());
}
void EventDispatcher::touchEvent(PageIdentifier pageID, const WebKit::WebTouchEvent& touchEvent)
Modified: trunk/Source/WebKit/WebProcess/WebPage/RemoteLayerTree/RemoteLayerTreeDrawingArea.mm (249434 => 249435)
--- trunk/Source/WebKit/WebProcess/WebPage/RemoteLayerTree/RemoteLayerTreeDrawingArea.mm 2019-09-03 18:25:27 UTC (rev 249434)
+++ trunk/Source/WebKit/WebProcess/WebPage/RemoteLayerTree/RemoteLayerTreeDrawingArea.mm 2019-09-03 18:37:36 UTC (rev 249435)
@@ -75,7 +75,7 @@
// FIXME: While using the high end of the range of DisplayIDs makes a collision with real, non-RemoteLayerTreeDrawingArea
// DisplayIDs less likely, it is not entirely safe to have a RemoteLayerTreeDrawingArea and TiledCoreAnimationDrawingArea
// coeexist in the same process.
- webPage.windowScreenDidChange(std::numeric_limits<uint32_t>::max() - webPage.pageID().toUInt64());
+ webPage.windowScreenDidChange(std::numeric_limits<uint32_t>::max() - webPage.identifier().toUInt64());
}
RemoteLayerTreeDrawingArea::~RemoteLayerTreeDrawingArea()
@@ -449,7 +449,7 @@
RefPtr<BackingStoreFlusher> backingStoreFlusher = BackingStoreFlusher::create(WebProcess::singleton().parentProcessConnection(), WTFMove(commitEncoder), WTFMove(contextsToFlush));
m_pendingBackingStoreFlusher = backingStoreFlusher;
- auto pageID = m_webPage.pageID();
+ auto pageID = m_webPage.identifier();
dispatch_async(m_commitQueue, [backingStoreFlusher = WTFMove(backingStoreFlusher), pageID] {
backingStoreFlusher->flush();
Modified: trunk/Source/WebKit/WebProcess/WebPage/RemoteLayerTree/RemoteScrollingCoordinator.mm (249434 => 249435)
--- trunk/Source/WebKit/WebProcess/WebPage/RemoteLayerTree/RemoteScrollingCoordinator.mm 2019-09-03 18:25:27 UTC (rev 249434)
+++ trunk/Source/WebKit/WebProcess/WebPage/RemoteLayerTree/RemoteScrollingCoordinator.mm 2019-09-03 18:37:36 UTC (rev 249435)
@@ -51,12 +51,12 @@
: AsyncScrollingCoordinator(page->corePage())
, m_webPage(page)
{
- WebProcess::singleton().addMessageReceiver(Messages::RemoteScrollingCoordinator::messageReceiverName(), m_webPage->pageID(), *this);
+ WebProcess::singleton().addMessageReceiver(Messages::RemoteScrollingCoordinator::messageReceiverName(), m_webPage->identifier(), *this);
}
RemoteScrollingCoordinator::~RemoteScrollingCoordinator()
{
- WebProcess::singleton().removeMessageReceiver(Messages::RemoteScrollingCoordinator::messageReceiverName(), m_webPage->pageID());
+ WebProcess::singleton().removeMessageReceiver(Messages::RemoteScrollingCoordinator::messageReceiverName(), m_webPage->identifier());
}
void RemoteScrollingCoordinator::scheduleTreeStateCommit()
Modified: trunk/Source/WebKit/WebProcess/WebPage/RemoteWebInspectorUI.cpp (249434 => 249435)
--- trunk/Source/WebKit/WebProcess/WebPage/RemoteWebInspectorUI.cpp 2019-09-03 18:25:27 UTC (rev 249434)
+++ trunk/Source/WebKit/WebProcess/WebPage/RemoteWebInspectorUI.cpp 2019-09-03 18:37:36 UTC (rev 249435)
@@ -79,7 +79,7 @@
void RemoteWebInspectorUI::sendMessageToBackend(const String& message)
{
- WebProcess::singleton().parentProcessConnection()->send(Messages::RemoteWebInspectorProxy::SendMessageToBackend(message), m_page.pageID());
+ WebProcess::singleton().parentProcessConnection()->send(Messages::RemoteWebInspectorProxy::SendMessageToBackend(message), m_page.identifier());
}
void RemoteWebInspectorUI::windowObjectCleared()
@@ -102,12 +102,12 @@
void RemoteWebInspectorUI::changeSheetRect(const FloatRect& rect)
{
- WebProcess::singleton().parentProcessConnection()->send(Messages::RemoteWebInspectorProxy::SetSheetRect(rect), m_page.pageID());
+ WebProcess::singleton().parentProcessConnection()->send(Messages::RemoteWebInspectorProxy::SetSheetRect(rect), m_page.identifier());
}
void RemoteWebInspectorUI::startWindowDrag()
{
- WebProcess::singleton().parentProcessConnection()->send(Messages::RemoteWebInspectorProxy::StartWindowDrag(), m_page.pageID());
+ WebProcess::singleton().parentProcessConnection()->send(Messages::RemoteWebInspectorProxy::StartWindowDrag(), m_page.identifier());
}
void RemoteWebInspectorUI::moveWindowBy(float x, float y)
@@ -124,7 +124,7 @@
void RemoteWebInspectorUI::bringToFront()
{
- WebProcess::singleton().parentProcessConnection()->send(Messages::RemoteWebInspectorProxy::BringToFront(), m_page.pageID());
+ WebProcess::singleton().parentProcessConnection()->send(Messages::RemoteWebInspectorProxy::BringToFront(), m_page.identifier());
}
void RemoteWebInspectorUI::closeWindow()
@@ -131,32 +131,32 @@
{
m_page.corePage()->inspectorController().setInspectorFrontendClient(nullptr);
- WebProcess::singleton().parentProcessConnection()->send(Messages::RemoteWebInspectorProxy::FrontendDidClose(), m_page.pageID());
+ WebProcess::singleton().parentProcessConnection()->send(Messages::RemoteWebInspectorProxy::FrontendDidClose(), m_page.identifier());
}
void RemoteWebInspectorUI::reopen()
{
- WebProcess::singleton().parentProcessConnection()->send(Messages::RemoteWebInspectorProxy::Reopen(), m_page.pageID());
+ WebProcess::singleton().parentProcessConnection()->send(Messages::RemoteWebInspectorProxy::Reopen(), m_page.identifier());
}
void RemoteWebInspectorUI::resetState()
{
- WebProcess::singleton().parentProcessConnection()->send(Messages::RemoteWebInspectorProxy::ResetState(), m_page.pageID());
+ WebProcess::singleton().parentProcessConnection()->send(Messages::RemoteWebInspectorProxy::ResetState(), m_page.identifier());
}
void RemoteWebInspectorUI::openInNewTab(const String& url)
{
- WebProcess::singleton().parentProcessConnection()->send(Messages::RemoteWebInspectorProxy::OpenInNewTab(url), m_page.pageID());
+ WebProcess::singleton().parentProcessConnection()->send(Messages::RemoteWebInspectorProxy::OpenInNewTab(url), m_page.identifier());
}
void RemoteWebInspectorUI::save(const String& filename, const String& content, bool base64Encoded, bool forceSaveAs)
{
- WebProcess::singleton().parentProcessConnection()->send(Messages::RemoteWebInspectorProxy::Save(filename, content, base64Encoded, forceSaveAs), m_page.pageID());
+ WebProcess::singleton().parentProcessConnection()->send(Messages::RemoteWebInspectorProxy::Save(filename, content, base64Encoded, forceSaveAs), m_page.identifier());
}
void RemoteWebInspectorUI::append(const String& filename, const String& content)
{
- WebProcess::singleton().parentProcessConnection()->send(Messages::RemoteWebInspectorProxy::Append(filename, content), m_page.pageID());
+ WebProcess::singleton().parentProcessConnection()->send(Messages::RemoteWebInspectorProxy::Append(filename, content), m_page.identifier());
}
void RemoteWebInspectorUI::inspectedURLChanged(const String& urlString)
@@ -166,7 +166,7 @@
void RemoteWebInspectorUI::showCertificate(const CertificateInfo& certificateInfo)
{
- WebProcess::singleton().parentProcessConnection()->send(Messages::RemoteWebInspectorProxy::ShowCertificate(certificateInfo), m_page.pageID());
+ WebProcess::singleton().parentProcessConnection()->send(Messages::RemoteWebInspectorProxy::ShowCertificate(certificateInfo), m_page.identifier());
}
} // namespace WebKit
Modified: trunk/Source/WebKit/WebProcess/WebPage/ViewGestureGeometryCollector.cpp (249434 => 249435)
--- trunk/Source/WebKit/WebProcess/WebPage/ViewGestureGeometryCollector.cpp 2019-09-03 18:25:27 UTC (rev 249434)
+++ trunk/Source/WebKit/WebProcess/WebPage/ViewGestureGeometryCollector.cpp 2019-09-03 18:37:36 UTC (rev 249435)
@@ -61,12 +61,12 @@
, m_renderTreeSizeNotificationThreshold(0)
#endif
{
- WebProcess::singleton().addMessageReceiver(Messages::ViewGestureGeometryCollector::messageReceiverName(), m_webPage.pageID(), *this);
+ WebProcess::singleton().addMessageReceiver(Messages::ViewGestureGeometryCollector::messageReceiverName(), m_webPage.identifier(), *this);
}
ViewGestureGeometryCollector::~ViewGestureGeometryCollector()
{
- WebProcess::singleton().removeMessageReceiver(Messages::ViewGestureGeometryCollector::messageReceiverName(), m_webPage.pageID());
+ WebProcess::singleton().removeMessageReceiver(Messages::ViewGestureGeometryCollector::messageReceiverName(), m_webPage.identifier());
}
void ViewGestureGeometryCollector::dispatchDidCollectGeometryForSmartMagnificationGesture(FloatPoint origin, FloatRect targetRect, FloatRect visibleContentRect, bool fitEntireRect, double viewportMinimumScale, double viewportMaximumScale)
Modified: trunk/Source/WebKit/WebProcess/WebPage/WebBackForwardListProxy.cpp (249434 => 249435)
--- trunk/Source/WebKit/WebProcess/WebPage/WebBackForwardListProxy.cpp 2019-09-03 18:25:27 UTC (rev 249434)
+++ trunk/Source/WebKit/WebProcess/WebPage/WebBackForwardListProxy.cpp 2019-09-03 18:37:36 UTC (rev 249435)
@@ -116,7 +116,7 @@
return nullptr;
Optional<BackForwardItemIdentifier> itemID;
- if (!WebProcess::singleton().parentProcessConnection()->sendSync(Messages::WebPageProxy::BackForwardItemAtIndex(itemIndex), Messages::WebPageProxy::BackForwardItemAtIndex::Reply(itemID), m_page->pageID()))
+ if (!WebProcess::singleton().parentProcessConnection()->sendSync(Messages::WebPageProxy::BackForwardItemAtIndex(itemIndex), Messages::WebPageProxy::BackForwardItemAtIndex::Reply(itemID), m_page->identifier()))
return nullptr;
if (!itemID)
@@ -131,7 +131,7 @@
return 0;
unsigned backListCount = 0;
- if (!WebProcess::singleton().parentProcessConnection()->sendSync(Messages::WebPageProxy::BackForwardBackListCount(), Messages::WebPageProxy::BackForwardBackListCount::Reply(backListCount), m_page->pageID()))
+ if (!WebProcess::singleton().parentProcessConnection()->sendSync(Messages::WebPageProxy::BackForwardBackListCount(), Messages::WebPageProxy::BackForwardBackListCount::Reply(backListCount), m_page->identifier()))
return 0;
return backListCount;
@@ -143,7 +143,7 @@
return 0;
unsigned forwardListCount = 0;
- if (!WebProcess::singleton().parentProcessConnection()->sendSync(Messages::WebPageProxy::BackForwardForwardListCount(), Messages::WebPageProxy::BackForwardForwardListCount::Reply(forwardListCount), m_page->pageID()))
+ if (!WebProcess::singleton().parentProcessConnection()->sendSync(Messages::WebPageProxy::BackForwardForwardListCount(), Messages::WebPageProxy::BackForwardForwardListCount::Reply(forwardListCount), m_page->identifier()))
return 0;
return forwardListCount;
Modified: trunk/Source/WebKit/WebProcess/WebPage/WebInspector.cpp (249434 => 249435)
--- trunk/Source/WebKit/WebProcess/WebPage/WebInspector.cpp 2019-09-03 18:25:27 UTC (rev 249434)
+++ trunk/Source/WebKit/WebProcess/WebPage/WebInspector.cpp 2019-09-03 18:37:36 UTC (rev 249435)
@@ -72,7 +72,7 @@
void WebInspector::openLocalInspectorFrontend(bool underTest)
{
- WebProcess::singleton().parentProcessConnection()->send(Messages::WebInspectorProxy::OpenLocalInspectorFrontend(canAttachWindow(), underTest), m_page->pageID());
+ WebProcess::singleton().parentProcessConnection()->send(Messages::WebInspectorProxy::OpenLocalInspectorFrontend(canAttachWindow(), underTest), m_page->identifier());
}
void WebInspector::setFrontendConnection(IPC::Attachment encodedConnectionIdentifier)
@@ -108,7 +108,7 @@
void WebInspector::closeFrontendConnection()
{
- WebProcess::singleton().parentProcessConnection()->send(Messages::WebInspectorProxy::DidClose(), m_page->pageID());
+ WebProcess::singleton().parentProcessConnection()->send(Messages::WebInspectorProxy::DidClose(), m_page->identifier());
// If we tried to close the frontend before it was created, then no connection exists yet.
if (m_frontendConnection) {
@@ -124,7 +124,7 @@
void WebInspector::bringToFront()
{
- WebProcess::singleton().parentProcessConnection()->send(Messages::WebInspectorProxy::BringToFront(), m_page->pageID());
+ WebProcess::singleton().parentProcessConnection()->send(Messages::WebInspectorProxy::BringToFront(), m_page->identifier());
}
void WebInspector::whenFrontendConnectionEstablished(Function<void()>&& callback)
@@ -273,17 +273,17 @@
void WebInspector::elementSelectionChanged(bool active)
{
- WebProcess::singleton().parentProcessConnection()->send(Messages::WebInspectorProxy::ElementSelectionChanged(active), m_page->pageID());
+ WebProcess::singleton().parentProcessConnection()->send(Messages::WebInspectorProxy::ElementSelectionChanged(active), m_page->identifier());
}
void WebInspector::timelineRecordingChanged(bool active)
{
- WebProcess::singleton().parentProcessConnection()->send(Messages::WebInspectorProxy::TimelineRecordingChanged(active), m_page->pageID());
+ WebProcess::singleton().parentProcessConnection()->send(Messages::WebInspectorProxy::TimelineRecordingChanged(active), m_page->identifier());
}
void WebInspector::setMockCaptureDevicesEnabledOverride(Optional<bool> enabled)
{
- WebProcess::singleton().parentProcessConnection()->send(Messages::WebInspectorProxy::SetMockCaptureDevicesEnabledOverride(enabled), m_page->pageID());
+ WebProcess::singleton().parentProcessConnection()->send(Messages::WebInspectorProxy::SetMockCaptureDevicesEnabledOverride(enabled), m_page->identifier());
}
bool WebInspector::canAttachWindow()
@@ -317,7 +317,7 @@
m_previousCanAttach = canAttachWindow;
- WebProcess::singleton().parentProcessConnection()->send(Messages::WebInspectorProxy::AttachAvailabilityChanged(canAttachWindow), m_page->pageID());
+ WebProcess::singleton().parentProcessConnection()->send(Messages::WebInspectorProxy::AttachAvailabilityChanged(canAttachWindow), m_page->identifier());
}
} // namespace WebKit
Modified: trunk/Source/WebKit/WebProcess/WebPage/WebPage.cpp (249434 => 249435)
--- trunk/Source/WebKit/WebProcess/WebPage/WebPage.cpp 2019-09-03 18:25:27 UTC (rev 249434)
+++ trunk/Source/WebKit/WebProcess/WebPage/WebPage.cpp 2019-09-03 18:37:36 UTC (rev 249435)
@@ -371,7 +371,7 @@
}
WebPage::WebPage(PageIdentifier pageID, WebPageCreationParameters&& parameters)
- : m_pageID(pageID)
+ : m_identifier(pageID)
, m_viewSize(parameters.viewSize)
, m_alwaysShowsHorizontalScroller { parameters.alwaysShowsHorizontalScroller }
, m_alwaysShowsVerticalScroller { parameters.alwaysShowsVerticalScroller }
@@ -434,7 +434,7 @@
, m_textAutoSizingAdjustmentTimer(*this, &WebPage::textAutoSizingAdjustmentTimerFired)
#endif
{
- ASSERT(m_pageID);
+ ASSERT(m_identifier);
m_pageGroup = WebProcess::singleton().webPageGroup(parameters.pageGroupData);
@@ -608,14 +608,14 @@
m_page->addLayoutMilestones({ DidFirstLayout, DidFirstVisuallyNonEmptyLayout });
auto& webProcess = WebProcess::singleton();
- webProcess.addMessageReceiver(Messages::WebPage::messageReceiverName(), m_pageID, *this);
+ webProcess.addMessageReceiver(Messages::WebPage::messageReceiverName(), m_identifier, *this);
// FIXME: This should be done in the object constructors, and the objects themselves should be message receivers.
- webProcess.addMessageReceiver(Messages::WebInspector::messageReceiverName(), m_pageID, *this);
- webProcess.addMessageReceiver(Messages::WebInspectorUI::messageReceiverName(), m_pageID, *this);
- webProcess.addMessageReceiver(Messages::RemoteWebInspectorUI::messageReceiverName(), m_pageID, *this);
+ webProcess.addMessageReceiver(Messages::WebInspector::messageReceiverName(), m_identifier, *this);
+ webProcess.addMessageReceiver(Messages::WebInspectorUI::messageReceiverName(), m_identifier, *this);
+ webProcess.addMessageReceiver(Messages::RemoteWebInspectorUI::messageReceiverName(), m_identifier, *this);
#if ENABLE(FULLSCREEN_API)
- webProcess.addMessageReceiver(Messages::WebFullScreenManager::messageReceiverName(), m_pageID, *this);
+ webProcess.addMessageReceiver(Messages::WebFullScreenManager::messageReceiverName(), m_identifier, *this);
#endif
#ifndef NDEBUG
@@ -843,7 +843,7 @@
uint64_t WebPage::messageSenderDestinationID() const
{
- return pageID().toUInt64();
+ return identifier().toUInt64();
}
#if ENABLE(CONTEXT_MENUS)
@@ -1338,7 +1338,7 @@
return;
#if ENABLE(RESOURCE_LOAD_STATISTICS)
- WebProcess::singleton().ensureNetworkProcessConnection().connection().send(Messages::NetworkConnectionToWebProcess::ClearPageSpecificDataForResourceLoadStatistics(sessionID(), m_pageID), 0);
+ WebProcess::singleton().ensureNetworkProcessConnection().connection().send(Messages::NetworkConnectionToWebProcess::ClearPageSpecificDataForResourceLoadStatistics(sessionID(), m_identifier), 0);
#endif
m_isClosed = true;
@@ -1439,13 +1439,13 @@
if (m_useAsyncScrolling)
webProcess.eventDispatcher().removeScrollingTreeForPage(this);
#endif
- webProcess.removeMessageReceiver(Messages::WebPage::messageReceiverName(), m_pageID);
+ webProcess.removeMessageReceiver(Messages::WebPage::messageReceiverName(), m_identifier);
// FIXME: This should be done in the object destructors, and the objects themselves should be message receivers.
- webProcess.removeMessageReceiver(Messages::WebInspector::messageReceiverName(), m_pageID);
- webProcess.removeMessageReceiver(Messages::WebInspectorUI::messageReceiverName(), m_pageID);
- webProcess.removeMessageReceiver(Messages::RemoteWebInspectorUI::messageReceiverName(), m_pageID);
+ webProcess.removeMessageReceiver(Messages::WebInspector::messageReceiverName(), m_identifier);
+ webProcess.removeMessageReceiver(Messages::WebInspectorUI::messageReceiverName(), m_identifier);
+ webProcess.removeMessageReceiver(Messages::RemoteWebInspectorUI::messageReceiverName(), m_identifier);
#if ENABLE(FULLSCREEN_API)
- webProcess.removeMessageReceiver(Messages::WebFullScreenManager::messageReceiverName(), m_pageID);
+ webProcess.removeMessageReceiver(Messages::WebFullScreenManager::messageReceiverName(), m_identifier);
#endif
#if PLATFORM(COCOA) || PLATFORM(GTK)
m_viewGestureGeometryCollector = nullptr;
@@ -1452,7 +1452,7 @@
#endif
// The WebPage can be destroyed by this call.
- WebProcess::singleton().removeWebPage(sessionID, m_pageID);
+ WebProcess::singleton().removeWebPage(sessionID, m_identifier);
WebProcess::singleton().updateActivePages();
@@ -1666,7 +1666,7 @@
if (!item)
return;
- LOG(Loading, "In WebProcess pid %i, WebPage %" PRIu64 " is navigating to back/forward URL %s", getCurrentProcessID(), m_pageID.toUInt64(), item->url().string().utf8().data());
+ LOG(Loading, "In WebProcess pid %i, WebPage %" PRIu64 " is navigating to back/forward URL %s", getCurrentProcessID(), m_identifier.toUInt64(), item->url().string().utf8().data());
ASSERT(!m_pendingNavigationID);
m_pendingNavigationID = navigationID;
@@ -2094,7 +2094,7 @@
if (!view || view->fixedLayoutSize() == size)
return false;
- LOG_WITH_STREAM(VisibleRects, stream << "WebPage " << m_pageID.toUInt64() << " setFixedLayoutSize " << size);
+ LOG_WITH_STREAM(VisibleRects, stream << "WebPage " << m_identifier.toUInt64() << " setFixedLayoutSize " << size);
view->setFixedLayoutSize(size);
send(Messages::WebPageProxy::FixedLayoutSizeDidChange(size));
@@ -2526,7 +2526,7 @@
void WebPage::freezeLayerTree(LayerTreeFreezeReason reason)
{
RELEASE_LOG(ProcessSuspension, "%p - WebPage (PageID=%llu) - Adding a reason %d to freeze layer tree; current reasons are %d",
- this, m_pageID.toUInt64(), static_cast<unsigned>(reason), m_layerTreeFreezeReasons.toRaw());
+ this, m_identifier.toUInt64(), static_cast<unsigned>(reason), m_layerTreeFreezeReasons.toRaw());
m_layerTreeFreezeReasons.add(reason);
updateDrawingAreaLayerTreeFreezeState();
}
@@ -2534,7 +2534,7 @@
void WebPage::unfreezeLayerTree(LayerTreeFreezeReason reason)
{
RELEASE_LOG(ProcessSuspension, "%p - WebPage (PageID=%llu) - Removing a reason %d to freeze layer tree; current reasons are %d",
- this, m_pageID.toUInt64(), static_cast<unsigned>(reason), m_layerTreeFreezeReasons.toRaw());
+ this, m_identifier.toUInt64(), static_cast<unsigned>(reason), m_layerTreeFreezeReasons.toRaw());
m_layerTreeFreezeReasons.remove(reason);
updateDrawingAreaLayerTreeFreezeState();
}
@@ -2840,7 +2840,7 @@
for (const auto& itemState : itemStates) {
auto historyItem = toHistoryItem(itemState);
historyItem->setWasRestoredFromSession(restoredByAPIRequest == WasRestoredByAPIRequest::Yes);
- static_cast<WebBackForwardListProxy&>(corePage()->backForward().client()).addItemFromUIProcess(itemState.identifier, WTFMove(historyItem), m_pageID, overwrite);
+ static_cast<WebBackForwardListProxy&>(corePage()->backForward().client()).addItemFromUIProcess(itemState.identifier, WTFMove(historyItem), m_identifier, overwrite);
}
}
@@ -2858,7 +2858,7 @@
{
auto historyItem = toHistoryItem(itemState);
auto& historyItemRef = historyItem.get();
- static_cast<WebBackForwardListProxy&>(corePage()->backForward().client()).addItemFromUIProcess(itemState.identifier, WTFMove(historyItem), m_pageID, WebBackForwardListProxy::OverwriteExistingItem::Yes);
+ static_cast<WebBackForwardListProxy&>(corePage()->backForward().client()).addItemFromUIProcess(itemState.identifier, WTFMove(historyItem), m_identifier, WebBackForwardListProxy::OverwriteExistingItem::Yes);
corePage()->mainFrame().loader().history().setCurrentItem(historyItemRef);
}
@@ -3162,7 +3162,7 @@
// The WebProcess does not yet know about this page; no need to tell it we're leaving the window.
if (!isInitialState)
- WebProcess::singleton().pageWillLeaveWindow(m_pageID);
+ WebProcess::singleton().pageWillLeaveWindow(m_identifier);
} else {
// Defer the call to Page::setCanStartMedia() since it ends up sending a synchronous message to the UI process
// in order to get plug-in connections, and the UI process will be waiting for the Web process to update the backing
@@ -3170,7 +3170,7 @@
if (m_mayStartMediaWhenInWindow)
m_setCanStartMediaTimer.startOneShot(0_s);
- WebProcess::singleton().pageDidEnterWindow(m_pageID);
+ WebProcess::singleton().pageDidEnterWindow(m_identifier);
}
if (isInWindow)
@@ -3190,7 +3190,7 @@
void WebPage::setActivityState(OptionSet<ActivityState::Flag> activityState, ActivityStateChangeID activityStateChangeID, const Vector<CallbackID>& callbackIDs)
{
- LOG_WITH_STREAM(ActivityState, stream << "WebPage " << pageID().toUInt64() << " setActivityState to " << activityState);
+ LOG_WITH_STREAM(ActivityState, stream << "WebPage " << identifier().toUInt64() << " setActivityState to " << activityState);
auto changed = m_activityState ^ activityState;
m_activityState = activityState;
@@ -3198,7 +3198,7 @@
if (changed)
updateThrottleState();
- ASSERT_WITH_MESSAGE(m_page, "setActivityState called on %" PRIu64 " but WebCore page was null", pageID().toUInt64());
+ ASSERT_WITH_MESSAGE(m_page, "setActivityState called on %" PRIu64 " but WebCore page was null", identifier().toUInt64());
if (m_page) {
SetForScope<OptionSet<ActivityState::Flag>> currentlyChangingActivityState { m_lastActivityStateChanges, changed };
m_page->setActivityState(activityState);
@@ -3208,7 +3208,7 @@
pluginView->activityStateDidChange(changed);
m_drawingArea->activityStateDidChange(changed, activityStateChangeID, callbackIDs);
- WebProcess::singleton().pageActivityStateDidChange(m_pageID, changed);
+ WebProcess::singleton().pageActivityStateDidChange(m_identifier, changed);
if (changed & ActivityState::IsInWindow)
updateIsInWindow();
@@ -4363,7 +4363,7 @@
#if PLATFORM(IOS_FAMILY)
if (FrameView* frameView = mainFrameView()) {
IntSize newContentSize = frameView->contentsSize();
- LOG_WITH_STREAM(VisibleRects, stream << "WebPage " << m_pageID.toUInt64() << " mainFrameDidLayout setting content size to " << newContentSize);
+ LOG_WITH_STREAM(VisibleRects, stream << "WebPage " << m_identifier.toUInt64() << " mainFrameDidLayout setting content size to " << newContentSize);
if (m_viewportConfiguration.setContentsSize(newContentSize))
viewportConfigurationChanged();
}
@@ -5776,7 +5776,7 @@
bool viewportChanged = false;
- LOG_WITH_STREAM(VisibleRects, stream << "WebPage " << m_pageID.toUInt64() << " didCommitLoad setting content size to " << coreFrame->view()->contentsSize());
+ LOG_WITH_STREAM(VisibleRects, stream << "WebPage " << m_identifier.toUInt64() << " didCommitLoad setting content size to " << coreFrame->view()->contentsSize());
if (m_viewportConfiguration.setContentsSize(coreFrame->view()->contentsSize()))
viewportChanged = true;
@@ -6532,12 +6532,12 @@
#if ENABLE(RESOURCE_LOAD_STATISTICS)
void WebPage::hasStorageAccess(RegistrableDomain&& subFrameDomain, RegistrableDomain&& topFrameDomain, WebFrame& frame, CompletionHandler<void(bool)>&& completionHandler)
{
- WebProcess::singleton().ensureNetworkProcessConnection().connection().sendWithAsyncReply(Messages::NetworkConnectionToWebProcess::HasStorageAccess(sessionID(), WTFMove(subFrameDomain), WTFMove(topFrameDomain), frame.frameID(), m_pageID), WTFMove(completionHandler));
+ WebProcess::singleton().ensureNetworkProcessConnection().connection().sendWithAsyncReply(Messages::NetworkConnectionToWebProcess::HasStorageAccess(sessionID(), WTFMove(subFrameDomain), WTFMove(topFrameDomain), frame.frameID(), m_identifier), WTFMove(completionHandler));
}
void WebPage::requestStorageAccess(RegistrableDomain&& subFrameDomain, RegistrableDomain&& topFrameDomain, WebFrame& frame, CompletionHandler<void(WebCore::StorageAccessWasGranted, WebCore::StorageAccessPromptWasShown)>&& completionHandler)
{
- WebProcess::singleton().ensureNetworkProcessConnection().connection().sendWithAsyncReply(Messages::NetworkConnectionToWebProcess::RequestStorageAccess(sessionID(), WTFMove(subFrameDomain), WTFMove(topFrameDomain), frame.frameID(), m_pageID), WTFMove(completionHandler));
+ WebProcess::singleton().ensureNetworkProcessConnection().connection().sendWithAsyncReply(Messages::NetworkConnectionToWebProcess::RequestStorageAccess(sessionID(), WTFMove(subFrameDomain), WTFMove(topFrameDomain), frame.frameID(), m_identifier), WTFMove(completionHandler));
}
void WebPage::wasLoadedWithDataTransferFromPrevalentResource()
@@ -6755,7 +6755,7 @@
continue;
WebKit::TextInputContext context;
- context.webPageIdentifier = m_pageID;
+ context.webPageIdentifier = m_identifier;
context.documentIdentifier = document->identifier();
context.elementIdentifier = document->identifierForElement(element);
context.boundingRect = elementRect;
@@ -6779,7 +6779,7 @@
Element* WebPage::elementForTextInputContext(const TextInputContext& textInputContext)
{
- if (textInputContext.webPageIdentifier != m_pageID)
+ if (textInputContext.webPageIdentifier != m_identifier)
return nullptr;
auto* document = Document::allDocumentsMap().get(textInputContext.documentIdentifier);
Modified: trunk/Source/WebKit/WebProcess/WebPage/WebPage.h (249434 => 249435)
--- trunk/Source/WebKit/WebProcess/WebPage/WebPage.h 2019-09-03 18:25:27 UTC (rev 249434)
+++ trunk/Source/WebKit/WebProcess/WebPage/WebPage.h 2019-09-03 18:37:36 UTC (rev 249435)
@@ -291,7 +291,7 @@
static WebPage& fromCorePage(WebCore::Page&);
WebCore::Page* corePage() const { return m_page.get(); }
- WebCore::PageIdentifier pageID() const { return m_pageID; }
+ WebCore::PageIdentifier identifier() const { return m_identifier; }
StorageNamespaceIdentifier sessionStorageNamespaceIdentifier() const { return makeObjectIdentifier<StorageNamespaceIdentifierType>(m_webPageProxyIdentifier.toUInt64()); }
PAL::SessionID sessionID() const { return m_page->sessionID(); }
bool usesEphemeralSession() const { return m_page->usesEphemeralSession(); }
@@ -1621,7 +1621,7 @@
void updateMockAccessibilityElementAfterCommittingLoad();
- WebCore::PageIdentifier m_pageID;
+ WebCore::PageIdentifier m_identifier;
std::unique_ptr<WebCore::Page> m_page;
RefPtr<WebFrame> m_mainFrame;
Modified: trunk/Source/WebKit/WebProcess/WebPage/WebPageInspectorTarget.cpp (249434 => 249435)
--- trunk/Source/WebKit/WebProcess/WebPage/WebPageInspectorTarget.cpp 2019-09-03 18:25:27 UTC (rev 249434)
+++ trunk/Source/WebKit/WebProcess/WebPage/WebPageInspectorTarget.cpp 2019-09-03 18:37:36 UTC (rev 249435)
@@ -41,7 +41,7 @@
String WebPageInspectorTarget::identifier() const
{
- return makeString("page-", m_page.pageID().toUInt64());
+ return makeString("page-", m_page.identifier().toUInt64());
}
void WebPageInspectorTarget::connect(Inspector::FrontendChannel& channel)
Modified: trunk/Source/WebKit/WebProcess/WebPage/gtk/AcceleratedSurfaceWayland.h (249434 => 249435)
--- trunk/Source/WebKit/WebProcess/WebPage/gtk/AcceleratedSurfaceWayland.h 2019-09-03 18:25:27 UTC (rev 249434)
+++ trunk/Source/WebKit/WebProcess/WebPage/gtk/AcceleratedSurfaceWayland.h 2019-09-03 18:37:36 UTC (rev 249435)
@@ -41,7 +41,7 @@
~AcceleratedSurfaceWayland() = default;
uint64_t window() const override { return reinterpret_cast<uint64_t>(m_window); }
- uint64_t surfaceID() const override { return m_webPage.pageID().toUInt64(); }
+ uint64_t surfaceID() const override { return m_webPage.identifier().toUInt64(); }
void clientResize(const WebCore::IntSize&) override;
bool shouldPaintMirrored() const override { return true; }
Modified: trunk/Source/WebKit/WebProcess/WebPage/ios/WebPageIOS.mm (249434 => 249435)
--- trunk/Source/WebKit/WebProcess/WebPage/ios/WebPageIOS.mm 2019-09-03 18:25:27 UTC (rev 249434)
+++ trunk/Source/WebKit/WebProcess/WebPage/ios/WebPageIOS.mm 2019-09-03 18:37:36 UTC (rev 249435)
@@ -456,7 +456,7 @@
// FIXME: Interpret the event immediately upon receiving it in UI process, without sending to WebProcess first.
bool eventWasHandled = false;
bool sendResult = WebProcess::singleton().parentProcessConnection()->sendSync(Messages::WebPageProxy::InterpretKeyEvent(editorState(), platformEvent->type() == PlatformKeyboardEvent::Char),
- Messages::WebPageProxy::InterpretKeyEvent::Reply(eventWasHandled), m_pageID);
+ Messages::WebPageProxy::InterpretKeyEvent::Reply(eventWasHandled), m_identifier);
return sendResult && eventWasHandled;
}
@@ -3056,7 +3056,7 @@
void WebPage::setViewportConfigurationViewLayoutSize(const FloatSize& size, double scaleFactor, double minimumEffectiveDeviceWidth)
{
- LOG_WITH_STREAM(VisibleRects, stream << "WebPage " << m_pageID << " setViewportConfigurationViewLayoutSize " << size << " scaleFactor " << scaleFactor << " minimumEffectiveDeviceWidth " << minimumEffectiveDeviceWidth);
+ LOG_WITH_STREAM(VisibleRects, stream << "WebPage " << m_identifier << " setViewportConfigurationViewLayoutSize " << size << " scaleFactor " << scaleFactor << " minimumEffectiveDeviceWidth " << minimumEffectiveDeviceWidth);
auto previousLayoutSizeScaleFactor = m_viewportConfiguration.layoutSizeScaleFactor();
auto clampedMinimumEffectiveDevice = m_viewportConfiguration.isKnownToLayOutWiderThanViewport() ? WTF::nullopt : Optional<double>(minimumEffectiveDeviceWidth);
@@ -3281,7 +3281,7 @@
void WebPage::resetViewportDefaultConfiguration(WebFrame* frame, bool hasMobileDocType)
{
- LOG_WITH_STREAM(VisibleRects, stream << "WebPage " << m_pageID << " resetViewportDefaultConfiguration");
+ LOG_WITH_STREAM(VisibleRects, stream << "WebPage " << m_identifier << " resetViewportDefaultConfiguration");
if (m_useTestingViewportConfiguration) {
m_viewportConfiguration.setDefaultConfiguration(ViewportConfiguration::testingParameters());
return;
@@ -3472,7 +3472,7 @@
else
scale = initialScale;
- LOG_WITH_STREAM(VisibleRects, stream << "WebPage " << m_pageID << " viewportConfigurationChanged - setting zoomedOutPageScaleFactor to " << m_viewportConfiguration.minimumScale() << " and scale to " << scale);
+ LOG_WITH_STREAM(VisibleRects, stream << "WebPage " << m_identifier << " viewportConfigurationChanged - setting zoomedOutPageScaleFactor to " << m_viewportConfiguration.minimumScale() << " and scale to " << scale);
m_page->setZoomedOutPageScaleFactor(m_viewportConfiguration.minimumScale());
@@ -3612,7 +3612,7 @@
void WebPage::updateVisibleContentRects(const VisibleContentRectUpdateInfo& visibleContentRectUpdateInfo, MonotonicTime oldestTimestamp)
{
- LOG_WITH_STREAM(VisibleRects, stream << "\nWebPage " << m_pageID << " updateVisibleContentRects " << visibleContentRectUpdateInfo);
+ LOG_WITH_STREAM(VisibleRects, stream << "\nWebPage " << m_identifier << " updateVisibleContentRects " << visibleContentRectUpdateInfo);
// Skip any VisibleContentRectUpdate that have been queued before DidCommitLoad suppresses the updates in the UIProcess.
if (visibleContentRectUpdateInfo.lastLayerTreeTransactionID() < m_mainFrame->firstLayerTreeTransactionIDAfterDidCommitLoad() && !visibleContentRectUpdateInfo.isFirstUpdateForNewViewSize())
@@ -3798,7 +3798,7 @@
#if USE(QUICK_LOOK)
void WebPage::didReceivePasswordForQuickLookDocument(const String& password)
{
- WebPreviewLoaderClient::didReceivePassword(password, m_pageID);
+ WebPreviewLoaderClient::didReceivePassword(password, m_identifier);
}
#endif
Modified: trunk/Source/WebKit/WebProcess/WebPage/libwpe/AcceleratedSurfaceLibWPE.cpp (249434 => 249435)
--- trunk/Source/WebKit/WebProcess/WebPage/libwpe/AcceleratedSurfaceLibWPE.cpp 2019-09-03 18:25:27 UTC (rev 249434)
+++ trunk/Source/WebKit/WebProcess/WebPage/libwpe/AcceleratedSurfaceLibWPE.cpp 2019-09-03 18:37:36 UTC (rev 249435)
@@ -91,7 +91,7 @@
uint64_t AcceleratedSurfaceLibWPE::surfaceID() const
{
- return m_webPage.pageID().toUInt64();
+ return m_webPage.identifier().toUInt64();
}
void AcceleratedSurfaceLibWPE::clientResize(const IntSize& size)
Modified: trunk/Source/WebKit/WebProcess/WebPage/mac/WKAccessibilityWebPageObjectBase.mm (249434 => 249435)
--- trunk/Source/WebKit/WebProcess/WebPage/mac/WKAccessibilityWebPageObjectBase.mm 2019-09-03 18:25:27 UTC (rev 249434)
+++ trunk/Source/WebKit/WebProcess/WebPage/mac/WKAccessibilityWebPageObjectBase.mm 2019-09-03 18:37:36 UTC (rev 249435)
@@ -143,7 +143,7 @@
m_page = page;
if (page) {
- m_pageID = page->pageID();
+ m_pageID = page->identifier();
auto* frame = page->mainFrame();
m_hasMainFramePlugin = frame && frame->document() ? frame->document()->isPluginDocument() : false;
Modified: trunk/Source/WebKit/WebProcess/WebPage/mac/WebPageMac.mm (249434 => 249435)
--- trunk/Source/WebKit/WebProcess/WebPage/mac/WebPageMac.mm 2019-09-03 18:25:27 UTC (rev 249434)
+++ trunk/Source/WebKit/WebProcess/WebPage/mac/WebPageMac.mm 2019-09-03 18:37:36 UTC (rev 249435)
@@ -268,7 +268,7 @@
} else {
bool commandWasHandledByUIProcess = false;
WebProcess::singleton().parentProcessConnection()->sendSync(Messages::WebPageProxy::ExecuteSavedCommandBySelector(commands[i].commandName),
- Messages::WebPageProxy::ExecuteSavedCommandBySelector::Reply(commandWasHandledByUIProcess), m_pageID);
+ Messages::WebPageProxy::ExecuteSavedCommandBySelector::Reply(commandWasHandledByUIProcess), m_identifier);
eventWasHandled |= commandWasHandledByUIProcess;
}
}
Modified: trunk/Source/WebKit/WebProcess/WebProcess.cpp (249434 => 249435)
--- trunk/Source/WebKit/WebProcess/WebProcess.cpp 2019-09-03 18:25:27 UTC (rev 249434)
+++ trunk/Source/WebKit/WebProcess/WebProcess.cpp 2019-09-03 18:37:36 UTC (rev 249435)
@@ -1754,7 +1754,7 @@
return API::FrameHandle::createAutoconverting(static_cast<const WebFrame&>(object).frameID());
case API::Object::Type::BundlePage:
- return API::PageHandle::createAutoconverting(static_cast<const WebPage&>(object).webPageProxyIdentifier(), static_cast<const WebPage&>(object).pageID());
+ return API::PageHandle::createAutoconverting(static_cast<const WebPage&>(object).webPageProxyIdentifier(), static_cast<const WebPage&>(object).identifier());
case API::Object::Type::BundlePageGroup: {
WebPageGroupData pageGroupData;
Modified: trunk/Source/WebKit/WebProcess/WebStorage/StorageNamespaceImpl.cpp (249434 => 249435)
--- trunk/Source/WebKit/WebProcess/WebStorage/StorageNamespaceImpl.cpp 2019-09-03 18:25:27 UTC (rev 249434)
+++ trunk/Source/WebKit/WebProcess/WebStorage/StorageNamespaceImpl.cpp 2019-09-03 18:37:36 UTC (rev 249435)
@@ -119,7 +119,7 @@
if (auto networkProcessConnection = WebProcess::singleton().existingNetworkProcessConnection())
networkProcessConnection->connection().send(Messages::StorageManagerSet::CloneSessionStorageNamespace(newPage.sessionID(), m_storageNamespaceID, WebPage::fromCorePage(newPage).sessionStorageNamespaceIdentifier()), 0);
- return adoptRef(*new StorageNamespaceImpl(m_storageType, WebPage::fromCorePage(newPage).sessionStorageNamespaceIdentifier(), WebPage::fromCorePage(newPage).pageID(), m_topLevelOrigin.get(), m_quotaInBytes, newPage.sessionID()));
+ return adoptRef(*new StorageNamespaceImpl(m_storageType, WebPage::fromCorePage(newPage).sessionStorageNamespaceIdentifier(), WebPage::fromCorePage(newPage).identifier(), m_topLevelOrigin.get(), m_quotaInBytes, newPage.sessionID()));
}
void StorageNamespaceImpl::setSessionIDForTesting(PAL::SessionID sessionID)
Modified: trunk/Source/WebKit/WebProcess/WebStorage/WebStorageNamespaceProvider.cpp (249434 => 249435)
--- trunk/Source/WebKit/WebProcess/WebStorage/WebStorageNamespaceProvider.cpp 2019-09-03 18:25:27 UTC (rev 249434)
+++ trunk/Source/WebKit/WebProcess/WebStorage/WebStorageNamespaceProvider.cpp 2019-09-03 18:37:36 UTC (rev 249435)
@@ -67,7 +67,7 @@
Ref<WebCore::StorageNamespace> WebStorageNamespaceProvider::createSessionStorageNamespace(Page& page, unsigned quota)
{
auto& webPage = WebPage::fromCorePage(page);
- return StorageNamespaceImpl::createSessionStorageNamespace(webPage.sessionStorageNamespaceIdentifier(), webPage.pageID(), quota, page.sessionID());
+ return StorageNamespaceImpl::createSessionStorageNamespace(webPage.sessionStorageNamespaceIdentifier(), webPage.identifier(), quota, page.sessionID());
}
Ref<WebCore::StorageNamespace> WebStorageNamespaceProvider::createLocalStorageNamespace(unsigned quota, PAL::SessionID sessionID)
Modified: trunk/Source/WebKit/WebProcess/cocoa/PlaybackSessionManager.mm (249434 => 249435)
--- trunk/Source/WebKit/WebProcess/cocoa/PlaybackSessionManager.mm 2019-09-03 18:25:27 UTC (rev 249434)
+++ trunk/Source/WebKit/WebProcess/cocoa/PlaybackSessionManager.mm 2019-09-03 18:37:36 UTC (rev 249435)
@@ -170,7 +170,7 @@
PlaybackSessionManager::PlaybackSessionManager(WebPage& page)
: m_page(&page)
{
- WebProcess::singleton().addMessageReceiver(Messages::PlaybackSessionManager::messageReceiverName(), page.pageID(), *this);
+ WebProcess::singleton().addMessageReceiver(Messages::PlaybackSessionManager::messageReceiverName(), page.identifier(), *this);
}
PlaybackSessionManager::~PlaybackSessionManager()
@@ -187,13 +187,13 @@
m_clientCounts.clear();
if (m_page)
- WebProcess::singleton().removeMessageReceiver(Messages::PlaybackSessionManager::messageReceiverName(), m_page->pageID());
+ WebProcess::singleton().removeMessageReceiver(Messages::PlaybackSessionManager::messageReceiverName(), m_page->identifier());
}
void PlaybackSessionManager::invalidate()
{
ASSERT(m_page);
- WebProcess::singleton().removeMessageReceiver(Messages::PlaybackSessionManager::messageReceiverName(), m_page->pageID());
+ WebProcess::singleton().removeMessageReceiver(Messages::PlaybackSessionManager::messageReceiverName(), m_page->identifier());
m_page = nullptr;
}
Modified: trunk/Source/WebKit/WebProcess/cocoa/VideoFullscreenManager.mm (249434 => 249435)
--- trunk/Source/WebKit/WebProcess/cocoa/VideoFullscreenManager.mm 2019-09-03 18:25:27 UTC (rev 249434)
+++ trunk/Source/WebKit/WebProcess/cocoa/VideoFullscreenManager.mm 2019-09-03 18:37:36 UTC (rev 249435)
@@ -117,7 +117,7 @@
: m_page(&page)
, m_playbackSessionManager(playbackSessionManager)
{
- WebProcess::singleton().addMessageReceiver(Messages::VideoFullscreenManager::messageReceiverName(), page.pageID(), *this);
+ WebProcess::singleton().addMessageReceiver(Messages::VideoFullscreenManager::messageReceiverName(), page.identifier(), *this);
}
VideoFullscreenManager::~VideoFullscreenManager()
@@ -134,13 +134,13 @@
m_clientCounts.clear();
if (m_page)
- WebProcess::singleton().removeMessageReceiver(Messages::VideoFullscreenManager::messageReceiverName(), m_page->pageID());
+ WebProcess::singleton().removeMessageReceiver(Messages::VideoFullscreenManager::messageReceiverName(), m_page->identifier());
}
void VideoFullscreenManager::invalidate()
{
ASSERT(m_page);
- WebProcess::singleton().removeMessageReceiver(Messages::VideoFullscreenManager::messageReceiverName(), m_page->pageID());
+ WebProcess::singleton().removeMessageReceiver(Messages::VideoFullscreenManager::messageReceiverName(), m_page->identifier());
m_page = nullptr;
}
Modified: trunk/Source/WebKit/WebProcess/gtk/WaylandCompositorDisplay.cpp (249434 => 249435)
--- trunk/Source/WebKit/WebProcess/gtk/WaylandCompositorDisplay.cpp 2019-09-03 18:25:27 UTC (rev 249434)
+++ trunk/Source/WebKit/WebProcess/gtk/WaylandCompositorDisplay.cpp 2019-09-03 18:37:36 UTC (rev 249435)
@@ -58,7 +58,7 @@
if (!m_webkitgtk)
return;
- wl_webkitgtk_bind_surface_to_page(reinterpret_cast<struct wl_webkitgtk*>(m_webkitgtk.get()), surface, page.pageID().toUInt64());
+ wl_webkitgtk_bind_surface_to_page(reinterpret_cast<struct wl_webkitgtk*>(m_webkitgtk.get()), surface, page.identifier().toUInt64());
wl_display_roundtrip(m_display);
}
