<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[160508] trunk/Source/WebKit2</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://trac.webkit.org/projects/webkit/changeset/160508">160508</a></dd>
<dt>Author</dt> <dd>andersca@apple.com</dd>
<dt>Date</dt> <dd>2013-12-12 15:12:38 -0800 (Thu, 12 Dec 2013)</dd>
</dl>
<h3>Log Message</h3>
<pre>WebPageProxy should be a MessageSender
https://bugs.webkit.org/show_bug.cgi?id=125654
Reviewed by Sam Weinig.
* Platform/CoreIPC/MessageSender.cpp:
(CoreIPC::MessageSender::sendMessage):
* Platform/CoreIPC/MessageSender.h:
(CoreIPC::MessageSender::send):
* Shared/ChildProcessProxy.h:
* Shared/WebConnection.cpp:
(WebKit::WebConnection::postMessage):
* UIProcess/WebPageProxy.cpp:
(WebKit::WebPageProxy::initializeWebPage):
(WebKit::WebPageProxy::sendMessage):
(WebKit::WebPageProxy::messageSenderConnection):
(WebKit::WebPageProxy::messageSenderDestinationID):
* UIProcess/WebPageProxy.h:</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebKit2ChangeLog">trunk/Source/WebKit2/ChangeLog</a></li>
<li><a href="#trunkSourceWebKit2PlatformCoreIPCMessageSendercpp">trunk/Source/WebKit2/Platform/CoreIPC/MessageSender.cpp</a></li>
<li><a href="#trunkSourceWebKit2PlatformCoreIPCMessageSenderh">trunk/Source/WebKit2/Platform/CoreIPC/MessageSender.h</a></li>
<li><a href="#trunkSourceWebKit2SharedChildProcessProxyh">trunk/Source/WebKit2/Shared/ChildProcessProxy.h</a></li>
<li><a href="#trunkSourceWebKit2SharedWebConnectioncpp">trunk/Source/WebKit2/Shared/WebConnection.cpp</a></li>
<li><a href="#trunkSourceWebKit2UIProcessWebPageProxycpp">trunk/Source/WebKit2/UIProcess/WebPageProxy.cpp</a></li>
<li><a href="#trunkSourceWebKit2UIProcessWebPageProxyh">trunk/Source/WebKit2/UIProcess/WebPageProxy.h</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/ChangeLog (160507 => 160508)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/ChangeLog 2013-12-12 22:55:22 UTC (rev 160507)
+++ trunk/Source/WebKit2/ChangeLog 2013-12-12 23:12:38 UTC (rev 160508)
</span><span class="lines">@@ -1,5 +1,26 @@
</span><span class="cx"> 2013-12-12 Anders Carlsson <andersca@apple.com>
</span><span class="cx">
</span><ins>+ WebPageProxy should be a MessageSender
+ https://bugs.webkit.org/show_bug.cgi?id=125654
+
+ Reviewed by Sam Weinig.
+
+ * Platform/CoreIPC/MessageSender.cpp:
+ (CoreIPC::MessageSender::sendMessage):
+ * Platform/CoreIPC/MessageSender.h:
+ (CoreIPC::MessageSender::send):
+ * Shared/ChildProcessProxy.h:
+ * Shared/WebConnection.cpp:
+ (WebKit::WebConnection::postMessage):
+ * UIProcess/WebPageProxy.cpp:
+ (WebKit::WebPageProxy::initializeWebPage):
+ (WebKit::WebPageProxy::sendMessage):
+ (WebKit::WebPageProxy::messageSenderConnection):
+ (WebKit::WebPageProxy::messageSenderDestinationID):
+ * UIProcess/WebPageProxy.h:
+
+2013-12-12 Anders Carlsson <andersca@apple.com>
+
</ins><span class="cx"> Clean up dictionary handling a little
</span><span class="cx"> https://bugs.webkit.org/show_bug.cgi?id=125644
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKit2PlatformCoreIPCMessageSendercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/Platform/CoreIPC/MessageSender.cpp (160507 => 160508)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/Platform/CoreIPC/MessageSender.cpp 2013-12-12 22:55:22 UTC (rev 160507)
+++ trunk/Source/WebKit2/Platform/CoreIPC/MessageSender.cpp 2013-12-12 23:12:38 UTC (rev 160508)
</span><span class="lines">@@ -32,11 +32,11 @@
</span><span class="cx"> {
</span><span class="cx"> }
</span><span class="cx">
</span><del>-bool MessageSender::sendMessage(std::unique_ptr<MessageEncoder> encoder)
</del><ins>+bool MessageSender::sendMessage(std::unique_ptr<MessageEncoder> encoder, unsigned messageSendFlags)
</ins><span class="cx"> {
</span><span class="cx"> ASSERT(messageSenderConnection());
</span><span class="cx">
</span><del>- return messageSenderConnection()->sendMessage(std::move(encoder));
</del><ins>+ return messageSenderConnection()->sendMessage(std::move(encoder), messageSendFlags);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> } // namespace CoreIPC
</span></span></pre></div>
<a id="trunkSourceWebKit2PlatformCoreIPCMessageSenderh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/Platform/CoreIPC/MessageSender.h (160507 => 160508)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/Platform/CoreIPC/MessageSender.h 2013-12-12 22:55:22 UTC (rev 160507)
+++ trunk/Source/WebKit2/Platform/CoreIPC/MessageSender.h 2013-12-12 23:12:38 UTC (rev 160508)
</span><span class="lines">@@ -37,17 +37,17 @@
</span><span class="cx">
</span><span class="cx"> template<typename U> bool send(const U& message)
</span><span class="cx"> {
</span><del>- return send(message, messageSenderDestinationID());
</del><ins>+ return send(message, messageSenderDestinationID(), 0);
</ins><span class="cx"> }
</span><span class="cx">
</span><del>- template<typename U> bool send(const U& message, uint64_t destinationID)
</del><ins>+ template<typename U> bool send(const U& message, uint64_t destinationID, unsigned messageSendFlags = 0)
</ins><span class="cx"> {
</span><span class="cx"> static_assert(!U::isSync, "Message is sync!");
</span><span class="cx">
</span><span class="cx"> auto encoder = std::make_unique<MessageEncoder>(U::receiverName(), U::name(), destinationID);
</span><span class="cx"> encoder->encode(message.arguments());
</span><span class="cx">
</span><del>- return sendMessage(std::move(encoder));
</del><ins>+ return sendMessage(std::move(encoder), messageSendFlags);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> template<typename T>
</span><span class="lines">@@ -66,7 +66,7 @@
</span><span class="cx"> return messageSenderConnection()->sendSync(std::move(message), std::move(reply), destinationID, timeout, syncSendFlags);
</span><span class="cx"> }
</span><span class="cx">
</span><del>- bool sendMessage(std::unique_ptr<MessageEncoder>);
</del><ins>+ virtual bool sendMessage(std::unique_ptr<MessageEncoder>, unsigned messageSendFlags);
</ins><span class="cx">
</span><span class="cx"> private:
</span><span class="cx"> virtual Connection* messageSenderConnection() = 0;
</span></span></pre></div>
<a id="trunkSourceWebKit2SharedChildProcessProxyh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/Shared/ChildProcessProxy.h (160507 => 160508)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/Shared/ChildProcessProxy.h 2013-12-12 22:55:22 UTC (rev 160507)
+++ trunk/Source/WebKit2/Shared/ChildProcessProxy.h 2013-12-12 23:12:38 UTC (rev 160508)
</span><span class="lines">@@ -66,6 +66,8 @@
</span><span class="cx">
</span><span class="cx"> PlatformProcessIdentifier processIdentifier() const { return m_processLauncher->processIdentifier(); }
</span><span class="cx">
</span><ins>+ bool sendMessage(std::unique_ptr<CoreIPC::MessageEncoder>, unsigned messageSendFlags);
+
</ins><span class="cx"> protected:
</span><span class="cx"> void clearConnection();
</span><span class="cx"> void abortProcessLaunchIfNeeded();
</span><span class="lines">@@ -81,8 +83,6 @@
</span><span class="cx"> virtual void connectionWillOpen(CoreIPC::Connection*);
</span><span class="cx"> virtual void connectionWillClose(CoreIPC::Connection*);
</span><span class="cx">
</span><del>- bool sendMessage(std::unique_ptr<CoreIPC::MessageEncoder>, unsigned messageSendFlags);
-
</del><span class="cx"> Vector<std::pair<std::unique_ptr<CoreIPC::MessageEncoder>, unsigned>> m_pendingMessages;
</span><span class="cx"> RefPtr<ProcessLauncher> m_processLauncher;
</span><span class="cx"> RefPtr<CoreIPC::Connection> m_connection;
</span></span></pre></div>
<a id="trunkSourceWebKit2SharedWebConnectioncpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/Shared/WebConnection.cpp (160507 => 160508)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/Shared/WebConnection.cpp 2013-12-12 22:55:22 UTC (rev 160507)
+++ trunk/Source/WebKit2/Shared/WebConnection.cpp 2013-12-12 23:12:38 UTC (rev 160508)
</span><span class="lines">@@ -55,7 +55,7 @@
</span><span class="cx"> encoder->encode(messageName);
</span><span class="cx"> encodeMessageBody(*encoder, messageBody);
</span><span class="cx">
</span><del>- sendMessage(std::move(encoder));
</del><ins>+ sendMessage(std::move(encoder), 0);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void WebConnection::didClose()
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessWebPageProxycpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/WebPageProxy.cpp (160507 => 160508)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/WebPageProxy.cpp 2013-12-12 22:55:22 UTC (rev 160507)
+++ trunk/Source/WebKit2/UIProcess/WebPageProxy.cpp 2013-12-12 23:12:38 UTC (rev 160508)
</span><span class="lines">@@ -525,13 +525,13 @@
</span><span class="cx"> process().send(Messages::WebProcess::CreateWebPage(m_pageID, m_creationParameters), 0);
</span><span class="cx">
</span><span class="cx"> #if ENABLE(PAGE_VISIBILITY_API)
</span><del>- process().send(Messages::WebPage::SetVisibilityState(m_visibilityState, /* isInitialState */ true), m_pageID);
</del><ins>+ send(Messages::WebPage::SetVisibilityState(m_visibilityState, /* isInitialState */ true));
</ins><span class="cx"> #elif ENABLE(HIDDEN_PAGE_DOM_TIMER_THROTTLING)
</span><del>- process().send(Messages::WebPage::SetVisibilityState(isViewVisible() ? PageVisibilityStateVisible : PageVisibilityStateHidden, /* isInitialState */ true), m_pageID);
</del><ins>+ send(Messages::WebPage::SetVisibilityState(isViewVisible() ? PageVisibilityStateVisible : PageVisibilityStateHidden, /* isInitialState */ true));
</ins><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> #if PLATFORM(MAC)
</span><del>- process().send(Messages::WebPage::SetSmartInsertDeleteEnabled(m_isSmartInsertDeleteEnabled), m_pageID);
</del><ins>+ send(Messages::WebPage::SetSmartInsertDeleteEnabled(m_isSmartInsertDeleteEnabled));
</ins><span class="cx"> #endif
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -3092,6 +3092,21 @@
</span><span class="cx"> m_findClient.didFailToFindString(this, string);
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+bool WebPageProxy::sendMessage(std::unique_ptr<CoreIPC::MessageEncoder> encoder, unsigned messageSendFlags)
+{
+ return m_process->sendMessage(std::move(encoder), messageSendFlags);
+}
+
+CoreIPC::Connection* WebPageProxy::messageSenderConnection()
+{
+ return m_process->connection();
+}
+
+uint64_t WebPageProxy::messageSenderDestinationID()
+{
+ return m_pageID;
+}
+
</ins><span class="cx"> void WebPageProxy::valueChangedForPopupMenu(WebPopupMenuProxy*, int32_t newSelectedIndex)
</span><span class="cx"> {
</span><span class="cx"> m_process->send(Messages::WebPage::DidChangeSelectedIndexForActivePopupMenu(newSelectedIndex), m_pageID);
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessWebPageProxyh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/WebPageProxy.h (160507 => 160508)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/WebPageProxy.h 2013-12-12 22:55:22 UTC (rev 160507)
+++ trunk/Source/WebKit2/UIProcess/WebPageProxy.h 2013-12-12 23:12:38 UTC (rev 160508)
</span><span class="lines">@@ -34,6 +34,7 @@
</span><span class="cx"> #include "EditorState.h"
</span><span class="cx"> #include "GeolocationPermissionRequestManagerProxy.h"
</span><span class="cx"> #include "LayerTreeContext.h"
</span><ins>+#include "MessageSender.h"
</ins><span class="cx"> #include "NotificationPermissionRequestManagerProxy.h"
</span><span class="cx"> #include "PageLoadState.h"
</span><span class="cx"> #include "PlatformProcessIdentifier.h"
</span><span class="lines">@@ -313,13 +314,13 @@
</span><span class="cx"> };
</span><span class="cx"> #endif
</span><span class="cx">
</span><del>-class WebPageProxy
- : public API::ObjectImpl<API::Object::Type::Page>
</del><ins>+class WebPageProxy : public API::ObjectImpl<API::Object::Type::Page>
</ins><span class="cx"> #if ENABLE(INPUT_TYPE_COLOR)
</span><span class="cx"> , public WebColorPicker::Client
</span><span class="cx"> #endif
</span><span class="cx"> , public WebPopupMenuProxy::Client
</span><del>- , public CoreIPC::MessageReceiver {
</del><ins>+ , public CoreIPC::MessageReceiver
+ , public CoreIPC::MessageSender {
</ins><span class="cx"> public:
</span><span class="cx">
</span><span class="cx"> static PassRefPtr<WebPageProxy> create(PageClient&, WebProcessProxy&, WebPageGroup&, uint64_t pageID);
</span><span class="lines">@@ -863,6 +864,11 @@
</span><span class="cx"> virtual void didReceiveMessage(CoreIPC::Connection*, CoreIPC::MessageDecoder&) OVERRIDE;
</span><span class="cx"> virtual void didReceiveSyncMessage(CoreIPC::Connection*, CoreIPC::MessageDecoder&, std::unique_ptr<CoreIPC::MessageEncoder>&) OVERRIDE;
</span><span class="cx">
</span><ins>+ // CoreIPC::MessageSender
+ virtual bool sendMessage(std::unique_ptr<CoreIPC::MessageEncoder>, unsigned messageSendFlags) OVERRIDE;
+ virtual CoreIPC::Connection* messageSenderConnection() OVERRIDE;
+ virtual uint64_t messageSenderDestinationID() OVERRIDE;
+
</ins><span class="cx"> // WebPopupMenuProxy::Client
</span><span class="cx"> virtual void valueChangedForPopupMenu(WebPopupMenuProxy*, int32_t newSelectedIndex);
</span><span class="cx"> virtual void setTextFromItemForPopupMenu(WebPopupMenuProxy*, int32_t index);
</span></span></pre>
</div>
</div>
</body>
</html>