Diff
Modified: trunk/Source/WebKit2/ChangeLog (142782 => 142783)
--- trunk/Source/WebKit2/ChangeLog 2013-02-13 21:22:55 UTC (rev 142782)
+++ trunk/Source/WebKit2/ChangeLog 2013-02-13 21:27:50 UTC (rev 142783)
@@ -1,5 +1,19 @@
2013-02-13 Anders Carlsson <[email protected]>
+ Remove support for the DispatchOnConnectionQueue message attribute
+ https://bugs.webkit.org/show_bug.cgi?id=109743
+
+ Reviewed by Sam Weinig.
+
+ * Platform/CoreIPC/HandleMessage.h:
+ (CoreIPC):
+ * Scripts/webkit2/messages.py:
+ (handler_function):
+ (generate_message_handler):
+ * Scripts/webkit2/messages_unittest.py:
+
+2013-02-13 Anders Carlsson <[email protected]>
+
StorageManager should be a WorkQueueMessageReceiver
https://bugs.webkit.org/show_bug.cgi?id=109741
Modified: trunk/Source/WebKit2/Platform/CoreIPC/HandleMessage.h (142782 => 142783)
--- trunk/Source/WebKit2/Platform/CoreIPC/HandleMessage.h 2013-02-13 21:22:55 UTC (rev 142782)
+++ trunk/Source/WebKit2/Platform/CoreIPC/HandleMessage.h 2013-02-13 21:27:50 UTC (rev 142783)
@@ -350,15 +350,6 @@
}
template<typename T, typename C, typename MF>
-void handleMessageOnConnectionQueue(Connection* connection, MessageDecoder& decoder, C* object, MF function)
-{
- typename T::DecodeType::ValueType arguments;
- if (!decoder.decode(arguments))
- return;
- callMemberFunction(connection, arguments, object, function);
-}
-
-template<typename T, typename C, typename MF>
void handleMessageVariadic(MessageDecoder& decoder, C* object, MF function)
{
typename T::DecodeType::ValueType arguments;
Modified: trunk/Source/WebKit2/Scripts/webkit2/messages.py (142782 => 142783)
--- trunk/Source/WebKit2/Scripts/webkit2/messages.py 2013-02-13 21:22:55 UTC (rev 142782)
+++ trunk/Source/WebKit2/Scripts/webkit2/messages.py 2013-02-13 21:27:50 UTC (rev 142783)
@@ -27,7 +27,6 @@
WANTS_CONNECTION_ATTRIBUTE = 'WantsConnection'
LEGACY_RECEIVER_ATTRIBUTE = 'LegacyReceiver'
DELAYED_ATTRIBUTE = 'Delayed'
-DISPATCH_ON_CONNECTION_QUEUE_ATTRIBUTE = 'DispatchOnConnectionQueue'
VARIADIC_ATTRIBUTE = 'Variadic'
_license_header = """/*
@@ -304,16 +303,6 @@
return '%s::%s' % (receiver.name, message.name[0].lower() + message.name[1:])
-def connection_work_queue_message_statement(receiver, message):
- dispatch_function_args = ['connection', '*decoder', 'this', '&%s' % handler_function(receiver, message)]
- result = []
- result.append(' if (decoder->messageName() == Messages::%s::%s::name()) {\n' % (receiver.name, message.name))
- result.append(' CoreIPC::handleMessageOnConnectionQueue<Messages::%s::%s>(%s);\n' % (receiver.name, message.name, ', '.join(dispatch_function_args)))
- result.append(' decoder = nullptr;\n')
- result.append(' return;\n')
- result.append(' }\n')
- return surround_in_condition(''.join(result), message.condition)
-
def async_message_statement(receiver, message):
dispatch_function_args = ['decoder', 'this', '&%s' % handler_function(receiver, message)]
@@ -524,35 +513,14 @@
result.append('namespace WebKit {\n\n')
- async_dispatch_on_connection_queue_messages = []
- sync_dispatch_on_connection_queue_messages = []
async_messages = []
sync_messages = []
for message in receiver.messages:
if message.reply_parameters is not None:
- if message.has_attribute(DISPATCH_ON_CONNECTION_QUEUE_ATTRIBUTE):
- sync_dispatch_on_connection_queue_messages.append(message)
- else:
- sync_messages.append(message)
+ sync_messages.append(message)
else:
- if message.has_attribute(DISPATCH_ON_CONNECTION_QUEUE_ATTRIBUTE):
- async_dispatch_on_connection_queue_messages.append(message)
- else:
- async_messages.append(message)
+ async_messages.append(message)
- if async_dispatch_on_connection_queue_messages:
- result.append('void %s::didReceive%sMessageOnConnectionWorkQueue(CoreIPC::Connection* connection, OwnPtr<CoreIPC::MessageDecoder>& decoder)\n' % (receiver.name, receiver.name))
- result.append('{\n')
- result.append('#if COMPILER(MSVC)\n')
- result.append('#pragma warning(push)\n')
- result.append('#pragma warning(disable: 4065)\n')
- result.append('#endif\n')
- result += [connection_work_queue_message_statement(receiver, message) for message in async_dispatch_on_connection_queue_messages]
- result.append('#if COMPILER(MSVC)\n')
- result.append('#pragma warning(pop)\n')
- result.append('#endif\n')
- result.append('}\n\n')
-
if async_messages:
if receiver.has_attribute(LEGACY_RECEIVER_ATTRIBUTE):
result.append('void %s::didReceive%sMessage(CoreIPC::Connection*, CoreIPC::MessageDecoder& decoder)\n' % (receiver.name, receiver.name))
Modified: trunk/Source/WebKit2/Scripts/webkit2/messages_unittest.py (142782 => 142783)
--- trunk/Source/WebKit2/Scripts/webkit2/messages_unittest.py 2013-02-13 21:22:55 UTC (rev 142782)
+++ trunk/Source/WebKit2/Scripts/webkit2/messages_unittest.py 2013-02-13 21:27:50 UTC (rev 142783)
@@ -66,11 +66,10 @@
CreatePlugin(uint64_t pluginInstanceID, WebKit::Plugin::Parameters parameters) -> (bool result)
RunJavaScriptAlert(uint64_t frameID, WTF::String message) -> ()
- GetPlugins(bool refresh) -> (Vector<WebCore::PluginInfo> plugins) DispatchOnConnectionQueue
+ GetPlugins(bool refresh) -> (Vector<WebCore::PluginInfo> plugins)
GetPluginProcessConnection(WTF::String pluginPath) -> (CoreIPC::Connection::Handle connectionHandle) Delayed
- TestMultipleAttributes() -> () DispatchOnConnectionQueue Delayed
- TestConnectionQueue(uint64_t pluginID) DispatchOnConnectionQueue
+ TestMultipleAttributes() -> () WantsConnection Delayed
TestParameterAttributes([AttributeOne AttributeTwo] uint64_t foo, double bar, [AttributeThree] double baz)
@@ -199,13 +198,6 @@
'conditions': (None),
},
{
- 'name': 'TestConnectionQueue',
- 'parameters': (
- ('uint64_t', 'pluginID'),
- ),
- 'conditions': (None),
- },
- {
'name': 'TestParameterAttributes',
'parameters': (
('uint64_t', 'foo', ('AttributeOne', 'AttributeTwo')),
@@ -511,18 +503,6 @@
typedef CoreIPC::Arguments0 DecodeType;
};
-struct TestConnectionQueue : CoreIPC::Arguments1<uint64_t> {
- static CoreIPC::StringReference receiverName() { return messageReceiverName(); }
- static CoreIPC::StringReference name() { return CoreIPC::StringReference("TestConnectionQueue"); }
- static const bool isSync = false;
-
- typedef CoreIPC::Arguments1<uint64_t> DecodeType;
- explicit TestConnectionQueue(uint64_t pluginID)
- : CoreIPC::Arguments1<uint64_t>(pluginID)
- {
- }
-};
-
struct TestParameterAttributes : CoreIPC::Arguments3<uint64_t, double, double> {
static CoreIPC::StringReference receiverName() { return messageReceiverName(); }
static CoreIPC::StringReference name() { return CoreIPC::StringReference("TestParameterAttributes"); }
@@ -703,22 +683,6 @@
namespace WebKit {
-void WebPage::didReceiveWebPageMessageOnConnectionWorkQueue(CoreIPC::Connection* connection, OwnPtr<CoreIPC::MessageDecoder>& decoder)
-{
-#if COMPILER(MSVC)
-#pragma warning(push)
-#pragma warning(disable: 4065)
-#endif
- if (decoder->messageName() == Messages::WebPage::TestConnectionQueue::name()) {
- CoreIPC::handleMessageOnConnectionQueue<Messages::WebPage::TestConnectionQueue>(connection, *decoder, this, &WebPage::testConnectionQueue);
- decoder = nullptr;
- return;
- }
-#if COMPILER(MSVC)
-#pragma warning(pop)
-#endif
-}
-
void WebPage::didReceiveWebPageMessage(CoreIPC::Connection*, CoreIPC::MessageDecoder& decoder)
{
if (decoder.messageName() == Messages::WebPage::LoadURL::name()) {
@@ -786,10 +750,18 @@
CoreIPC::handleMessage<Messages::WebPage::RunJavaScriptAlert>(decoder, *replyEncoder, this, &WebPage::runJavaScriptAlert);
return;
}
+ if (decoder.messageName() == Messages::WebPage::GetPlugins::name()) {
+ CoreIPC::handleMessage<Messages::WebPage::GetPlugins>(decoder, *replyEncoder, this, &WebPage::getPlugins);
+ return;
+ }
if (decoder.messageName() == Messages::WebPage::GetPluginProcessConnection::name()) {
CoreIPC::handleMessageDelayed<Messages::WebPage::GetPluginProcessConnection>(connection, decoder, replyEncoder, this, &WebPage::getPluginProcessConnection);
return;
}
+ if (decoder.messageName() == Messages::WebPage::TestMultipleAttributes::name()) {
+ CoreIPC::handleMessageDelayed<Messages::WebPage::TestMultipleAttributes>(connection, decoder, replyEncoder, this, &WebPage::testMultipleAttributes);
+ return;
+ }
#if PLATFORM(MAC)
if (decoder.messageName() == Messages::WebPage::InterpretKeyEvent::name()) {
CoreIPC::handleMessage<Messages::WebPage::InterpretKeyEvent>(decoder, *replyEncoder, this, &WebPage::interpretKeyEvent);
