[SCM] WebKit Debian packaging branch, debian/experimental, updated. upstream/1.3.3-9427-gc2be6fc
andersca at apple.com
andersca at apple.com
Wed Dec 22 15:17:36 UTC 2010
The following commit has been merged in the debian/experimental branch:
commit a363193e37ac757ab50cd100477029e5bf90240e
Author: andersca at apple.com <andersca at apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Fri Oct 29 22:16:54 2010 +0000
Use WebPage::send in a couple of more places.
Reviewed by Adam Roben.
* WebProcess/WebCoreSupport/WebChromeClient.cpp:
(WebKit::WebChromeClient::setWindowRect):
(WebKit::WebChromeClient::takeFocus):
(WebKit::WebChromeClient::setToolbarsVisible):
(WebKit::WebChromeClient::setStatusbarVisible):
(WebKit::WebChromeClient::setMenubarVisible):
(WebKit::WebChromeClient::setResizable):
(WebKit::WebChromeClient::setStatusbarText):
(WebKit::WebChromeClient::contentsSizeChanged):
(WebKit::WebChromeClient::mouseDidMoveOverElement):
(WebKit::WebChromeClient::setToolTip):
(WebKit::WebChromeClient::setCursor):
(WebKit::WebChromeClient::dispatchViewportDataDidChange):
* WebProcess/WebCoreSupport/WebEditorClient.cpp:
(WebKit::WebEditorClient::registerCommandForUndo):
(WebKit::WebEditorClient::clearUndoRedoOperations):
* WebProcess/WebCoreSupport/WebFrameLoaderClient.cpp:
(WebKit::WebFrameLoaderClient::detachedFromParent2):
(WebKit::WebFrameLoaderClient::dispatchDidReceiveServerRedirectForProvisionalLoad):
(WebKit::WebFrameLoaderClient::dispatchDidStartProvisionalLoad):
(WebKit::WebFrameLoaderClient::dispatchDidReceiveTitle):
(WebKit::WebFrameLoaderClient::dispatchDidCommitLoad):
(WebKit::WebFrameLoaderClient::dispatchDidFailProvisionalLoad):
(WebKit::WebFrameLoaderClient::dispatchDidFailLoad):
(WebKit::WebFrameLoaderClient::dispatchDidFinishDocumentLoad):
(WebKit::WebFrameLoaderClient::dispatchDidFinishLoad):
(WebKit::WebFrameLoaderClient::dispatchDidFirstLayout):
(WebKit::WebFrameLoaderClient::dispatchDidFirstVisuallyNonEmptyLayout):
(WebKit::WebFrameLoaderClient::dispatchDecidePolicyForMIMEType):
(WebKit::WebFrameLoaderClient::dispatchDecidePolicyForNewWindowAction):
(WebKit::WebFrameLoaderClient::dispatchDecidePolicyForNavigationAction):
(WebKit::WebFrameLoaderClient::dispatchWillSubmitForm):
(WebKit::WebFrameLoaderClient::postProgressStartedNotification):
(WebKit::WebFrameLoaderClient::postProgressEstimateChangedNotification):
(WebKit::WebFrameLoaderClient::postProgressFinishedNotification):
(WebKit::WebFrameLoaderClient::didDisplayInsecureContent):
(WebKit::WebFrameLoaderClient::didRunInsecureContent):
(WebKit::WebFrameLoaderClient::dispatchDidBecomeFrameset):
* WebProcess/WebPage/FindController.cpp:
(WebKit::FindController::findString):
(WebKit::FindController::hideFindIndicator):
* WebProcess/WebPage/WebBackForwardListProxy.cpp:
(WebKit::WebBackForwardListProxy::addItem):
(WebKit::WebBackForwardListProxy::goToItem):
(WebKit::WebBackForwardListProxy::clear):
* WebProcess/WebPage/WebFrame.cpp:
(WebKit::WebFrame::createMainFrame):
(WebKit::WebFrame::createSubframe):
* WebProcess/WebPage/WebPage.cpp:
(WebKit::WebPage::sendClose):
(WebKit::WebPage::pageDidScroll):
(WebKit::WebPage::mouseEvent):
(WebKit::WebPage::wheelEvent):
(WebKit::WebPage::keyEvent):
(WebKit::WebPage::validateMenuItem):
(WebKit::WebPage::touchEvent):
(WebKit::WebPage::show):
(WebKit::WebPage::runJavaScriptInMainFrame):
(WebKit::WebPage::getRenderTreeExternalRepresentation):
(WebKit::WebPage::getSourceForFrame):
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@70936 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/WebKit2/ChangeLog b/WebKit2/ChangeLog
index 0d4310a..85a6134 100644
--- a/WebKit2/ChangeLog
+++ b/WebKit2/ChangeLog
@@ -2,6 +2,73 @@
Reviewed by Adam Roben.
+ Use WebPage::send in a couple of more places.
+
+ * WebProcess/WebCoreSupport/WebChromeClient.cpp:
+ (WebKit::WebChromeClient::setWindowRect):
+ (WebKit::WebChromeClient::takeFocus):
+ (WebKit::WebChromeClient::setToolbarsVisible):
+ (WebKit::WebChromeClient::setStatusbarVisible):
+ (WebKit::WebChromeClient::setMenubarVisible):
+ (WebKit::WebChromeClient::setResizable):
+ (WebKit::WebChromeClient::setStatusbarText):
+ (WebKit::WebChromeClient::contentsSizeChanged):
+ (WebKit::WebChromeClient::mouseDidMoveOverElement):
+ (WebKit::WebChromeClient::setToolTip):
+ (WebKit::WebChromeClient::setCursor):
+ (WebKit::WebChromeClient::dispatchViewportDataDidChange):
+ * WebProcess/WebCoreSupport/WebEditorClient.cpp:
+ (WebKit::WebEditorClient::registerCommandForUndo):
+ (WebKit::WebEditorClient::clearUndoRedoOperations):
+ * WebProcess/WebCoreSupport/WebFrameLoaderClient.cpp:
+ (WebKit::WebFrameLoaderClient::detachedFromParent2):
+ (WebKit::WebFrameLoaderClient::dispatchDidReceiveServerRedirectForProvisionalLoad):
+ (WebKit::WebFrameLoaderClient::dispatchDidStartProvisionalLoad):
+ (WebKit::WebFrameLoaderClient::dispatchDidReceiveTitle):
+ (WebKit::WebFrameLoaderClient::dispatchDidCommitLoad):
+ (WebKit::WebFrameLoaderClient::dispatchDidFailProvisionalLoad):
+ (WebKit::WebFrameLoaderClient::dispatchDidFailLoad):
+ (WebKit::WebFrameLoaderClient::dispatchDidFinishDocumentLoad):
+ (WebKit::WebFrameLoaderClient::dispatchDidFinishLoad):
+ (WebKit::WebFrameLoaderClient::dispatchDidFirstLayout):
+ (WebKit::WebFrameLoaderClient::dispatchDidFirstVisuallyNonEmptyLayout):
+ (WebKit::WebFrameLoaderClient::dispatchDecidePolicyForMIMEType):
+ (WebKit::WebFrameLoaderClient::dispatchDecidePolicyForNewWindowAction):
+ (WebKit::WebFrameLoaderClient::dispatchDecidePolicyForNavigationAction):
+ (WebKit::WebFrameLoaderClient::dispatchWillSubmitForm):
+ (WebKit::WebFrameLoaderClient::postProgressStartedNotification):
+ (WebKit::WebFrameLoaderClient::postProgressEstimateChangedNotification):
+ (WebKit::WebFrameLoaderClient::postProgressFinishedNotification):
+ (WebKit::WebFrameLoaderClient::didDisplayInsecureContent):
+ (WebKit::WebFrameLoaderClient::didRunInsecureContent):
+ (WebKit::WebFrameLoaderClient::dispatchDidBecomeFrameset):
+ * WebProcess/WebPage/FindController.cpp:
+ (WebKit::FindController::findString):
+ (WebKit::FindController::hideFindIndicator):
+ * WebProcess/WebPage/WebBackForwardListProxy.cpp:
+ (WebKit::WebBackForwardListProxy::addItem):
+ (WebKit::WebBackForwardListProxy::goToItem):
+ (WebKit::WebBackForwardListProxy::clear):
+ * WebProcess/WebPage/WebFrame.cpp:
+ (WebKit::WebFrame::createMainFrame):
+ (WebKit::WebFrame::createSubframe):
+ * WebProcess/WebPage/WebPage.cpp:
+ (WebKit::WebPage::sendClose):
+ (WebKit::WebPage::pageDidScroll):
+ (WebKit::WebPage::mouseEvent):
+ (WebKit::WebPage::wheelEvent):
+ (WebKit::WebPage::keyEvent):
+ (WebKit::WebPage::validateMenuItem):
+ (WebKit::WebPage::touchEvent):
+ (WebKit::WebPage::show):
+ (WebKit::WebPage::runJavaScriptInMainFrame):
+ (WebKit::WebPage::getRenderTreeExternalRepresentation):
+ (WebKit::WebPage::getSourceForFrame):
+
+2010-10-29 Anders Carlsson <andersca at apple.com>
+
+ Reviewed by Adam Roben.
+
Add a MessageSender class template
https://bugs.webkit.org/show_bug.cgi?id=48683
diff --git a/WebKit2/WebProcess/WebCoreSupport/WebChromeClient.cpp b/WebKit2/WebProcess/WebCoreSupport/WebChromeClient.cpp
index c86962f..59a95e7 100644
--- a/WebKit2/WebProcess/WebCoreSupport/WebChromeClient.cpp
+++ b/WebKit2/WebProcess/WebCoreSupport/WebChromeClient.cpp
@@ -59,7 +59,7 @@ void WebChromeClient::chromeDestroyed()
void WebChromeClient::setWindowRect(const FloatRect& windowFrame)
{
- WebProcess::shared().connection()->send(Messages::WebPageProxy::SetWindowFrame(windowFrame), m_page->pageID());
+ m_page->send(Messages::WebPageProxy::SetWindowFrame(windowFrame));
}
FloatRect WebChromeClient::windowRect()
@@ -102,7 +102,7 @@ bool WebChromeClient::canTakeFocus(FocusDirection)
void WebChromeClient::takeFocus(FocusDirection direction)
{
- WebProcess::shared().connection()->send(Messages::WebPageProxy::TakeFocus(direction == FocusDirectionForward ? true : false), m_page->pageID());
+ m_page->send(Messages::WebPageProxy::TakeFocus(direction == FocusDirectionForward ? true : false));
}
void WebChromeClient::focusedNodeChanged(Node*)
@@ -145,7 +145,7 @@ void WebChromeClient::runModal()
void WebChromeClient::setToolbarsVisible(bool toolbarsAreVisible)
{
- WebProcess::shared().connection()->send(Messages::WebPageProxy::SetToolbarsAreVisible(toolbarsAreVisible), m_page->pageID());
+ m_page->send(Messages::WebPageProxy::SetToolbarsAreVisible(toolbarsAreVisible));
}
bool WebChromeClient::toolbarsVisible()
@@ -159,7 +159,7 @@ bool WebChromeClient::toolbarsVisible()
void WebChromeClient::setStatusbarVisible(bool statusBarIsVisible)
{
- WebProcess::shared().connection()->send(Messages::WebPageProxy::SetStatusBarIsVisible(statusBarIsVisible), m_page->pageID());
+ m_page->send(Messages::WebPageProxy::SetStatusBarIsVisible(statusBarIsVisible));
}
bool WebChromeClient::statusbarVisible()
@@ -184,7 +184,7 @@ bool WebChromeClient::scrollbarsVisible()
void WebChromeClient::setMenubarVisible(bool menuBarVisible)
{
- WebProcess::shared().connection()->send(Messages::WebPageProxy::SetMenuBarIsVisible(menuBarVisible), m_page->pageID());
+ m_page->send(Messages::WebPageProxy::SetMenuBarIsVisible(menuBarVisible));
}
bool WebChromeClient::menubarVisible()
@@ -198,7 +198,7 @@ bool WebChromeClient::menubarVisible()
void WebChromeClient::setResizable(bool resizable)
{
- WebProcess::shared().connection()->send(Messages::WebPageProxy::SetIsResizable(resizable), m_page->pageID());
+ m_page->send(Messages::WebPageProxy::SetIsResizable(resizable));
}
void WebChromeClient::addMessageToConsole(MessageSource, MessageType, MessageLevel, const String& message, unsigned int lineNumber, const String& sourceID)
@@ -290,7 +290,7 @@ void WebChromeClient::setStatusbarText(const String& statusbarText)
// Notify the bundle client.
m_page->injectedBundleUIClient().willSetStatusbarText(m_page, statusbarText);
- WebProcess::shared().connection()->send(Messages::WebPageProxy::SetStatusText(statusbarText), m_page->pageID());
+ m_page->send(Messages::WebPageProxy::SetStatusText(statusbarText));
}
bool WebChromeClient::shouldInterruptJavaScript()
@@ -358,7 +358,7 @@ void WebChromeClient::contentsSizeChanged(Frame* frame, const IntSize& size) con
if (!m_page->mainFrame() || m_page->mainFrame() != webFrame)
return;
- WebProcess::shared().connection()->send(Messages::WebPageProxy::DidChangeContentsSize(size), m_page->pageID());
+ m_page->send(Messages::WebPageProxy::DidChangeContentsSize(size));
#endif
}
@@ -380,7 +380,7 @@ void WebChromeClient::mouseDidMoveOverElement(const HitTestResult& hitTestResult
m_page->injectedBundleUIClient().mouseDidMoveOverElement(m_page, hitTestResult, static_cast<WebEvent::Modifiers>(modifierFlags), userData);
// Notify the UIProcess.
- WebProcess::shared().connection()->send(Messages::WebPageProxy::MouseDidMoveOverElement(modifierFlags, InjectedBundleUserMessageEncoder(userData.get())), m_page->pageID());
+ m_page->send(Messages::WebPageProxy::MouseDidMoveOverElement(modifierFlags, InjectedBundleUserMessageEncoder(userData.get())));
}
void WebChromeClient::setToolTip(const String& toolTip, TextDirection)
@@ -391,7 +391,7 @@ void WebChromeClient::setToolTip(const String& toolTip, TextDirection)
return;
m_cachedToolTip = toolTip;
- WebProcess::shared().connection()->send(Messages::WebPageProxy::SetToolTip(m_cachedToolTip), m_page->pageID());
+ m_page->send(Messages::WebPageProxy::SetToolTip(m_cachedToolTip));
}
void WebChromeClient::print(Frame*)
@@ -491,7 +491,7 @@ void WebChromeClient::chooseIconForFiles(const Vector<String>&, FileChooser*)
void WebChromeClient::setCursor(const Cursor& cursor)
{
#if USE(LAZY_NATIVE_CURSOR)
- WebProcess::shared().connection()->send(Messages::WebPageProxy::SetCursor(cursor), m_page->pageID());
+ m_page->send(Messages::WebPageProxy::SetCursor(cursor));
#endif
}
@@ -574,7 +574,7 @@ void WebChromeClient::setLastSetCursorToCurrentCursor()
void WebChromeClient::dispatchViewportDataDidChange(const ViewportArguments& args) const
{
- WebProcess::shared().connection()->send(Messages::WebPageProxy::DidChangeViewportData(args), m_page->pageID());
+ m_page->send(Messages::WebPageProxy::DidChangeViewportData(args));
}
} // namespace WebKit
diff --git a/WebKit2/WebProcess/WebCoreSupport/WebEditorClient.cpp b/WebKit2/WebProcess/WebCoreSupport/WebEditorClient.cpp
index cde9be8..10a2794 100644
--- a/WebKit2/WebProcess/WebCoreSupport/WebEditorClient.cpp
+++ b/WebKit2/WebProcess/WebCoreSupport/WebEditorClient.cpp
@@ -211,7 +211,7 @@ void WebEditorClient::registerCommandForUndo(PassRefPtr<EditCommand> command)
m_page->addWebEditCommand(webCommand->commandID(), webCommand.get());
uint32_t editAction = static_cast<uint32_t>(webCommand->command()->editingAction());
- WebProcess::shared().connection()->send(Messages::WebPageProxy::RegisterEditCommandForUndo(webCommand->commandID(), editAction), m_page->pageID());
+ m_page->send(Messages::WebPageProxy::RegisterEditCommandForUndo(webCommand->commandID(), editAction));
}
void WebEditorClient::registerCommandForRedo(PassRefPtr<EditCommand>)
@@ -220,7 +220,7 @@ void WebEditorClient::registerCommandForRedo(PassRefPtr<EditCommand>)
void WebEditorClient::clearUndoRedoOperations()
{
- WebProcess::shared().connection()->send(Messages::WebPageProxy::ClearAllEditCommands(), m_page->pageID());
+ m_page->send(Messages::WebPageProxy::ClearAllEditCommands());
}
bool WebEditorClient::canUndo() const
diff --git a/WebKit2/WebProcess/WebCoreSupport/WebFrameLoaderClient.cpp b/WebKit2/WebProcess/WebCoreSupport/WebFrameLoaderClient.cpp
index e9e9998..95fab0a 100644
--- a/WebKit2/WebProcess/WebCoreSupport/WebFrameLoaderClient.cpp
+++ b/WebKit2/WebProcess/WebCoreSupport/WebFrameLoaderClient.cpp
@@ -127,7 +127,7 @@ void WebFrameLoaderClient::detachedFromParent2()
webPage->injectedBundleLoaderClient().didRemoveFrameFromHierarchy(webPage, m_frame, userData);
// Notify the UIProcess.
- WebProcess::shared().connection()->send(Messages::WebPageProxy::DidRemoveFrameFromHierarchy(m_frame->frameID(), InjectedBundleUserMessageEncoder(userData.get())), webPage->pageID());
+ webPage->send(Messages::WebPageProxy::DidRemoveFrameFromHierarchy(m_frame->frameID(), InjectedBundleUserMessageEncoder(userData.get())));
}
@@ -226,7 +226,7 @@ void WebFrameLoaderClient::dispatchDidReceiveServerRedirectForProvisionalLoad()
webPage->injectedBundleLoaderClient().didReceiveServerRedirectForProvisionalLoadForFrame(webPage, m_frame, userData);
// Notify the UIProcess.
- WebProcess::shared().connection()->send(Messages::WebPageProxy::DidReceiveServerRedirectForProvisionalLoadForFrame(m_frame->frameID(), url, InjectedBundleUserMessageEncoder(userData.get())), webPage->pageID());
+ webPage->send(Messages::WebPageProxy::DidReceiveServerRedirectForProvisionalLoadForFrame(m_frame->frameID(), url, InjectedBundleUserMessageEncoder(userData.get())));
}
void WebFrameLoaderClient::dispatchDidCancelClientRedirect()
@@ -303,7 +303,7 @@ void WebFrameLoaderClient::dispatchDidStartProvisionalLoad()
bool loadingSubstituteDataForUnreachableURL = !provisionalLoader->unreachableURL().isNull();
// Notify the UIProcess.
- WebProcess::shared().connection()->send(Messages::WebPageProxy::DidStartProvisionalLoadForFrame(m_frame->frameID(), url, loadingSubstituteDataForUnreachableURL, InjectedBundleUserMessageEncoder(userData.get())), webPage->pageID());
+ webPage->send(Messages::WebPageProxy::DidStartProvisionalLoadForFrame(m_frame->frameID(), url, loadingSubstituteDataForUnreachableURL, InjectedBundleUserMessageEncoder(userData.get())));
}
void WebFrameLoaderClient::dispatchDidReceiveTitle(const String& title)
@@ -318,7 +318,7 @@ void WebFrameLoaderClient::dispatchDidReceiveTitle(const String& title)
webPage->injectedBundleLoaderClient().didReceiveTitleForFrame(webPage, title, m_frame, userData);
// Notify the UIProcess.
- WebProcess::shared().connection()->send(Messages::WebPageProxy::DidReceiveTitleForFrame(m_frame->frameID(), title, InjectedBundleUserMessageEncoder(userData.get())), webPage->pageID());
+ webPage->send(Messages::WebPageProxy::DidReceiveTitleForFrame(m_frame->frameID(), title, InjectedBundleUserMessageEncoder(userData.get())));
}
void WebFrameLoaderClient::dispatchDidChangeIcons()
@@ -339,7 +339,7 @@ void WebFrameLoaderClient::dispatchDidCommitLoad()
webPage->injectedBundleLoaderClient().didCommitLoadForFrame(webPage, m_frame, userData);
// Notify the UIProcess.
- WebProcess::shared().connection()->send(Messages::WebPageProxy::DidCommitLoadForFrame(m_frame->frameID(), response.mimeType(), PlatformCertificateInfo(response), InjectedBundleUserMessageEncoder(userData.get())), webPage->pageID());
+ webPage->send(Messages::WebPageProxy::DidCommitLoadForFrame(m_frame->frameID(), response.mimeType(), PlatformCertificateInfo(response), InjectedBundleUserMessageEncoder(userData.get())));
}
void WebFrameLoaderClient::dispatchDidFailProvisionalLoad(const ResourceError& error)
@@ -354,7 +354,7 @@ void WebFrameLoaderClient::dispatchDidFailProvisionalLoad(const ResourceError& e
webPage->injectedBundleLoaderClient().didFailProvisionalLoadWithErrorForFrame(webPage, m_frame, error, userData);
// Notify the UIProcess.
- WebProcess::shared().connection()->send(Messages::WebPageProxy::DidFailProvisionalLoadForFrame(m_frame->frameID(), error, InjectedBundleUserMessageEncoder(userData.get())), webPage->pageID());
+ webPage->send(Messages::WebPageProxy::DidFailProvisionalLoadForFrame(m_frame->frameID(), error, InjectedBundleUserMessageEncoder(userData.get())));
// If we have a load listener, notify it.
if (WebFrame::LoadListener* loadListener = m_frame->loadListener())
@@ -373,7 +373,7 @@ void WebFrameLoaderClient::dispatchDidFailLoad(const ResourceError& error)
webPage->injectedBundleLoaderClient().didFailLoadWithErrorForFrame(webPage, m_frame, error, userData);
// Notify the UIProcess.
- WebProcess::shared().connection()->send(Messages::WebPageProxy::DidFailLoadForFrame(m_frame->frameID(), error, InjectedBundleUserMessageEncoder(userData.get())), webPage->pageID());
+ webPage->send(Messages::WebPageProxy::DidFailLoadForFrame(m_frame->frameID(), error, InjectedBundleUserMessageEncoder(userData.get())));
// If we have a load listener, notify it.
if (WebFrame::LoadListener* loadListener = m_frame->loadListener())
@@ -392,7 +392,7 @@ void WebFrameLoaderClient::dispatchDidFinishDocumentLoad()
webPage->injectedBundleLoaderClient().didFinishDocumentLoadForFrame(webPage, m_frame, userData);
// Notify the UIProcess.
- WebProcess::shared().connection()->send(Messages::WebPageProxy::DidFinishDocumentLoadForFrame(m_frame->frameID(), InjectedBundleUserMessageEncoder(userData.get())), webPage->pageID());
+ webPage->send(Messages::WebPageProxy::DidFinishDocumentLoadForFrame(m_frame->frameID(), InjectedBundleUserMessageEncoder(userData.get())));
}
void WebFrameLoaderClient::dispatchDidFinishLoad()
@@ -407,7 +407,7 @@ void WebFrameLoaderClient::dispatchDidFinishLoad()
webPage->injectedBundleLoaderClient().didFinishLoadForFrame(webPage, m_frame, userData);
// Notify the UIProcess.
- WebProcess::shared().connection()->send(Messages::WebPageProxy::DidFinishLoadForFrame(m_frame->frameID(), InjectedBundleUserMessageEncoder(userData.get())), webPage->pageID());
+ webPage->send(Messages::WebPageProxy::DidFinishLoadForFrame(m_frame->frameID(), InjectedBundleUserMessageEncoder(userData.get())));
// If we have a load listener, notify it.
if (WebFrame::LoadListener* loadListener = m_frame->loadListener())
@@ -426,7 +426,7 @@ void WebFrameLoaderClient::dispatchDidFirstLayout()
webPage->injectedBundleLoaderClient().didFirstLayoutForFrame(webPage, m_frame, userData);
// Notify the UIProcess.
- WebProcess::shared().connection()->send(Messages::WebPageProxy::DidFirstLayoutForFrame(m_frame->frameID(), InjectedBundleUserMessageEncoder(userData.get())), webPage->pageID());
+ webPage->send(Messages::WebPageProxy::DidFirstLayoutForFrame(m_frame->frameID(), InjectedBundleUserMessageEncoder(userData.get())));
}
void WebFrameLoaderClient::dispatchDidFirstVisuallyNonEmptyLayout()
@@ -441,7 +441,7 @@ void WebFrameLoaderClient::dispatchDidFirstVisuallyNonEmptyLayout()
webPage->injectedBundleLoaderClient().didFirstVisuallyNonEmptyLayoutForFrame(webPage, m_frame, userData);
// Notify the UIProcess.
- WebProcess::shared().connection()->send(Messages::WebPageProxy::DidFirstVisuallyNonEmptyLayoutForFrame(m_frame->frameID(), InjectedBundleUserMessageEncoder(userData.get())), webPage->pageID());
+ webPage->send(Messages::WebPageProxy::DidFirstVisuallyNonEmptyLayoutForFrame(m_frame->frameID(), InjectedBundleUserMessageEncoder(userData.get())));
}
Frame* WebFrameLoaderClient::dispatchCreatePage(const NavigationAction& navigationAction)
@@ -521,7 +521,7 @@ void WebFrameLoaderClient::dispatchDecidePolicyForMIMEType(FramePolicyFunction f
uint64_t listenerID = m_frame->setUpPolicyListener(function);
const String& url = request.url().string(); // FIXME: Pass entire request.
- WebProcess::shared().connection()->send(Messages::WebPageProxy::DecidePolicyForMIMEType(m_frame->frameID(), MIMEType, url, listenerID), webPage->pageID());
+ webPage->send(Messages::WebPageProxy::DecidePolicyForMIMEType(m_frame->frameID(), MIMEType, url, listenerID));
}
void WebFrameLoaderClient::dispatchDecidePolicyForNewWindowAction(FramePolicyFunction function, const NavigationAction& navigationAction, const ResourceRequest& request, PassRefPtr<FormState>, const String& frameName)
@@ -540,7 +540,7 @@ void WebFrameLoaderClient::dispatchDecidePolicyForNewWindowAction(FramePolicyFun
uint32_t modifiers = modifiersForNavigationAction(navigationAction);
int32_t mouseButton = mouseButtonForNavigationAction(navigationAction);
- WebProcess::shared().connection()->send(Messages::WebPageProxy::DecidePolicyForNewWindowAction(m_frame->frameID(), navigationType, modifiers, mouseButton, url, listenerID), webPage->pageID());
+ webPage->send(Messages::WebPageProxy::DecidePolicyForNewWindowAction(m_frame->frameID(), navigationType, modifiers, mouseButton, url, listenerID));
}
void WebFrameLoaderClient::dispatchDecidePolicyForNavigationAction(FramePolicyFunction function, const NavigationAction& navigationAction, const ResourceRequest& request, PassRefPtr<FormState>)
@@ -565,7 +565,7 @@ void WebFrameLoaderClient::dispatchDecidePolicyForNavigationAction(FramePolicyFu
uint32_t modifiers = modifiersForNavigationAction(navigationAction);
int32_t mouseButton = mouseButtonForNavigationAction(navigationAction);
- WebProcess::shared().connection()->send(Messages::WebPageProxy::DecidePolicyForNavigationAction(m_frame->frameID(), navigationType, modifiers, mouseButton, url, listenerID), webPage->pageID());
+ webPage->send(Messages::WebPageProxy::DecidePolicyForNavigationAction(m_frame->frameID(), navigationType, modifiers, mouseButton, url, listenerID));
}
void WebFrameLoaderClient::cancelPolicyCheck()
@@ -598,7 +598,7 @@ void WebFrameLoaderClient::dispatchWillSubmitForm(FramePolicyFunction function,
uint64_t listenerID = m_frame->setUpPolicyListener(function);
StringPairVector valuesVector(values);
- WebProcess::shared().connection()->send(Messages::WebPageProxy::WillSubmitForm(m_frame->frameID(), sourceFrame->frameID(), valuesVector, listenerID, InjectedBundleUserMessageEncoder(userData.get())), webPage->pageID());
+ webPage->send(Messages::WebPageProxy::WillSubmitForm(m_frame->frameID(), sourceFrame->frameID(), valuesVector, listenerID, InjectedBundleUserMessageEncoder(userData.get())));
}
void WebFrameLoaderClient::dispatchDidLoadMainResource(DocumentLoader*)
@@ -634,14 +634,14 @@ void WebFrameLoaderClient::didChangeEstimatedProgress()
void WebFrameLoaderClient::postProgressStartedNotification()
{
if (WebPage* webPage = m_frame->page())
- WebProcess::shared().connection()->send(Messages::WebPageProxy::DidStartProgress(), webPage->pageID());
+ webPage->send(Messages::WebPageProxy::DidStartProgress());
}
void WebFrameLoaderClient::postProgressEstimateChangedNotification()
{
if (WebPage* webPage = m_frame->page()) {
double progress = webPage->corePage()->progress()->estimatedProgress();
- WebProcess::shared().connection()->send(Messages::WebPageProxy::DidChangeProgress(progress), webPage->pageID());
+ webPage->send(Messages::WebPageProxy::DidChangeProgress(progress));
}
}
@@ -649,7 +649,7 @@ void WebFrameLoaderClient::postProgressEstimateChangedNotification()
void WebFrameLoaderClient::postProgressFinishedNotification()
{
if (WebPage* webPage = m_frame->page())
- WebProcess::shared().connection()->send(Messages::WebPageProxy::DidFinishProgress(), webPage->pageID());
+ webPage->send(Messages::WebPageProxy::DidFinishProgress());
}
void WebFrameLoaderClient::setMainFrameDocumentReady(bool)
@@ -783,7 +783,7 @@ void WebFrameLoaderClient::didDisplayInsecureContent()
webPage->injectedBundleLoaderClient().didDisplayInsecureContentForFrame(webPage, m_frame, userData);
- WebProcess::shared().connection()->send(Messages::WebPageProxy::DidDisplayInsecureContentForFrame(m_frame->frameID(), InjectedBundleUserMessageEncoder(userData.get())), webPage->pageID());
+ webPage->send(Messages::WebPageProxy::DidDisplayInsecureContentForFrame(m_frame->frameID(), InjectedBundleUserMessageEncoder(userData.get())));
}
void WebFrameLoaderClient::didRunInsecureContent(SecurityOrigin*)
@@ -796,7 +796,7 @@ void WebFrameLoaderClient::didRunInsecureContent(SecurityOrigin*)
webPage->injectedBundleLoaderClient().didRunInsecureContentForFrame(webPage, m_frame, userData);
- WebProcess::shared().connection()->send(Messages::WebPageProxy::DidRunInsecureContentForFrame(m_frame->frameID(), InjectedBundleUserMessageEncoder(userData.get())), webPage->pageID());
+ webPage->send(Messages::WebPageProxy::DidRunInsecureContentForFrame(m_frame->frameID(), InjectedBundleUserMessageEncoder(userData.get())));
}
ResourceError WebFrameLoaderClient::cancelledError(const ResourceRequest& request)
@@ -946,7 +946,7 @@ void WebFrameLoaderClient::dispatchDidBecomeFrameset(bool value)
if (!webPage)
return;
- WebProcess::shared().connection()->send(Messages::WebPageProxy::FrameDidBecomeFrameSet(m_frame->frameID(), value), webPage->pageID());
+ webPage->send(Messages::WebPageProxy::FrameDidBecomeFrameSet(m_frame->frameID(), value));
}
bool WebFrameLoaderClient::canCachePage() const
diff --git a/WebKit2/WebProcess/WebPage/FindController.cpp b/WebKit2/WebProcess/WebPage/FindController.cpp
index 9234ac6..775b8b8 100644
--- a/WebKit2/WebProcess/WebPage/FindController.cpp
+++ b/WebKit2/WebProcess/WebPage/FindController.cpp
@@ -86,7 +86,7 @@ void FindController::findString(const String& string, FindDirection findDirectio
hideFindIndicator();
- WebProcess::shared().connection()->send(Messages::WebPageProxy::DidFailToFindString(string), m_webPage->pageID());
+ m_webPage->send(Messages::WebPageProxy::DidFailToFindString(string));
} else {
shouldShowOverlay = findOptions & FindOptionsShowOverlay;
@@ -191,7 +191,7 @@ void FindController::hideFindIndicator()
return;
SharedMemory::Handle handle;
- WebProcess::shared().connection()->send(Messages::WebPageProxy::SetFindIndicator(FloatRect(), Vector<FloatRect>(), handle, false), m_webPage->pageID());
+ m_webPage->send(Messages::WebPageProxy::SetFindIndicator(FloatRect(), Vector<FloatRect>(), handle, false));
m_isShowingFindIndicator = false;
}
diff --git a/WebKit2/WebProcess/WebPage/WebBackForwardListProxy.cpp b/WebKit2/WebProcess/WebPage/WebBackForwardListProxy.cpp
index a5bd862..aeea79f 100644
--- a/WebKit2/WebProcess/WebPage/WebBackForwardListProxy.cpp
+++ b/WebKit2/WebProcess/WebPage/WebBackForwardListProxy.cpp
@@ -112,7 +112,7 @@ void WebBackForwardListProxy::addItem(PassRefPtr<HistoryItem> prpItem)
RefPtr<HistoryItem> item = prpItem;
uint64_t itemID = historyItemToIDMap().get(item);
- WebProcess::shared().connection()->send(Messages::WebPageProxy::BackForwardAddItem(itemID), m_page->pageID());
+ m_page->send(Messages::WebPageProxy::BackForwardAddItem(itemID));
}
void WebBackForwardListProxy::goToItem(HistoryItem* item)
@@ -121,8 +121,7 @@ void WebBackForwardListProxy::goToItem(HistoryItem* item)
return;
uint64_t itemID = historyItemToIDMap().get(item);
- WebProcess::shared().connection()->send(Messages::WebPageProxy::BackForwardGoToItem(itemID), m_page->pageID());
-
+ m_page->send(Messages::WebPageProxy::BackForwardGoToItem(itemID));
}
HistoryItem* WebBackForwardListProxy::itemAtIndex(int itemIndex)
@@ -178,7 +177,7 @@ bool WebBackForwardListProxy::isActive()
void WebBackForwardListProxy::clear()
{
- WebProcess::shared().connection()->send(Messages::WebPageProxy::BackForwardClear(), m_page->pageID());
+ m_page->send(Messages::WebPageProxy::BackForwardClear());
}
#if ENABLE(WML)
diff --git a/WebKit2/WebProcess/WebPage/WebFrame.cpp b/WebKit2/WebProcess/WebPage/WebFrame.cpp
index da09ef3..4dbdec3 100644
--- a/WebKit2/WebProcess/WebPage/WebFrame.cpp
+++ b/WebKit2/WebProcess/WebPage/WebFrame.cpp
@@ -78,7 +78,7 @@ PassRefPtr<WebFrame> WebFrame::createMainFrame(WebPage* page)
{
RefPtr<WebFrame> frame = create();
- WebProcess::shared().connection()->send(Messages::WebPageProxy::DidCreateMainFrame(frame->frameID()), page->pageID());
+ page->send(Messages::WebPageProxy::DidCreateMainFrame(frame->frameID()));
frame->init(page, String(), 0);
@@ -89,7 +89,7 @@ PassRefPtr<WebFrame> WebFrame::createSubframe(WebPage* page, const String& frame
{
RefPtr<WebFrame> frame = create();
- WebProcess::shared().connection()->send(Messages::WebPageProxy::DidCreateSubFrame(frame->frameID()), page->pageID());
+ page->send(Messages::WebPageProxy::DidCreateSubFrame(frame->frameID()));
frame->init(page, frameName, ownerElement);
diff --git a/WebKit2/WebProcess/WebPage/WebPage.cpp b/WebKit2/WebProcess/WebPage/WebPage.cpp
index e5d8fad..25af289 100644
--- a/WebKit2/WebProcess/WebPage/WebPage.cpp
+++ b/WebKit2/WebProcess/WebPage/WebPage.cpp
@@ -299,7 +299,7 @@ void WebPage::tryClose()
void WebPage::sendClose()
{
- WebProcess::shared().connection()->send(Messages::WebPageProxy::ClosePage(), m_pageID);
+ send(Messages::WebPageProxy::ClosePage());
}
void WebPage::loadURL(const String& url)
@@ -478,7 +478,7 @@ void WebPage::pageDidScroll()
m_uiClient.pageDidScroll(this);
- WebProcess::shared().connection()->send(Messages::WebPageProxy::PageDidScroll(), m_pageID);
+ send(Messages::WebPageProxy::PageDidScroll());
}
// Events
@@ -546,7 +546,7 @@ void WebPage::mouseEvent(const WebMouseEvent& mouseEvent)
handled = handleMouseEvent(mouseEvent, m_page.get());
}
- WebProcess::shared().connection()->send(Messages::WebPageProxy::DidReceiveEvent(static_cast<uint32_t>(mouseEvent.type()), handled), m_pageID);
+ send(Messages::WebPageProxy::DidReceiveEvent(static_cast<uint32_t>(mouseEvent.type()), handled));
}
static bool handleWheelEvent(const WebWheelEvent& wheelEvent, Page* page)
@@ -564,7 +564,7 @@ void WebPage::wheelEvent(const WebWheelEvent& wheelEvent)
CurrentEvent currentEvent(wheelEvent);
bool handled = handleWheelEvent(wheelEvent, m_page.get());
- WebProcess::shared().connection()->send(Messages::WebPageProxy::DidReceiveEvent(static_cast<uint32_t>(wheelEvent.type()), handled), m_pageID);
+ send(Messages::WebPageProxy::DidReceiveEvent(static_cast<uint32_t>(wheelEvent.type()), handled));
}
static bool handleKeyEvent(const WebKeyboardEvent& keyboardEvent, Page* page)
@@ -583,7 +583,7 @@ void WebPage::keyEvent(const WebKeyboardEvent& keyboardEvent)
if (!handled)
handled = performDefaultBehaviorForKeyEvent(keyboardEvent);
- WebProcess::shared().connection()->send(Messages::WebPageProxy::DidReceiveEvent(static_cast<uint32_t>(keyboardEvent.type()), handled), m_pageID);
+ send(Messages::WebPageProxy::DidReceiveEvent(static_cast<uint32_t>(keyboardEvent.type()), handled));
}
void WebPage::validateMenuItem(const String& commandName)
@@ -597,7 +597,7 @@ void WebPage::validateMenuItem(const String& commandName)
isEnabled = command.isSupported() && command.isEnabled();
}
- WebProcess::shared().connection()->send(Messages::WebPageProxy::DidValidateMenuItem(commandName, isEnabled, state), m_pageID);
+ send(Messages::WebPageProxy::DidValidateMenuItem(commandName, isEnabled, state));
}
void WebPage::executeEditCommand(const String& commandName)
@@ -621,7 +621,7 @@ void WebPage::touchEvent(const WebTouchEvent& touchEvent)
bool handled = handleTouchEvent(touchEvent, m_page.get());
- WebProcess::shared().connection()->send(Messages::WebPageProxy::DidReceiveEvent(static_cast<uint32_t>(touchEvent.type()), handled), m_pageID);
+ send(Messages::WebPageProxy::DidReceiveEvent(static_cast<uint32_t>(touchEvent.type()), handled));
}
#endif
@@ -676,7 +676,7 @@ void WebPage::didReceivePolicyDecision(uint64_t frameID, uint64_t listenerID, ui
void WebPage::show()
{
- WebProcess::shared().connection()->send(Messages::WebPageProxy::ShowPage(), m_pageID);
+ send(Messages::WebPageProxy::ShowPage());
}
void WebPage::setCustomUserAgent(const String& customUserAgent)
@@ -719,13 +719,13 @@ void WebPage::runJavaScriptInMainFrame(const String& script, uint64_t callbackID
if (resultValue)
resultString = ustringToString(resultValue.toString(m_mainFrame->coreFrame()->script()->globalObject(mainThreadNormalWorld())->globalExec()));
- WebProcess::shared().connection()->send(Messages::WebPageProxy::DidRunJavaScriptInMainFrame(resultString, callbackID), m_pageID);
+ send(Messages::WebPageProxy::DidRunJavaScriptInMainFrame(resultString, callbackID));
}
void WebPage::getRenderTreeExternalRepresentation(uint64_t callbackID)
{
String resultString = renderTreeExternalRepresentation();
- WebProcess::shared().connection()->send(Messages::WebPageProxy::DidGetRenderTreeExternalRepresentation(resultString, callbackID), m_pageID);
+ send(Messages::WebPageProxy::DidGetRenderTreeExternalRepresentation(resultString, callbackID));
}
void WebPage::getSourceForFrame(uint64_t frameID, uint64_t callbackID)
@@ -734,7 +734,7 @@ void WebPage::getSourceForFrame(uint64_t frameID, uint64_t callbackID)
if (WebFrame* frame = WebProcess::shared().webFrame(frameID))
resultString = frame->source();
- WebProcess::shared().connection()->send(Messages::WebPageProxy::DidGetSourceForFrame(resultString, callbackID), m_pageID);
+ send(Messages::WebPageProxy::DidGetSourceForFrame(resultString, callbackID));
}
void WebPage::preferencesDidChange(const WebPreferencesStore& store)
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list