Diff
Modified: trunk/Source/WebKit2/ChangeLog (164170 => 164171)
--- 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)
@@ -1,3 +1,34 @@
+2014-02-15 Jeremy Jones <[email protected]>
+
+ 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:
+
2014-02-14 Carlos Garcia Campos <[email protected]>
[GTK] Fix marshaller used in WebKitWebPage::document-loaded signal
Modified: trunk/Source/WebKit2/Scripts/webkit2/LegacyMessageReceiver-expected.cpp (164170 => 164171)
--- 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)
@@ -45,6 +45,7 @@
#endif
#include "WebPageMessages.h"
#include "WebPreferencesStore.h"
+#include <WebCore/GraphicsLayer.h>
#if PLATFORM(MAC)
#include <WebCore/KeyboardEvent.h>
#endif
@@ -161,6 +162,10 @@
IPC::handleMessage<Messages::WebPage::TemplateTest>(decoder, this, &WebPage::templateTest);
return;
}
+ if (decoder.messageName() == Messages::WebPage::SetVideoLayerID::name()) {
+ IPC::handleMessage<Messages::WebPage::SetVideoLayerID>(decoder, this, &WebPage::setVideoLayerID);
+ return;
+ }
#if PLATFORM(MAC)
if (decoder.messageName() == Messages::WebPage::DidCreateWebProcessConnection::name()) {
IPC::handleMessage<Messages::WebPage::DidCreateWebProcessConnection>(decoder, this, &WebPage::didCreateWebProcessConnection);
Modified: trunk/Source/WebKit2/Scripts/webkit2/LegacyMessages-expected.h (164170 => 164171)
--- 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)
@@ -32,6 +32,7 @@
#include "MessageEncoder.h"
#include "Plugin.h"
#include "StringReference.h"
+#include <WebCore/GraphicsLayer.h>
#include <WebCore/KeyboardEvent.h>
#include <WebCore/PluginData.h>
#include <utility>
@@ -462,6 +463,28 @@
std::tuple<const HashMap<String, std::pair<String, uint64_t>>&> m_arguments;
};
+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;
+};
+
#if PLATFORM(MAC)
class DidCreateWebProcessConnection {
public:
Modified: trunk/Source/WebKit2/Scripts/webkit2/MessageReceiver-expected.cpp (164170 => 164171)
--- 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)
@@ -45,6 +45,7 @@
#endif
#include "WebPageMessages.h"
#include "WebPreferencesStore.h"
+#include <WebCore/GraphicsLayer.h>
#if PLATFORM(MAC)
#include <WebCore/KeyboardEvent.h>
#endif
@@ -161,6 +162,10 @@
IPC::handleMessage<Messages::WebPage::TemplateTest>(decoder, this, &WebPage::templateTest);
return;
}
+ if (decoder.messageName() == Messages::WebPage::SetVideoLayerID::name()) {
+ IPC::handleMessage<Messages::WebPage::SetVideoLayerID>(decoder, this, &WebPage::setVideoLayerID);
+ return;
+ }
#if PLATFORM(MAC)
if (decoder.messageName() == Messages::WebPage::DidCreateWebProcessConnection::name()) {
IPC::handleMessage<Messages::WebPage::DidCreateWebProcessConnection>(decoder, this, &WebPage::didCreateWebProcessConnection);
Modified: trunk/Source/WebKit2/Scripts/webkit2/Messages-expected.h (164170 => 164171)
--- 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)
@@ -32,6 +32,7 @@
#include "MessageEncoder.h"
#include "Plugin.h"
#include "StringReference.h"
+#include <WebCore/GraphicsLayer.h>
#include <WebCore/KeyboardEvent.h>
#include <WebCore/PluginData.h>
#include <utility>
@@ -462,6 +463,28 @@
std::tuple<const HashMap<String, std::pair<String, uint64_t>>&> m_arguments;
};
+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;
+};
+
#if PLATFORM(MAC)
class DidCreateWebProcessConnection {
public:
Modified: trunk/Source/WebKit2/Scripts/webkit2/messages.py (164170 => 164171)
--- 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)
@@ -470,7 +470,7 @@
if split[0] == 'WebKit' or split[0] == 'IPC':
headers.append('"%s.h"' % split[1])
else:
- headers.append('<%s/%s.h>' % tuple(split))
+ headers.append('<%s/%s.h>' % tuple(split[0:2]))
return headers
Modified: trunk/Source/WebKit2/Scripts/webkit2/messages_unittest.py (164170 => 164171)
--- 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)
@@ -201,6 +201,13 @@
'conditions': (None),
},
{
+ 'name': 'SetVideoLayerID',
+ 'parameters': (
+ ('WebCore::GraphicsLayer::PlatformLayerID', 'videoLayerID'),
+ ),
+ 'conditions': (None),
+ },
+ {
'name': 'DidCreateWebProcessConnection',
'parameters': (
('IPC::MachPort', 'connectionIdentifier'),
Modified: trunk/Source/WebKit2/Scripts/webkit2/test-legacy-messages.in (164170 => 164171)
--- 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)
@@ -53,6 +53,8 @@
TemplateTest(HashMap<String, std::pair<String, uint64_t>> a)
+ SetVideoLayerID(WebCore::GraphicsLayer::PlatformLayerID videoLayerID)
+
#if PLATFORM(MAC)
DidCreateWebProcessConnection(IPC::MachPort connectionIdentifier)
#endif
Modified: trunk/Source/WebKit2/Scripts/webkit2/test-messages.in (164170 => 164171)
--- 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)
@@ -53,6 +53,8 @@
TemplateTest(HashMap<String, std::pair<String, uint64_t>> a)
+ SetVideoLayerID(WebCore::GraphicsLayer::PlatformLayerID videoLayerID)
+
#if PLATFORM(MAC)
DidCreateWebProcessConnection(IPC::MachPort connectionIdentifier)
#endif
