[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:08 UTC 2010
The following commit has been merged in the debian/experimental branch:
commit a328062cb6a2c094654438eab6d6fccf3cfa9e18
Author: andersca at apple.com <andersca at apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Fri Oct 29 20:51:05 2010 +0000
Change the Connection::sendSync timeout parameter to have the NoTimeout argument as a default
argument and update all the call sites.
Reviewed by Dan Bernstein.
* Platform/CoreIPC/Connection.h:
* PluginProcess/PluginControllerProxy.cpp:
(WebKit::PluginControllerProxy::proxiesForURL):
(WebKit::PluginControllerProxy::cookiesForURL):
* WebProcess/InjectedBundle/InjectedBundle.cpp:
(WebKit::InjectedBundle::postSynchronousMessage):
* WebProcess/Plugins/PluginProcessConnectionManager.cpp:
(WebKit::PluginProcessConnectionManager::getPluginProcessConnection):
* WebProcess/Plugins/PluginProxy.cpp:
(WebKit::PluginProxy::initialize):
(WebKit::PluginProxy::destroy):
(WebKit::PluginProxy::paint):
(WebKit::PluginProxy::handleMouseEvent):
(WebKit::PluginProxy::handleWheelEvent):
(WebKit::PluginProxy::handleMouseEnterEvent):
(WebKit::PluginProxy::handleMouseLeaveEvent):
(WebKit::PluginProxy::handleKeyboardEvent):
* WebProcess/WebCoreSupport/WebChromeClient.cpp:
(WebKit::WebChromeClient::windowRect):
(WebKit::WebChromeClient::createWindow):
(WebKit::WebChromeClient::toolbarsVisible):
(WebKit::WebChromeClient::statusbarVisible):
(WebKit::WebChromeClient::menubarVisible):
(WebKit::WebChromeClient::canRunBeforeUnloadConfirmPanel):
(WebKit::WebChromeClient::runBeforeUnloadConfirmPanel):
(WebKit::WebChromeClient::runJavaScriptAlert):
(WebKit::WebChromeClient::runJavaScriptConfirm):
(WebKit::WebChromeClient::runJavaScriptPrompt):
* WebProcess/WebCoreSupport/WebPlatformStrategies.cpp:
(WebKit::WebPlatformStrategies::populatePluginCache):
* WebProcess/WebPage/WebBackForwardListProxy.cpp:
(WebKit::WebBackForwardListProxy::itemAtIndex):
(WebKit::WebBackForwardListProxy::backListCount):
(WebKit::WebBackForwardListProxy::forwardListCount):
* WebProcess/WebPage/WebPage.cpp:
(WebKit::WebPage::createPlugin):
(WebKit::WebPage::changeAcceleratedCompositingMode):
* WebProcess/WebPage/mac/LayerBackedDrawingAreaMac.mm:
(WebKit::LayerBackedDrawingArea::attachCompositingContext):
* WebProcess/WebPage/mac/WebPageMac.mm:
(WebKit::WebPage::interceptEditingKeyboardEvent):
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@70920 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/WebKit2/ChangeLog b/WebKit2/ChangeLog
index 67efd12..c3d3e0a 100644
--- a/WebKit2/ChangeLog
+++ b/WebKit2/ChangeLog
@@ -1,3 +1,52 @@
+2010-10-29 Anders Carlsson <andersca at apple.com>
+
+ Reviewed by Dan Bernstein.
+
+ Change the Connection::sendSync timeout parameter to have the NoTimeout argument as a default
+ argument and update all the call sites.
+
+ * Platform/CoreIPC/Connection.h:
+ * PluginProcess/PluginControllerProxy.cpp:
+ (WebKit::PluginControllerProxy::proxiesForURL):
+ (WebKit::PluginControllerProxy::cookiesForURL):
+ * WebProcess/InjectedBundle/InjectedBundle.cpp:
+ (WebKit::InjectedBundle::postSynchronousMessage):
+ * WebProcess/Plugins/PluginProcessConnectionManager.cpp:
+ (WebKit::PluginProcessConnectionManager::getPluginProcessConnection):
+ * WebProcess/Plugins/PluginProxy.cpp:
+ (WebKit::PluginProxy::initialize):
+ (WebKit::PluginProxy::destroy):
+ (WebKit::PluginProxy::paint):
+ (WebKit::PluginProxy::handleMouseEvent):
+ (WebKit::PluginProxy::handleWheelEvent):
+ (WebKit::PluginProxy::handleMouseEnterEvent):
+ (WebKit::PluginProxy::handleMouseLeaveEvent):
+ (WebKit::PluginProxy::handleKeyboardEvent):
+ * WebProcess/WebCoreSupport/WebChromeClient.cpp:
+ (WebKit::WebChromeClient::windowRect):
+ (WebKit::WebChromeClient::createWindow):
+ (WebKit::WebChromeClient::toolbarsVisible):
+ (WebKit::WebChromeClient::statusbarVisible):
+ (WebKit::WebChromeClient::menubarVisible):
+ (WebKit::WebChromeClient::canRunBeforeUnloadConfirmPanel):
+ (WebKit::WebChromeClient::runBeforeUnloadConfirmPanel):
+ (WebKit::WebChromeClient::runJavaScriptAlert):
+ (WebKit::WebChromeClient::runJavaScriptConfirm):
+ (WebKit::WebChromeClient::runJavaScriptPrompt):
+ * WebProcess/WebCoreSupport/WebPlatformStrategies.cpp:
+ (WebKit::WebPlatformStrategies::populatePluginCache):
+ * WebProcess/WebPage/WebBackForwardListProxy.cpp:
+ (WebKit::WebBackForwardListProxy::itemAtIndex):
+ (WebKit::WebBackForwardListProxy::backListCount):
+ (WebKit::WebBackForwardListProxy::forwardListCount):
+ * WebProcess/WebPage/WebPage.cpp:
+ (WebKit::WebPage::createPlugin):
+ (WebKit::WebPage::changeAcceleratedCompositingMode):
+ * WebProcess/WebPage/mac/LayerBackedDrawingAreaMac.mm:
+ (WebKit::LayerBackedDrawingArea::attachCompositingContext):
+ * WebProcess/WebPage/mac/WebPageMac.mm:
+ (WebKit::WebPage::interceptEditingKeyboardEvent):
+
2010-10-29 John Sullivan <sullivan at apple.com>
Reviewed by Anders Carlsson.
diff --git a/WebKit2/Platform/CoreIPC/Connection.h b/WebKit2/Platform/CoreIPC/Connection.h
index d63c234..68378eb 100644
--- a/WebKit2/Platform/CoreIPC/Connection.h
+++ b/WebKit2/Platform/CoreIPC/Connection.h
@@ -102,9 +102,9 @@ public:
static const unsigned long long NoTimeout = 10000000000ULL;
// FIXME: This variant of send is deprecated, all clients should move to the overload that takes a message.
- template<typename E, typename T, typename U> bool sendSync(E messageID, uint64_t destinationID, const T& arguments, const U& reply, double timeout);
+ template<typename E, typename T, typename U> bool sendSync(E messageID, uint64_t destinationID, const T& arguments, const U& reply, double timeout = NoTimeout);
- template<typename T> bool sendSync(const T& message, const typename T::Reply& reply, uint64_t destinationID, double timeout);
+ template<typename T> bool sendSync(const T& message, const typename T::Reply& reply, uint64_t destinationID, double timeout = NoTimeout);
template<typename E> PassOwnPtr<ArgumentDecoder> waitFor(E messageID, uint64_t destinationID, double timeout);
diff --git a/WebKit2/PluginProcess/PluginControllerProxy.cpp b/WebKit2/PluginProcess/PluginControllerProxy.cpp
index e6045f1..ec5f665 100644
--- a/WebKit2/PluginProcess/PluginControllerProxy.cpp
+++ b/WebKit2/PluginProcess/PluginControllerProxy.cpp
@@ -197,9 +197,7 @@ String PluginControllerProxy::proxiesForURL(const String& urlString)
{
String proxyString;
- if (!m_connection->connection()->sendSync(Messages::PluginProxy::CookiesForURL(urlString),
- Messages::PluginProxy::CookiesForURL::Reply(proxyString),
- m_pluginInstanceID, 0))
+ if (!m_connection->connection()->sendSync(Messages::PluginProxy::CookiesForURL(urlString), Messages::PluginProxy::CookiesForURL::Reply(proxyString), m_pluginInstanceID))
return String();
return proxyString;
@@ -209,9 +207,7 @@ String PluginControllerProxy::cookiesForURL(const String& urlString)
{
String cookieString;
- if (!m_connection->connection()->sendSync(Messages::PluginProxy::CookiesForURL(urlString),
- Messages::PluginProxy::CookiesForURL::Reply(cookieString),
- m_pluginInstanceID, 0))
+ if (!m_connection->connection()->sendSync(Messages::PluginProxy::CookiesForURL(urlString), Messages::PluginProxy::CookiesForURL::Reply(cookieString), m_pluginInstanceID))
return String();
return cookieString;
diff --git a/WebKit2/WebProcess/InjectedBundle/InjectedBundle.cpp b/WebKit2/WebProcess/InjectedBundle/InjectedBundle.cpp
index 16f972a..ec43a9a 100644
--- a/WebKit2/WebProcess/InjectedBundle/InjectedBundle.cpp
+++ b/WebKit2/WebProcess/InjectedBundle/InjectedBundle.cpp
@@ -81,10 +81,7 @@ void InjectedBundle::postSynchronousMessage(const String& messageName, APIObject
RefPtr<APIObject> returnDataTmp;
InjectedBundleUserMessageDecoder messageDecoder(returnDataTmp);
- bool succeeded = WebProcess::shared().connection()->sendSync(WebContextMessage::PostSynchronousMessage, 0,
- CoreIPC::In(messageName, InjectedBundleUserMessageEncoder(messageBody)),
- CoreIPC::Out(messageDecoder),
- CoreIPC::Connection::NoTimeout);
+ bool succeeded = WebProcess::shared().connection()->sendSync(WebContextMessage::PostSynchronousMessage, 0, CoreIPC::In(messageName, InjectedBundleUserMessageEncoder(messageBody)), CoreIPC::Out(messageDecoder));
if (!succeeded)
return;
diff --git a/WebKit2/WebProcess/Plugins/PluginProcessConnectionManager.cpp b/WebKit2/WebProcess/Plugins/PluginProcessConnectionManager.cpp
index e2524da..63ad251 100644
--- a/WebKit2/WebProcess/Plugins/PluginProcessConnectionManager.cpp
+++ b/WebKit2/WebProcess/Plugins/PluginProcessConnectionManager.cpp
@@ -61,10 +61,7 @@ PluginProcessConnection* PluginProcessConnectionManager::getPluginProcessConnect
CoreIPC::Connection::Identifier connectionIdentifier;
CoreIPC::MachPort connectionMachPort;
- if (!WebProcess::shared().connection()->sendSync(WebProcessProxyMessage::GetPluginProcessConnection, 0,
- CoreIPC::In(pluginPath),
- CoreIPC::Out(connectionMachPort),
- CoreIPC::Connection::NoTimeout))
+ if (!WebProcess::shared().connection()->sendSync(WebProcessProxyMessage::GetPluginProcessConnection, 0, CoreIPC::In(pluginPath), CoreIPC::Out(connectionMachPort)))
return 0;
connectionIdentifier = connectionMachPort.port();
diff --git a/WebKit2/WebProcess/Plugins/PluginProxy.cpp b/WebKit2/WebProcess/Plugins/PluginProxy.cpp
index 093f2e7..755c0c9 100644
--- a/WebKit2/WebProcess/Plugins/PluginProxy.cpp
+++ b/WebKit2/WebProcess/Plugins/PluginProxy.cpp
@@ -83,9 +83,7 @@ bool PluginProxy::initialize(PluginController* pluginController, const Parameter
// Ask the plug-in process to create a plug-in.
bool result = false;
- if (!m_connection->connection()->sendSync(Messages::WebProcessConnection::CreatePlugin(m_pluginInstanceID, parameters, pluginController->userAgent(), pluginController->isPrivateBrowsingEnabled()),
- Messages::WebProcessConnection::CreatePlugin::Reply(result),
- 0, CoreIPC::Connection::NoTimeout))
+ if (!m_connection->connection()->sendSync(Messages::WebProcessConnection::CreatePlugin(m_pluginInstanceID, parameters, pluginController->userAgent(), pluginController->isPrivateBrowsingEnabled()), Messages::WebProcessConnection::CreatePlugin::Reply(result), 0))
return false;
if (!result)
@@ -101,9 +99,7 @@ void PluginProxy::destroy()
{
ASSERT(m_isStarted);
- m_connection->connection()->sendSync(Messages::WebProcessConnection::DestroyPlugin(m_pluginInstanceID),
- Messages::WebProcessConnection::DestroyPlugin::Reply(),
- 0, CoreIPC::Connection::NoTimeout);
+ m_connection->connection()->sendSync(Messages::WebProcessConnection::DestroyPlugin(m_pluginInstanceID), Messages::WebProcessConnection::DestroyPlugin::Reply(), 0);
m_isStarted = false;
m_connection->removePluginProxy(this);
@@ -115,7 +111,7 @@ void PluginProxy::paint(GraphicsContext* graphicsContext, const IntRect& dirtyRe
return;
if (!m_pluginBackingStoreContainsValidData) {
- m_connection->connection()->sendSync(Messages::PluginControllerProxy::PaintEntirePlugin(), Messages::PluginControllerProxy::PaintEntirePlugin::Reply(), m_pluginInstanceID, CoreIPC::Connection::NoTimeout);
+ m_connection->connection()->sendSync(Messages::PluginControllerProxy::PaintEntirePlugin(), Messages::PluginControllerProxy::PaintEntirePlugin::Reply(), m_pluginInstanceID);
// Blit the plug-in backing store into our own backing store.
OwnPtr<WebCore::GraphicsContext> graphicsContext = m_backingStore->createGraphicsContext();
@@ -246,9 +242,7 @@ void PluginProxy::manualStreamDidFail(bool wasCancelled)
bool PluginProxy::handleMouseEvent(const WebMouseEvent& mouseEvent)
{
bool handled = false;
- if (!m_connection->connection()->sendSync(Messages::PluginControllerProxy::HandleMouseEvent(mouseEvent),
- Messages::PluginControllerProxy::HandleMouseEvent::Reply(handled),
- m_pluginInstanceID, CoreIPC::Connection::NoTimeout))
+ if (!m_connection->connection()->sendSync(Messages::PluginControllerProxy::HandleMouseEvent(mouseEvent), Messages::PluginControllerProxy::HandleMouseEvent::Reply(handled), m_pluginInstanceID))
return false;
return handled;
@@ -257,9 +251,7 @@ bool PluginProxy::handleMouseEvent(const WebMouseEvent& mouseEvent)
bool PluginProxy::handleWheelEvent(const WebWheelEvent& wheelEvent)
{
bool handled = false;
- if (!m_connection->connection()->sendSync(Messages::PluginControllerProxy::HandleWheelEvent(wheelEvent),
- Messages::PluginControllerProxy::HandleWheelEvent::Reply(handled),
- m_pluginInstanceID, CoreIPC::Connection::NoTimeout))
+ if (!m_connection->connection()->sendSync(Messages::PluginControllerProxy::HandleWheelEvent(wheelEvent), Messages::PluginControllerProxy::HandleWheelEvent::Reply(handled), m_pluginInstanceID))
return false;
return handled;
@@ -268,9 +260,7 @@ bool PluginProxy::handleWheelEvent(const WebWheelEvent& wheelEvent)
bool PluginProxy::handleMouseEnterEvent(const WebMouseEvent& mouseEnterEvent)
{
bool handled = false;
- if (!m_connection->connection()->sendSync(Messages::PluginControllerProxy::HandleMouseEnterEvent(mouseEnterEvent),
- Messages::PluginControllerProxy::HandleMouseEnterEvent::Reply(handled),
- m_pluginInstanceID, CoreIPC::Connection::NoTimeout))
+ if (!m_connection->connection()->sendSync(Messages::PluginControllerProxy::HandleMouseEnterEvent(mouseEnterEvent), Messages::PluginControllerProxy::HandleMouseEnterEvent::Reply(handled), m_pluginInstanceID))
return false;
return handled;
@@ -279,9 +269,7 @@ bool PluginProxy::handleMouseEnterEvent(const WebMouseEvent& mouseEnterEvent)
bool PluginProxy::handleMouseLeaveEvent(const WebMouseEvent& mouseLeaveEvent)
{
bool handled = false;
- if (!m_connection->connection()->sendSync(Messages::PluginControllerProxy::HandleMouseLeaveEvent(mouseLeaveEvent),
- Messages::PluginControllerProxy::HandleMouseLeaveEvent::Reply(handled),
- m_pluginInstanceID, CoreIPC::Connection::NoTimeout))
+ if (!m_connection->connection()->sendSync(Messages::PluginControllerProxy::HandleMouseLeaveEvent(mouseLeaveEvent), Messages::PluginControllerProxy::HandleMouseLeaveEvent::Reply(handled), m_pluginInstanceID))
return false;
return handled;
@@ -290,9 +278,7 @@ bool PluginProxy::handleMouseLeaveEvent(const WebMouseEvent& mouseLeaveEvent)
bool PluginProxy::handleKeyboardEvent(const WebKeyboardEvent& keyboardEvent)
{
bool handled = false;
- if (!m_connection->connection()->sendSync(Messages::PluginControllerProxy::HandleKeyboardEvent(keyboardEvent),
- Messages::PluginControllerProxy::HandleKeyboardEvent::Reply(handled),
- m_pluginInstanceID, CoreIPC::Connection::NoTimeout))
+ if (!m_connection->connection()->sendSync(Messages::PluginControllerProxy::HandleKeyboardEvent(keyboardEvent), Messages::PluginControllerProxy::HandleKeyboardEvent::Reply(handled), m_pluginInstanceID))
return false;
return handled;
diff --git a/WebKit2/WebProcess/WebCoreSupport/WebChromeClient.cpp b/WebKit2/WebProcess/WebCoreSupport/WebChromeClient.cpp
index edd362f..c86962f 100644
--- a/WebKit2/WebProcess/WebCoreSupport/WebChromeClient.cpp
+++ b/WebKit2/WebProcess/WebCoreSupport/WebChromeClient.cpp
@@ -66,9 +66,7 @@ FloatRect WebChromeClient::windowRect()
{
FloatRect newWindowFrame;
- if (!WebProcess::shared().connection()->sendSync(Messages::WebPageProxy::GetWindowFrame(),
- Messages::WebPageProxy::GetWindowFrame::Reply(newWindowFrame),
- m_page->pageID(), CoreIPC::Connection::NoTimeout))
+ if (!WebProcess::shared().connection()->sendSync(Messages::WebPageProxy::GetWindowFrame(), Messages::WebPageProxy::GetWindowFrame::Reply(newWindowFrame), m_page->pageID()))
return FloatRect();
return newWindowFrame;
@@ -119,11 +117,8 @@ Page* WebChromeClient::createWindow(Frame*, const FrameLoadRequest&, const Windo
uint64_t newPageID = 0;
WebPageCreationParameters parameters;
- if (!WebProcess::shared().connection()->sendSync(Messages::WebPageProxy::CreateNewPage(windowFeatures, modifiers, mouseButton),
- Messages::WebPageProxy::CreateNewPage::Reply(newPageID, parameters),
- m_page->pageID(), CoreIPC::Connection::NoTimeout)) {
+ if (!WebProcess::shared().connection()->sendSync(Messages::WebPageProxy::CreateNewPage(windowFeatures, modifiers, mouseButton), Messages::WebPageProxy::CreateNewPage::Reply(newPageID, parameters), m_page->pageID()))
return 0;
- }
if (!newPageID)
return 0;
@@ -156,9 +151,7 @@ void WebChromeClient::setToolbarsVisible(bool toolbarsAreVisible)
bool WebChromeClient::toolbarsVisible()
{
bool toolbarsAreVisible = true;
- if (!WebProcess::shared().connection()->sendSync(Messages::WebPageProxy::GetToolbarsAreVisible(),
- Messages::WebPageProxy::GetToolbarsAreVisible::Reply(toolbarsAreVisible),
- m_page->pageID(), CoreIPC::Connection::NoTimeout))
+ if (!WebProcess::shared().connection()->sendSync(Messages::WebPageProxy::GetToolbarsAreVisible(), Messages::WebPageProxy::GetToolbarsAreVisible::Reply(toolbarsAreVisible), m_page->pageID()))
return true;
return toolbarsAreVisible;
@@ -172,9 +165,7 @@ void WebChromeClient::setStatusbarVisible(bool statusBarIsVisible)
bool WebChromeClient::statusbarVisible()
{
bool statusBarIsVisible = true;
- if (!WebProcess::shared().connection()->sendSync(Messages::WebPageProxy::GetStatusBarIsVisible(),
- Messages::WebPageProxy::GetStatusBarIsVisible::Reply(statusBarIsVisible),
- m_page->pageID(), CoreIPC::Connection::NoTimeout))
+ if (!WebProcess::shared().connection()->sendSync(Messages::WebPageProxy::GetStatusBarIsVisible(), Messages::WebPageProxy::GetStatusBarIsVisible::Reply(statusBarIsVisible), m_page->pageID()))
return true;
return statusBarIsVisible;
@@ -199,9 +190,7 @@ void WebChromeClient::setMenubarVisible(bool menuBarVisible)
bool WebChromeClient::menubarVisible()
{
bool menuBarIsVisible = true;
- if (!WebProcess::shared().connection()->sendSync(Messages::WebPageProxy::GetMenuBarIsVisible(),
- Messages::WebPageProxy::GetMenuBarIsVisible::Reply(menuBarIsVisible),
- m_page->pageID(), CoreIPC::Connection::NoTimeout))
+ if (!WebProcess::shared().connection()->sendSync(Messages::WebPageProxy::GetMenuBarIsVisible(), Messages::WebPageProxy::GetMenuBarIsVisible::Reply(menuBarIsVisible), m_page->pageID()))
return true;
return menuBarIsVisible;
@@ -223,9 +212,7 @@ void WebChromeClient::addMessageToConsole(MessageSource, MessageType, MessageLev
bool WebChromeClient::canRunBeforeUnloadConfirmPanel()
{
bool canRun = false;
- if (!WebProcess::shared().connection()->sendSync(Messages::WebPageProxy::CanRunBeforeUnloadConfirmPanel(),
- Messages::WebPageProxy::CanRunBeforeUnloadConfirmPanel::Reply(canRun),
- m_page->pageID(), CoreIPC::Connection::NoTimeout))
+ if (!WebProcess::shared().connection()->sendSync(Messages::WebPageProxy::CanRunBeforeUnloadConfirmPanel(), Messages::WebPageProxy::CanRunBeforeUnloadConfirmPanel::Reply(canRun), m_page->pageID()))
return false;
return canRun;
@@ -236,9 +223,7 @@ bool WebChromeClient::runBeforeUnloadConfirmPanel(const String& message, Frame*
WebFrame* webFrame = static_cast<WebFrameLoaderClient*>(frame->loader()->client())->webFrame();
bool shouldClose = false;
- if (!WebProcess::shared().connection()->sendSync(Messages::WebPageProxy::RunBeforeUnloadConfirmPanel(message, webFrame->frameID()),
- Messages::WebPageProxy::RunBeforeUnloadConfirmPanel::Reply(shouldClose),
- m_page->pageID(), CoreIPC::Connection::NoTimeout))
+ if (!WebProcess::shared().connection()->sendSync(Messages::WebPageProxy::RunBeforeUnloadConfirmPanel(message, webFrame->frameID()), Messages::WebPageProxy::RunBeforeUnloadConfirmPanel::Reply(shouldClose), m_page->pageID()))
return false;
return shouldClose;
@@ -270,8 +255,7 @@ void WebChromeClient::runJavaScriptAlert(Frame* frame, const String& alertText)
// Notify the bundle client.
m_page->injectedBundleUIClient().willRunJavaScriptAlert(m_page, alertText, webFrame);
- WebProcess::shared().connection()->sendSync(Messages::WebPageProxy::RunJavaScriptAlert(webFrame->frameID(), alertText),
- Messages::WebPageProxy::RunJavaScriptAlert::Reply(), m_page->pageID(), CoreIPC::Connection::NoTimeout);
+ WebProcess::shared().connection()->sendSync(Messages::WebPageProxy::RunJavaScriptAlert(webFrame->frameID(), alertText), Messages::WebPageProxy::RunJavaScriptAlert::Reply(), m_page->pageID());
}
bool WebChromeClient::runJavaScriptConfirm(Frame* frame, const String& message)
@@ -282,8 +266,7 @@ bool WebChromeClient::runJavaScriptConfirm(Frame* frame, const String& message)
m_page->injectedBundleUIClient().willRunJavaScriptConfirm(m_page, message, webFrame);
bool result = false;
- if (!WebProcess::shared().connection()->sendSync(Messages::WebPageProxy::RunJavaScriptConfirm(webFrame->frameID(), message),
- Messages::WebPageProxy::RunJavaScriptConfirm::Reply(result), m_page->pageID(), CoreIPC::Connection::NoTimeout))
+ if (!WebProcess::shared().connection()->sendSync(Messages::WebPageProxy::RunJavaScriptConfirm(webFrame->frameID(), message), Messages::WebPageProxy::RunJavaScriptConfirm::Reply(result), m_page->pageID()))
return false;
return result;
@@ -296,8 +279,7 @@ bool WebChromeClient::runJavaScriptPrompt(Frame* frame, const String& message, c
// Notify the bundle client.
m_page->injectedBundleUIClient().willRunJavaScriptPrompt(m_page, message, defaultValue, webFrame);
- if (!WebProcess::shared().connection()->sendSync(Messages::WebPageProxy::RunJavaScriptPrompt(webFrame->frameID(), message, defaultValue),
- Messages::WebPageProxy::RunJavaScriptPrompt::Reply(result), m_page->pageID(), CoreIPC::Connection::NoTimeout))
+ if (!WebProcess::shared().connection()->sendSync(Messages::WebPageProxy::RunJavaScriptPrompt(webFrame->frameID(), message, defaultValue), Messages::WebPageProxy::RunJavaScriptPrompt::Reply(result), m_page->pageID()))
return false;
return !result.isNull();
diff --git a/WebKit2/WebProcess/WebCoreSupport/WebPlatformStrategies.cpp b/WebKit2/WebProcess/WebCoreSupport/WebPlatformStrategies.cpp
index 4c204cd..3edaf82 100644
--- a/WebKit2/WebProcess/WebCoreSupport/WebPlatformStrategies.cpp
+++ b/WebKit2/WebProcess/WebCoreSupport/WebPlatformStrategies.cpp
@@ -86,7 +86,7 @@ void WebPlatformStrategies::populatePluginCache()
Vector<PluginInfo> plugins;
// FIXME: Should we do something in case of error here?
- WebProcess::shared().connection()->sendSync(WebProcessProxyMessage::GetPlugins, 0, CoreIPC::In(m_shouldRefreshPlugins), CoreIPC::Out(plugins), CoreIPC::Connection::NoTimeout);
+ WebProcess::shared().connection()->sendSync(WebProcessProxyMessage::GetPlugins, 0, CoreIPC::In(m_shouldRefreshPlugins), CoreIPC::Out(plugins));
m_cachedPlugins.swap(plugins);
m_shouldRefreshPlugins = false;
diff --git a/WebKit2/WebProcess/WebPage/WebBackForwardListProxy.cpp b/WebKit2/WebProcess/WebPage/WebBackForwardListProxy.cpp
index 3b02fd1..a5bd862 100644
--- a/WebKit2/WebProcess/WebPage/WebBackForwardListProxy.cpp
+++ b/WebKit2/WebProcess/WebPage/WebBackForwardListProxy.cpp
@@ -131,11 +131,8 @@ HistoryItem* WebBackForwardListProxy::itemAtIndex(int itemIndex)
return 0;
uint64_t itemID = 0;
- if (!WebProcess::shared().connection()->sendSync(Messages::WebPageProxy::BackForwardItemAtIndex(itemIndex),
- Messages::WebPageProxy::BackForwardItemAtIndex::Reply(itemID),
- m_page->pageID(), CoreIPC::Connection::NoTimeout)) {
+ if (!WebProcess::shared().connection()->sendSync(Messages::WebPageProxy::BackForwardItemAtIndex(itemIndex), Messages::WebPageProxy::BackForwardItemAtIndex::Reply(itemID), m_page->pageID()))
return 0;
- }
if (!itemID)
return 0;
@@ -150,11 +147,8 @@ int WebBackForwardListProxy::backListCount()
return 0;
int backListCount = 0;
- if (!WebProcess::shared().connection()->sendSync(Messages::WebPageProxy::BackForwardBackListCount(),
- Messages::WebPageProxy::BackForwardBackListCount::Reply(backListCount),
- m_page->pageID(), CoreIPC::Connection::NoTimeout)) {
+ if (!WebProcess::shared().connection()->sendSync(Messages::WebPageProxy::BackForwardBackListCount(), Messages::WebPageProxy::BackForwardBackListCount::Reply(backListCount), m_page->pageID()))
return 0;
- }
return backListCount;
}
@@ -165,11 +159,8 @@ int WebBackForwardListProxy::forwardListCount()
return 0;
int forwardListCount = 0;
- if (!WebProcess::shared().connection()->sendSync(Messages::WebPageProxy::BackForwardForwardListCount(),
- Messages::WebPageProxy::BackForwardForwardListCount::Reply(forwardListCount),
- m_page->pageID(), CoreIPC::Connection::NoTimeout)) {
+ if (!WebProcess::shared().connection()->sendSync(Messages::WebPageProxy::BackForwardForwardListCount(), Messages::WebPageProxy::BackForwardForwardListCount::Reply(forwardListCount), m_page->pageID()))
return 0;
- }
return forwardListCount;
}
diff --git a/WebKit2/WebProcess/WebPage/WebPage.cpp b/WebKit2/WebProcess/WebPage/WebPage.cpp
index 2a231b7..5e53a93 100644
--- a/WebKit2/WebProcess/WebPage/WebPage.cpp
+++ b/WebKit2/WebProcess/WebPage/WebPage.cpp
@@ -179,9 +179,7 @@ PassRefPtr<Plugin> WebPage::createPlugin(const Plugin::Parameters& parameters)
if (!WebProcess::shared().connection()->sendSync(WebProcessProxyMessage::GetPluginPath, 0,
CoreIPC::In(parameters.mimeType, parameters.url.string()),
- CoreIPC::Out(pluginPath),
- CoreIPC::Connection::NoTimeout))
- return 0;
+ CoreIPC::Out(pluginPath)))
if (pluginPath.isNull())
return 0;
@@ -242,9 +240,7 @@ void WebPage::changeAcceleratedCompositingMode(WebCore::GraphicsLayer* layer)
// drawing area types.
DrawingArea::DrawingAreaInfo newDrawingAreaInfo;
- WebProcess::shared().connection()->sendSync(Messages::WebPageProxy::DidChangeAcceleratedCompositing(compositing),
- Messages::WebPageProxy::DidChangeAcceleratedCompositing::Reply(newDrawingAreaInfo),
- m_pageID, CoreIPC::Connection::NoTimeout);
+ WebProcess::shared().connection()->sendSync(Messages::WebPageProxy::DidChangeAcceleratedCompositing(compositing), Messages::WebPageProxy::DidChangeAcceleratedCompositing::Reply(newDrawingAreaInfo), m_pageID);
if (newDrawingAreaInfo.type != drawingArea()->info().type) {
m_drawingArea = 0;
diff --git a/WebKit2/WebProcess/WebPage/mac/LayerBackedDrawingAreaMac.mm b/WebKit2/WebProcess/WebPage/mac/LayerBackedDrawingAreaMac.mm
index abe9ee1..e935a5f 100644
--- a/WebKit2/WebProcess/WebPage/mac/LayerBackedDrawingAreaMac.mm
+++ b/WebKit2/WebProcess/WebPage/mac/LayerBackedDrawingAreaMac.mm
@@ -80,7 +80,7 @@ void LayerBackedDrawingArea::attachCompositingContext()
WKCARemoteLayerClientSetLayer(m_remoteLayerRef.get(), m_backingLayer->platformLayer());
uint32_t contextID = WKCARemoteLayerClientGetClientId(m_remoteLayerRef.get());
- WebProcess::shared().connection()->sendSync(DrawingAreaProxyMessage::AttachCompositingContext, m_webPage->pageID(), CoreIPC::In(contextID), CoreIPC::Out(), CoreIPC::Connection::NoTimeout);
+ WebProcess::shared().connection()->sendSync(DrawingAreaProxyMessage::AttachCompositingContext, m_webPage->pageID(), CoreIPC::In(contextID), CoreIPC::Out());
#endif
}
diff --git a/WebKit2/WebProcess/WebPage/mac/WebPageMac.mm b/WebKit2/WebProcess/WebPage/mac/WebPageMac.mm
index 556dc31..90c088b 100644
--- a/WebKit2/WebProcess/WebPage/mac/WebPageMac.mm
+++ b/WebKit2/WebProcess/WebPage/mac/WebPageMac.mm
@@ -68,9 +68,7 @@ bool WebPage::interceptEditingKeyboardEvent(KeyboardEvent* evt, bool shouldSaveC
if (shouldSaveCommand && !hasKeypressCommand) {
Vector<KeypressCommand> commandsList;
- if (!WebProcess::shared().connection()->sendSync(Messages::WebPageProxy::InterpretKeyEvent(keyEvent->type()),
- Messages::WebPageProxy::InterpretKeyEvent::Reply(commandsList),
- m_pageID, CoreIPC::Connection::NoTimeout))
+ if (!WebProcess::shared().connection()->sendSync(Messages::WebPageProxy::InterpretKeyEvent(keyEvent->type()), Messages::WebPageProxy::InterpretKeyEvent::Reply(commandsList), m_pageID))
return false;
for (size_t i = 0; i < commandsList.size(); i++)
evt->keypressCommands().append(commandsList[i]);
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list