<!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>[164171] 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/164171">164171</a></dd>
<dt>Author</dt> <dd>commit-queue@webkit.org</dd>
<dt>Date</dt> <dd>2014-02-15 01:28:01 -0800 (Sat, 15 Feb 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>messages.py doesn't handle parameters with more than one level of scope.
https://bugs.webkit.org/show_bug.cgi?id=128573
Patch by Jeremy Jones <jeremyj@apple.com> on 2014-02-15
Reviewed by Simon Fraser.
Support .messages.in header include generation for parameter types with more than 1 level of scope.
Add a test case and update expected results.
* Scripts/webkit2/LegacyMessageReceiver-expected.cpp:
(WebKit::WebPage::didReceiveWebPageMessage):
* Scripts/webkit2/LegacyMessages-expected.h:
(Messages::WebPage::SetVideoLayerID::receiverName):
(Messages::WebPage::SetVideoLayerID::name):
(Messages::WebPage::SetVideoLayerID::SetVideoLayerID):
(Messages::WebPage::SetVideoLayerID::arguments):
* Scripts/webkit2/MessageReceiver-expected.cpp:
(WebKit::WebPage::didReceiveMessage):
* Scripts/webkit2/Messages-expected.h:
(Messages::WebPage::SetVideoLayerID::receiverName):
(Messages::WebPage::SetVideoLayerID::name):
(Messages::WebPage::SetVideoLayerID::SetVideoLayerID):
(Messages::WebPage::SetVideoLayerID::arguments):
* Scripts/webkit2/messages.py:
(headers_for_type):
* Scripts/webkit2/messages_unittest.py:
* Scripts/webkit2/test-legacy-messages.in:
* Scripts/webkit2/test-messages.in:</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebKit2ChangeLog">trunk/Source/WebKit2/ChangeLog</a></li>
<li><a href="#trunkSourceWebKit2Scriptswebkit2LegacyMessageReceiverexpectedcpp">trunk/Source/WebKit2/Scripts/webkit2/LegacyMessageReceiver-expected.cpp</a></li>
<li><a href="#trunkSourceWebKit2Scriptswebkit2LegacyMessagesexpectedh">trunk/Source/WebKit2/Scripts/webkit2/LegacyMessages-expected.h</a></li>
<li><a href="#trunkSourceWebKit2Scriptswebkit2MessageReceiverexpectedcpp">trunk/Source/WebKit2/Scripts/webkit2/MessageReceiver-expected.cpp</a></li>
<li><a href="#trunkSourceWebKit2Scriptswebkit2Messagesexpectedh">trunk/Source/WebKit2/Scripts/webkit2/Messages-expected.h</a></li>
<li><a href="#trunkSourceWebKit2Scriptswebkit2messagespy">trunk/Source/WebKit2/Scripts/webkit2/messages.py</a></li>
<li><a href="#trunkSourceWebKit2Scriptswebkit2messages_unittestpy">trunk/Source/WebKit2/Scripts/webkit2/messages_unittest.py</a></li>
<li><a href="#trunkSourceWebKit2Scriptswebkit2testlegacymessagesin">trunk/Source/WebKit2/Scripts/webkit2/test-legacy-messages.in</a></li>
<li><a href="#trunkSourceWebKit2Scriptswebkit2testmessagesin">trunk/Source/WebKit2/Scripts/webkit2/test-messages.in</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/ChangeLog (164170 => 164171)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/ChangeLog 2014-02-15 08:57:21 UTC (rev 164170)
+++ trunk/Source/WebKit2/ChangeLog 2014-02-15 09:28:01 UTC (rev 164171)
</span><span class="lines">@@ -1,3 +1,34 @@
</span><ins>+2014-02-15 Jeremy Jones <jeremyj@apple.com>
+
+ messages.py doesn't handle parameters with more than one level of scope.
+ https://bugs.webkit.org/show_bug.cgi?id=128573
+
+ Reviewed by Simon Fraser.
+
+ Support .messages.in header include generation for parameter types with more than 1 level of scope.
+
+ Add a test case and update expected results.
+
+ * Scripts/webkit2/LegacyMessageReceiver-expected.cpp:
+ (WebKit::WebPage::didReceiveWebPageMessage):
+ * Scripts/webkit2/LegacyMessages-expected.h:
+ (Messages::WebPage::SetVideoLayerID::receiverName):
+ (Messages::WebPage::SetVideoLayerID::name):
+ (Messages::WebPage::SetVideoLayerID::SetVideoLayerID):
+ (Messages::WebPage::SetVideoLayerID::arguments):
+ * Scripts/webkit2/MessageReceiver-expected.cpp:
+ (WebKit::WebPage::didReceiveMessage):
+ * Scripts/webkit2/Messages-expected.h:
+ (Messages::WebPage::SetVideoLayerID::receiverName):
+ (Messages::WebPage::SetVideoLayerID::name):
+ (Messages::WebPage::SetVideoLayerID::SetVideoLayerID):
+ (Messages::WebPage::SetVideoLayerID::arguments):
+ * Scripts/webkit2/messages.py:
+ (headers_for_type):
+ * Scripts/webkit2/messages_unittest.py:
+ * Scripts/webkit2/test-legacy-messages.in:
+ * Scripts/webkit2/test-messages.in:
+
</ins><span class="cx"> 2014-02-14 Carlos Garcia Campos <cgarcia@igalia.com>
</span><span class="cx">
</span><span class="cx"> [GTK] Fix marshaller used in WebKitWebPage::document-loaded signal
</span></span></pre></div>
<a id="trunkSourceWebKit2Scriptswebkit2LegacyMessageReceiverexpectedcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/Scripts/webkit2/LegacyMessageReceiver-expected.cpp (164170 => 164171)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/Scripts/webkit2/LegacyMessageReceiver-expected.cpp 2014-02-15 08:57:21 UTC (rev 164170)
+++ trunk/Source/WebKit2/Scripts/webkit2/LegacyMessageReceiver-expected.cpp 2014-02-15 09:28:01 UTC (rev 164171)
</span><span class="lines">@@ -45,6 +45,7 @@
</span><span class="cx"> #endif
</span><span class="cx"> #include "WebPageMessages.h"
</span><span class="cx"> #include "WebPreferencesStore.h"
</span><ins>+#include <WebCore/GraphicsLayer.h>
</ins><span class="cx"> #if PLATFORM(MAC)
</span><span class="cx"> #include <WebCore/KeyboardEvent.h>
</span><span class="cx"> #endif
</span><span class="lines">@@ -161,6 +162,10 @@
</span><span class="cx"> IPC::handleMessage<Messages::WebPage::TemplateTest>(decoder, this, &WebPage::templateTest);
</span><span class="cx"> return;
</span><span class="cx"> }
</span><ins>+ if (decoder.messageName() == Messages::WebPage::SetVideoLayerID::name()) {
+ IPC::handleMessage<Messages::WebPage::SetVideoLayerID>(decoder, this, &WebPage::setVideoLayerID);
+ return;
+ }
</ins><span class="cx"> #if PLATFORM(MAC)
</span><span class="cx"> if (decoder.messageName() == Messages::WebPage::DidCreateWebProcessConnection::name()) {
</span><span class="cx"> IPC::handleMessage<Messages::WebPage::DidCreateWebProcessConnection>(decoder, this, &WebPage::didCreateWebProcessConnection);
</span></span></pre></div>
<a id="trunkSourceWebKit2Scriptswebkit2LegacyMessagesexpectedh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/Scripts/webkit2/LegacyMessages-expected.h (164170 => 164171)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/Scripts/webkit2/LegacyMessages-expected.h 2014-02-15 08:57:21 UTC (rev 164170)
+++ trunk/Source/WebKit2/Scripts/webkit2/LegacyMessages-expected.h 2014-02-15 09:28:01 UTC (rev 164171)
</span><span class="lines">@@ -32,6 +32,7 @@
</span><span class="cx"> #include "MessageEncoder.h"
</span><span class="cx"> #include "Plugin.h"
</span><span class="cx"> #include "StringReference.h"
</span><ins>+#include <WebCore/GraphicsLayer.h>
</ins><span class="cx"> #include <WebCore/KeyboardEvent.h>
</span><span class="cx"> #include <WebCore/PluginData.h>
</span><span class="cx"> #include <utility>
</span><span class="lines">@@ -462,6 +463,28 @@
</span><span class="cx"> std::tuple<const HashMap<String, std::pair<String, uint64_t>>&> m_arguments;
</span><span class="cx"> };
</span><span class="cx">
</span><ins>+class SetVideoLayerID {
+public:
+ typedef std::tuple<WebCore::GraphicsLayer::PlatformLayerID> DecodeType;
+
+ static IPC::StringReference receiverName() { return messageReceiverName(); }
+ static IPC::StringReference name() { return IPC::StringReference("SetVideoLayerID"); }
+ static const bool isSync = false;
+
+ explicit SetVideoLayerID(const WebCore::GraphicsLayer::PlatformLayerID& videoLayerID)
+ : m_arguments(videoLayerID)
+ {
+ }
+
+ const std::tuple<const WebCore::GraphicsLayer::PlatformLayerID&> arguments() const
+ {
+ return m_arguments;
+ }
+
+private:
+ std::tuple<const WebCore::GraphicsLayer::PlatformLayerID&> m_arguments;
+};
+
</ins><span class="cx"> #if PLATFORM(MAC)
</span><span class="cx"> class DidCreateWebProcessConnection {
</span><span class="cx"> public:
</span></span></pre></div>
<a id="trunkSourceWebKit2Scriptswebkit2MessageReceiverexpectedcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/Scripts/webkit2/MessageReceiver-expected.cpp (164170 => 164171)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/Scripts/webkit2/MessageReceiver-expected.cpp 2014-02-15 08:57:21 UTC (rev 164170)
+++ trunk/Source/WebKit2/Scripts/webkit2/MessageReceiver-expected.cpp 2014-02-15 09:28:01 UTC (rev 164171)
</span><span class="lines">@@ -45,6 +45,7 @@
</span><span class="cx"> #endif
</span><span class="cx"> #include "WebPageMessages.h"
</span><span class="cx"> #include "WebPreferencesStore.h"
</span><ins>+#include <WebCore/GraphicsLayer.h>
</ins><span class="cx"> #if PLATFORM(MAC)
</span><span class="cx"> #include <WebCore/KeyboardEvent.h>
</span><span class="cx"> #endif
</span><span class="lines">@@ -161,6 +162,10 @@
</span><span class="cx"> IPC::handleMessage<Messages::WebPage::TemplateTest>(decoder, this, &WebPage::templateTest);
</span><span class="cx"> return;
</span><span class="cx"> }
</span><ins>+ if (decoder.messageName() == Messages::WebPage::SetVideoLayerID::name()) {
+ IPC::handleMessage<Messages::WebPage::SetVideoLayerID>(decoder, this, &WebPage::setVideoLayerID);
+ return;
+ }
</ins><span class="cx"> #if PLATFORM(MAC)
</span><span class="cx"> if (decoder.messageName() == Messages::WebPage::DidCreateWebProcessConnection::name()) {
</span><span class="cx"> IPC::handleMessage<Messages::WebPage::DidCreateWebProcessConnection>(decoder, this, &WebPage::didCreateWebProcessConnection);
</span></span></pre></div>
<a id="trunkSourceWebKit2Scriptswebkit2Messagesexpectedh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/Scripts/webkit2/Messages-expected.h (164170 => 164171)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/Scripts/webkit2/Messages-expected.h 2014-02-15 08:57:21 UTC (rev 164170)
+++ trunk/Source/WebKit2/Scripts/webkit2/Messages-expected.h 2014-02-15 09:28:01 UTC (rev 164171)
</span><span class="lines">@@ -32,6 +32,7 @@
</span><span class="cx"> #include "MessageEncoder.h"
</span><span class="cx"> #include "Plugin.h"
</span><span class="cx"> #include "StringReference.h"
</span><ins>+#include <WebCore/GraphicsLayer.h>
</ins><span class="cx"> #include <WebCore/KeyboardEvent.h>
</span><span class="cx"> #include <WebCore/PluginData.h>
</span><span class="cx"> #include <utility>
</span><span class="lines">@@ -462,6 +463,28 @@
</span><span class="cx"> std::tuple<const HashMap<String, std::pair<String, uint64_t>>&> m_arguments;
</span><span class="cx"> };
</span><span class="cx">
</span><ins>+class SetVideoLayerID {
+public:
+ typedef std::tuple<WebCore::GraphicsLayer::PlatformLayerID> DecodeType;
+
+ static IPC::StringReference receiverName() { return messageReceiverName(); }
+ static IPC::StringReference name() { return IPC::StringReference("SetVideoLayerID"); }
+ static const bool isSync = false;
+
+ explicit SetVideoLayerID(const WebCore::GraphicsLayer::PlatformLayerID& videoLayerID)
+ : m_arguments(videoLayerID)
+ {
+ }
+
+ const std::tuple<const WebCore::GraphicsLayer::PlatformLayerID&> arguments() const
+ {
+ return m_arguments;
+ }
+
+private:
+ std::tuple<const WebCore::GraphicsLayer::PlatformLayerID&> m_arguments;
+};
+
</ins><span class="cx"> #if PLATFORM(MAC)
</span><span class="cx"> class DidCreateWebProcessConnection {
</span><span class="cx"> public:
</span></span></pre></div>
<a id="trunkSourceWebKit2Scriptswebkit2messagespy"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/Scripts/webkit2/messages.py (164170 => 164171)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/Scripts/webkit2/messages.py 2014-02-15 08:57:21 UTC (rev 164170)
+++ trunk/Source/WebKit2/Scripts/webkit2/messages.py 2014-02-15 09:28:01 UTC (rev 164171)
</span><span class="lines">@@ -470,7 +470,7 @@
</span><span class="cx"> if split[0] == 'WebKit' or split[0] == 'IPC':
</span><span class="cx"> headers.append('"%s.h"' % split[1])
</span><span class="cx"> else:
</span><del>- headers.append('<%s/%s.h>' % tuple(split))
</del><ins>+ headers.append('<%s/%s.h>' % tuple(split[0:2]))
</ins><span class="cx">
</span><span class="cx"> return headers
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKit2Scriptswebkit2messages_unittestpy"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/Scripts/webkit2/messages_unittest.py (164170 => 164171)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/Scripts/webkit2/messages_unittest.py 2014-02-15 08:57:21 UTC (rev 164170)
+++ trunk/Source/WebKit2/Scripts/webkit2/messages_unittest.py 2014-02-15 09:28:01 UTC (rev 164171)
</span><span class="lines">@@ -201,6 +201,13 @@
</span><span class="cx"> 'conditions': (None),
</span><span class="cx"> },
</span><span class="cx"> {
</span><ins>+ 'name': 'SetVideoLayerID',
+ 'parameters': (
+ ('WebCore::GraphicsLayer::PlatformLayerID', 'videoLayerID'),
+ ),
+ 'conditions': (None),
+ },
+ {
</ins><span class="cx"> 'name': 'DidCreateWebProcessConnection',
</span><span class="cx"> 'parameters': (
</span><span class="cx"> ('IPC::MachPort', 'connectionIdentifier'),
</span></span></pre></div>
<a id="trunkSourceWebKit2Scriptswebkit2testlegacymessagesin"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/Scripts/webkit2/test-legacy-messages.in (164170 => 164171)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/Scripts/webkit2/test-legacy-messages.in 2014-02-15 08:57:21 UTC (rev 164170)
+++ trunk/Source/WebKit2/Scripts/webkit2/test-legacy-messages.in 2014-02-15 09:28:01 UTC (rev 164171)
</span><span class="lines">@@ -53,6 +53,8 @@
</span><span class="cx">
</span><span class="cx"> TemplateTest(HashMap<String, std::pair<String, uint64_t>> a)
</span><span class="cx">
</span><ins>+ SetVideoLayerID(WebCore::GraphicsLayer::PlatformLayerID videoLayerID)
+
</ins><span class="cx"> #if PLATFORM(MAC)
</span><span class="cx"> DidCreateWebProcessConnection(IPC::MachPort connectionIdentifier)
</span><span class="cx"> #endif
</span></span></pre></div>
<a id="trunkSourceWebKit2Scriptswebkit2testmessagesin"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/Scripts/webkit2/test-messages.in (164170 => 164171)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/Scripts/webkit2/test-messages.in 2014-02-15 08:57:21 UTC (rev 164170)
+++ trunk/Source/WebKit2/Scripts/webkit2/test-messages.in 2014-02-15 09:28:01 UTC (rev 164171)
</span><span class="lines">@@ -53,6 +53,8 @@
</span><span class="cx">
</span><span class="cx"> TemplateTest(HashMap<String, std::pair<String, uint64_t>> a)
</span><span class="cx">
</span><ins>+ SetVideoLayerID(WebCore::GraphicsLayer::PlatformLayerID videoLayerID)
+
</ins><span class="cx"> #if PLATFORM(MAC)
</span><span class="cx"> DidCreateWebProcessConnection(IPC::MachPort connectionIdentifier)
</span><span class="cx"> #endif
</span></span></pre>
</div>
</div>
</body>
</html>