Diff
Modified: trunk/Source/WebKit2/ChangeLog (141182 => 141183)
--- trunk/Source/WebKit2/ChangeLog 2013-01-30 00:56:46 UTC (rev 141182)
+++ trunk/Source/WebKit2/ChangeLog 2013-01-30 00:57:34 UTC (rev 141183)
@@ -1,3 +1,28 @@
+2013-01-29 Anders Carlsson <ander...@apple.com>
+
+ Stop generating the message kind enum
+ https://bugs.webkit.org/show_bug.cgi?id=108258
+
+ Reviewed by Beth Dakin.
+
+ * Platform/CoreIPC/Connection.h:
+ (CoreIPC::Connection::send):
+ (CoreIPC::Connection::sendSync):
+ (CoreIPC::Connection::waitForAndDispatchImmediately):
+ * Platform/CoreIPC/MessageSender.h:
+ (CoreIPC::MessageSender::send):
+ * Scripts/webkit2/messages.py:
+ (surround_in_condition):
+ (message_to_struct_declaration):
+ (generate_messages_header):
+ * Scripts/webkit2/messages_unittest.py:
+ * Scripts/webkit2/model.py:
+ (Message.__init__):
+ * Shared/ChildProcessProxy.h:
+ (WebKit::ChildProcessProxy::send):
+ * Shared/WebConnection.cpp:
+ (WebKit::WebConnection::postMessage):
+
2013-01-29 Kiran Muppala <cmupp...@apple.com>
Fix erroneous semicolon causing build failure: if statement has empty body [-Werror,-Wempty-body]
Modified: trunk/Source/WebKit2/Platform/CoreIPC/Connection.h (141182 => 141183)
--- trunk/Source/WebKit2/Platform/CoreIPC/Connection.h 2013-01-30 00:56:46 UTC (rev 141182)
+++ trunk/Source/WebKit2/Platform/CoreIPC/Connection.h 2013-01-30 00:57:34 UTC (rev 141183)
@@ -405,7 +405,7 @@
OwnPtr<MessageEncoder> encoder = MessageEncoder::create(T::receiverName(), T::name(), destinationID);
encoder->encode(message);
- return sendMessage(MessageID(T::messageID), encoder.release(), messageSendFlags);
+ return sendMessage(MessageID(), encoder.release(), messageSendFlags);
}
template<typename T> bool Connection::sendSync(const T& message, const typename T::Reply& reply, uint64_t destinationID, double timeout, unsigned syncSendFlags)
@@ -419,7 +419,7 @@
encoder->encode(message);
// Now send the message and wait for a reply.
- OwnPtr<MessageDecoder> replyDecoder = sendSyncMessage(MessageID(T::messageID), syncRequestID, encoder.release(), timeout, syncSendFlags);
+ OwnPtr<MessageDecoder> replyDecoder = sendSyncMessage(MessageID(), syncRequestID, encoder.release(), timeout, syncSendFlags);
if (!replyDecoder)
return false;
@@ -434,7 +434,7 @@
return false;
ASSERT(decoder->destinationID() == destinationID);
- m_client->didReceiveMessage(this, MessageID(T::messageID), *decoder);
+ m_client->didReceiveMessage(this, MessageID(), *decoder);
return true;
}
Modified: trunk/Source/WebKit2/Platform/CoreIPC/MessageSender.h (141182 => 141183)
--- trunk/Source/WebKit2/Platform/CoreIPC/MessageSender.h 2013-01-30 00:56:46 UTC (rev 141182)
+++ trunk/Source/WebKit2/Platform/CoreIPC/MessageSender.h 2013-01-30 00:57:34 UTC (rev 141183)
@@ -44,7 +44,7 @@
OwnPtr<MessageEncoder> encoder = MessageEncoder::create(U::receiverName(), U::name(), destinationID);
encoder->encode(message);
- return static_cast<T*>(this)->sendMessage(MessageID(U::messageID), encoder.release());
+ return static_cast<T*>(this)->sendMessage(MessageID(), encoder.release());
}
bool sendMessage(MessageID messageID, PassOwnPtr<MessageEncoder> encoder)
Modified: trunk/Source/WebKit2/Scripts/webkit2/messages.py (141182 => 141183)
--- trunk/Source/WebKit2/Scripts/webkit2/messages.py 2013-01-30 00:56:46 UTC (rev 141182)
+++ trunk/Source/WebKit2/Scripts/webkit2/messages.py 2013-01-30 00:57:34 UTC (rev 141183)
@@ -66,13 +66,6 @@
return '#if %s\n%s#endif\n' % (condition, string)
-def messages_to_kind_enum(messages):
- result = []
- result.append('enum Kind {\n')
- result += [surround_in_condition(' %s,\n' % message.id(), message.condition) for message in messages]
- result.append('};\n')
- return ''.join(result)
-
def function_parameter_type(type):
# Don't use references for built-in types.
builtin_types = frozenset([
@@ -129,7 +122,6 @@
function_parameters = [(function_parameter_type(x.type), x.name) for x in message.parameters]
result.append('struct %s : %s' % (message.name, base_class(message)))
result.append(' {\n')
- result.append(' static const Kind messageID = %s;\n' % message.id())
result.append(' static CoreIPC::StringReference receiverName() { return messageReceiverName(); }\n')
result.append(' static CoreIPC::StringReference name() { return CoreIPC::StringReference("%s"); }\n' % message.name)
result.append(' static const bool isSync = %s;\n' % ('false', 'true')[message.reply_parameters != None])
@@ -293,19 +285,11 @@
result.append(' return CoreIPC::StringReference("%s");\n' % receiver.name)
result.append('}\n')
result.append('\n')
-
- result.append(messages_to_kind_enum(receiver.messages))
result.append('\n')
result.append('\n'.join([message_to_struct_declaration(x) for x in receiver.messages]))
result.append('\n')
result.append('} // namespace %s\n} // namespace Messages\n' % receiver.name)
- result.append('\nnamespace CoreIPC {\n\n')
- result.append('template<> struct MessageKindTraits<Messages::%s::Kind> {\n' % receiver.name)
- result.append(' static const MessageClass messageClass = MessageClass%s;\n' % receiver.name)
- result.append('};\n')
- result.append('\n} // namespace CoreIPC\n')
-
if receiver.condition:
result.append('\n#endif // %s\n' % receiver.condition)
Modified: trunk/Source/WebKit2/Scripts/webkit2/messages_unittest.py (141182 => 141183)
--- trunk/Source/WebKit2/Scripts/webkit2/messages_unittest.py 2013-01-30 00:56:46 UTC (rev 141182)
+++ trunk/Source/WebKit2/Scripts/webkit2/messages_unittest.py 2013-01-30 00:57:34 UTC (rev 141183)
@@ -347,39 +347,7 @@
return CoreIPC::StringReference("WebPage");
}
-enum Kind {
- LoadURLID,
-#if ENABLE(TOUCH_EVENTS)
- TouchEventID,
-#endif
- DidReceivePolicyDecisionID,
- CloseID,
- PreferencesDidChangeID,
- SendDoubleAndFloatID,
- SendIntsID,
- CreatePluginID,
- RunJavaScriptAlertID,
- GetPluginsID,
- GetPluginProcessConnectionID,
- TestMultipleAttributesID,
- TestConnectionQueueID,
- TestParameterAttributesID,
-#if PLATFORM(MAC)
- DidCreateWebProcessConnectionID,
-#endif
-#if PLATFORM(MAC)
- InterpretKeyEventID,
-#endif
-#if ENABLE(DEPRECATED_FEATURE)
- DeprecatedOperationID,
-#endif
-#if ENABLE(EXPERIMENTAL_FEATURE)
- ExperimentalOperationID,
-#endif
-};
-
struct LoadURL : CoreIPC::Arguments1<const WTF::String&> {
- static const Kind messageID = LoadURLID;
static CoreIPC::StringReference receiverName() { return messageReceiverName(); }
static CoreIPC::StringReference name() { return CoreIPC::StringReference("LoadURL"); }
static const bool isSync = false;
@@ -393,7 +361,6 @@
#if ENABLE(TOUCH_EVENTS)
struct TouchEvent : CoreIPC::Arguments1<const WebKit::WebTouchEvent&> {
- static const Kind messageID = TouchEventID;
static CoreIPC::StringReference receiverName() { return messageReceiverName(); }
static CoreIPC::StringReference name() { return CoreIPC::StringReference("TouchEvent"); }
static const bool isSync = false;
@@ -407,7 +374,6 @@
#endif
struct DidReceivePolicyDecision : CoreIPC::Arguments3<uint64_t, uint64_t, uint32_t> {
- static const Kind messageID = DidReceivePolicyDecisionID;
static CoreIPC::StringReference receiverName() { return messageReceiverName(); }
static CoreIPC::StringReference name() { return CoreIPC::StringReference("DidReceivePolicyDecision"); }
static const bool isSync = false;
@@ -420,7 +386,6 @@
};
struct Close : CoreIPC::Arguments0 {
- static const Kind messageID = CloseID;
static CoreIPC::StringReference receiverName() { return messageReceiverName(); }
static CoreIPC::StringReference name() { return CoreIPC::StringReference("Close"); }
static const bool isSync = false;
@@ -429,7 +394,6 @@
};
struct PreferencesDidChange : CoreIPC::Arguments1<const WebKit::WebPreferencesStore&> {
- static const Kind messageID = PreferencesDidChangeID;
static CoreIPC::StringReference receiverName() { return messageReceiverName(); }
static CoreIPC::StringReference name() { return CoreIPC::StringReference("PreferencesDidChange"); }
static const bool isSync = false;
@@ -442,7 +406,6 @@
};
struct SendDoubleAndFloat : CoreIPC::Arguments2<double, float> {
- static const Kind messageID = SendDoubleAndFloatID;
static CoreIPC::StringReference receiverName() { return messageReceiverName(); }
static CoreIPC::StringReference name() { return CoreIPC::StringReference("SendDoubleAndFloat"); }
static const bool isSync = false;
@@ -455,7 +418,6 @@
};
struct SendInts : CoreIPC::Arguments2<const Vector<uint64_t>&, const Vector<Vector<uint64_t> >&> {
- static const Kind messageID = SendIntsID;
static CoreIPC::StringReference receiverName() { return messageReceiverName(); }
static CoreIPC::StringReference name() { return CoreIPC::StringReference("SendInts"); }
static const bool isSync = false;
@@ -468,7 +430,6 @@
};
struct CreatePlugin : CoreIPC::Arguments2<uint64_t, const WebKit::Plugin::Parameters&> {
- static const Kind messageID = CreatePluginID;
static CoreIPC::StringReference receiverName() { return messageReceiverName(); }
static CoreIPC::StringReference name() { return CoreIPC::StringReference("CreatePlugin"); }
static const bool isSync = true;
@@ -482,7 +443,6 @@
};
struct RunJavaScriptAlert : CoreIPC::Arguments2<uint64_t, const WTF::String&> {
- static const Kind messageID = RunJavaScriptAlertID;
static CoreIPC::StringReference receiverName() { return messageReceiverName(); }
static CoreIPC::StringReference name() { return CoreIPC::StringReference("RunJavaScriptAlert"); }
static const bool isSync = true;
@@ -496,7 +456,6 @@
};
struct GetPlugins : CoreIPC::Arguments1<bool> {
- static const Kind messageID = GetPluginsID;
static CoreIPC::StringReference receiverName() { return messageReceiverName(); }
static CoreIPC::StringReference name() { return CoreIPC::StringReference("GetPlugins"); }
static const bool isSync = true;
@@ -510,7 +469,6 @@
};
struct GetPluginProcessConnection : CoreIPC::Arguments1<const WTF::String&> {
- static const Kind messageID = GetPluginProcessConnectionID;
static CoreIPC::StringReference receiverName() { return messageReceiverName(); }
static CoreIPC::StringReference name() { return CoreIPC::StringReference("GetPluginProcessConnection"); }
static const bool isSync = true;
@@ -535,7 +493,6 @@
};
struct TestMultipleAttributes : CoreIPC::Arguments0 {
- static const Kind messageID = TestMultipleAttributesID;
static CoreIPC::StringReference receiverName() { return messageReceiverName(); }
static CoreIPC::StringReference name() { return CoreIPC::StringReference("TestMultipleAttributes"); }
static const bool isSync = true;
@@ -556,7 +513,6 @@
};
struct TestConnectionQueue : CoreIPC::Arguments1<uint64_t> {
- static const Kind messageID = TestConnectionQueueID;
static CoreIPC::StringReference receiverName() { return messageReceiverName(); }
static CoreIPC::StringReference name() { return CoreIPC::StringReference("TestConnectionQueue"); }
static const bool isSync = false;
@@ -569,7 +525,6 @@
};
struct TestParameterAttributes : CoreIPC::Arguments3<uint64_t, double, double> {
- static const Kind messageID = TestParameterAttributesID;
static CoreIPC::StringReference receiverName() { return messageReceiverName(); }
static CoreIPC::StringReference name() { return CoreIPC::StringReference("TestParameterAttributes"); }
static const bool isSync = false;
@@ -583,7 +538,6 @@
#if PLATFORM(MAC)
struct DidCreateWebProcessConnection : CoreIPC::Arguments1<const CoreIPC::MachPort&> {
- static const Kind messageID = DidCreateWebProcessConnectionID;
static CoreIPC::StringReference receiverName() { return messageReceiverName(); }
static CoreIPC::StringReference name() { return CoreIPC::StringReference("DidCreateWebProcessConnection"); }
static const bool isSync = false;
@@ -598,7 +552,6 @@
#if PLATFORM(MAC)
struct InterpretKeyEvent : CoreIPC::Arguments1<uint32_t> {
- static const Kind messageID = InterpretKeyEventID;
static CoreIPC::StringReference receiverName() { return messageReceiverName(); }
static CoreIPC::StringReference name() { return CoreIPC::StringReference("InterpretKeyEvent"); }
static const bool isSync = true;
@@ -614,7 +567,6 @@
#if ENABLE(DEPRECATED_FEATURE)
struct DeprecatedOperation : CoreIPC::Arguments1<const CoreIPC::DummyType&> {
- static const Kind messageID = DeprecatedOperationID;
static CoreIPC::StringReference receiverName() { return messageReceiverName(); }
static CoreIPC::StringReference name() { return CoreIPC::StringReference("DeprecatedOperation"); }
static const bool isSync = false;
@@ -629,7 +581,6 @@
#if ENABLE(EXPERIMENTAL_FEATURE)
struct ExperimentalOperation : CoreIPC::Arguments1<const CoreIPC::DummyType&> {
- static const Kind messageID = ExperimentalOperationID;
static CoreIPC::StringReference receiverName() { return messageReceiverName(); }
static CoreIPC::StringReference name() { return CoreIPC::StringReference("ExperimentalOperation"); }
static const bool isSync = false;
Modified: trunk/Source/WebKit2/Scripts/webkit2/model.py (141182 => 141183)
--- trunk/Source/WebKit2/Scripts/webkit2/model.py 2013-01-30 00:56:46 UTC (rev 141182)
+++ trunk/Source/WebKit2/Scripts/webkit2/model.py 2013-01-30 00:57:34 UTC (rev 141183)
@@ -45,9 +45,6 @@
self.attributes = frozenset(attributes or [])
self.condition = condition
- def id(self):
- return '%sID' % self.name
-
def has_attribute(self, attribute):
return attribute in self.attributes
Modified: trunk/Source/WebKit2/Shared/ChildProcessProxy.h (141182 => 141183)
--- trunk/Source/WebKit2/Shared/ChildProcessProxy.h 2013-01-30 00:56:46 UTC (rev 141182)
+++ trunk/Source/WebKit2/Shared/ChildProcessProxy.h 2013-01-30 00:57:34 UTC (rev 141183)
@@ -84,7 +84,7 @@
OwnPtr<CoreIPC::MessageEncoder> encoder = CoreIPC::MessageEncoder::create(T::receiverName(), T::name(), destinationID);
encoder->encode(message);
- return sendMessage(CoreIPC::MessageID(T::messageID), encoder.release(), messageSendFlags);
+ return sendMessage(CoreIPC::MessageID(), encoder.release(), messageSendFlags);
}
template<typename U>
Modified: trunk/Source/WebKit2/Shared/WebConnection.cpp (141182 => 141183)
--- trunk/Source/WebKit2/Shared/WebConnection.cpp 2013-01-30 00:56:46 UTC (rev 141182)
+++ trunk/Source/WebKit2/Shared/WebConnection.cpp 2013-01-30 00:57:34 UTC (rev 141183)
@@ -55,7 +55,7 @@
encoder->encode(messageName);
encodeMessageBody(*encoder, messageBody);
- sendMessage(CoreIPC::MessageID(Messages::WebConnection::HandleMessage::messageID), encoder.release());
+ sendMessage(CoreIPC::MessageID(), encoder.release());
}
void WebConnection::didClose()
