3 files changed, 57 insertions, 13 deletions

diff --git a/Source/WebKit2/Scripts/generate-forwarding-headers.pl b/Source/WebKit2/Scripts/generate-forwarding-headers.pl
index 5a53d81..43425ef 100755
--- a/Source/WebKit2/Scripts/generate-forwarding-headers.pl
+++ b/Source/WebKit2/Scripts/generate-forwarding-headers.pl
@@ -64,7 +64,7 @@ foreach (@frameworks) {
 sub collectNeededHeaders {
     my $filePath = $File::Find::name;
     my $file = $_;
-    if ($filePath =~ '\.h$|\.cpp$') {
+    if ($filePath =~ '\.h$|\.cpp$|\.c$') {
         open(FILE, "<$file") or die "Could not open $filePath.\n";
         while (<FILE>) {
            if (m/^#.*<$framework\/(.*\.h)/) {
diff --git a/Source/WebKit2/Scripts/webkit2/messages.py b/Source/WebKit2/Scripts/webkit2/messages.py
index 1c6ae97..159ca32 100644
--- a/Source/WebKit2/Scripts/webkit2/messages.py
+++ b/Source/WebKit2/Scripts/webkit2/messages.py
@@ -89,6 +89,9 @@ class MessageReceiver(object):
                 else:
                     parameters = []
 
+                for parameter in parameters:
+                    parameter.condition = condition
+
                 delayed = delayed_string == 'delayed'
 
                 if reply_parameters_string:
@@ -120,9 +123,10 @@ class Message(object):
 
 
 class Parameter(object):
-    def __init__(self, type, name):
+    def __init__(self, type, name, condition=None):
         self.type = type
         self.name = name
+        self.condition = condition
 
 
 def parse_parameter_string(parameter_string):
@@ -362,6 +366,8 @@ def generate_messages_header(file):
 
 
 def handler_function(receiver, message):
+    if message.name.find('URL') == 0:
+        return '%s::%s' % (receiver.name, 'url' + message.name[3:])
     return '%s::%s' % (receiver.name, message.name[0].lower() + message.name[1:])
 
 
@@ -449,21 +455,35 @@ def headers_for_type(type):
 
 def generate_message_handler(file):
     receiver = MessageReceiver.parse(file)
-    headers = set([
-        '"%s"' % messages_header_filename(receiver),
-        '"HandleMessage.h"',
-        '"ArgumentDecoder.h"',
-    ])
+    headers = {
+        '"%s"' % messages_header_filename(receiver): None,
+        '"HandleMessage.h"': None,
+        '"ArgumentDecoder.h"': None,
+    }
 
+    type_conditions = {}
     for parameter in receiver.iterparameters():
         type = parameter.type
+        condition = parameter.condition
+
+        if type in type_conditions:
+            if not type_conditions[type]:
+                condition = type_conditions[type]
+            else:
+                if not condition:
+                    type_conditions[type] = condition
+        else:
+            type_conditions[type] = condition
+
         argument_encoder_headers = argument_coder_headers_for_type(parameter.type)
         if argument_encoder_headers:
-            headers.update(argument_encoder_headers)
+            for header in argument_encoder_headers:
+                headers[header] = condition
             continue
 
         type_headers = headers_for_type(type)
-        headers.update(type_headers)
+        for header in type_headers:
+            headers[header] = condition
 
     for message in receiver.messages:
         if message.reply_parameters is not None:
@@ -471,11 +491,13 @@ def generate_message_handler(file):
                 type = reply_parameter.type
                 argument_encoder_headers = argument_coder_headers_for_type(type)
                 if argument_encoder_headers:
-                    headers.update(argument_encoder_headers)
+                    for header in argument_encoder_headers:
+                        headers[header] = message.condition
                     continue
 
                 type_headers = headers_for_type(type)
-                headers.update(type_headers)
+                for header in type_headers:
+                    headers[header] = message.condition
 
     result = []
 
@@ -487,7 +509,13 @@ def generate_message_handler(file):
         result.append('#if %s\n\n' % receiver.condition)
 
     result.append('#include "%s.h"\n\n' % receiver.name)
-    result += ['#include %s\n' % header for header in sorted(headers)]
+    for headercondition in sorted(headers):
+        if headers[headercondition]:
+            result.append('#if %s\n' % headers[headercondition])
+            result += ['#include %s\n' % headercondition]
+            result.append('#endif\n')
+        else:
+            result += ['#include %s\n' % headercondition]
     result.append('\n')
 
     result.append('namespace WebKit {\n\n')
diff --git a/Source/WebKit2/Scripts/webkit2/messages_unittest.py b/Source/WebKit2/Scripts/webkit2/messages_unittest.py
index 8ed8cee..90d59ae 100644
--- a/Source/WebKit2/Scripts/webkit2/messages_unittest.py
+++ b/Source/WebKit2/Scripts/webkit2/messages_unittest.py
@@ -68,7 +68,9 @@ messages -> WebPage {
     GetPlugins(bool refresh) -> (Vector<WebCore::PluginInfo> plugins)
     GetPluginProcessConnection(WTF::String pluginPath) -> (CoreIPC::Connection::Handle connectionHandle) delayed
 
+#if PLATFORM(MAC)
     DidCreateWebProcessConnection(CoreIPC::MachPort connectionIdentifier)
+#endif
 
 #if PLATFORM(MAC)
     # Keyboard support
@@ -179,7 +181,7 @@ _expected_results = {
             'parameters': (
                 ('CoreIPC::MachPort', 'connectionIdentifier'),
             ),
-            'condition': None,
+            'condition': 'PLATFORM(MAC)',
         },
         {
             'name': 'InterpretKeyEvent',
@@ -291,7 +293,9 @@ enum Kind {
     RunJavaScriptAlertID,
     GetPluginsID,
     GetPluginProcessConnectionID,
+#if PLATFORM(MAC)
     DidCreateWebProcessConnectionID,
+#endif
 #if PLATFORM(MAC)
     InterpretKeyEventID,
 #endif
@@ -418,6 +422,7 @@ struct GetPluginProcessConnection : CoreIPC::Arguments1<const WTF::String&> {
     }
 };
 
+#if PLATFORM(MAC)
 struct DidCreateWebProcessConnection : CoreIPC::Arguments1<const CoreIPC::MachPort&> {
     static const Kind messageID = DidCreateWebProcessConnectionID;
     typedef CoreIPC::Arguments1<const CoreIPC::MachPort&> DecodeType;
@@ -426,6 +431,7 @@ struct DidCreateWebProcessConnection : CoreIPC::Arguments1<const CoreIPC::MachPo
     {
     }
 };
+#endif
 
 #if PLATFORM(MAC)
 struct InterpretKeyEvent : CoreIPC::Arguments1<uint32_t> {
@@ -486,14 +492,22 @@ _expected_receiver_implementation = """/*
 
 #include "WebPage.h"
 
+#if PLATFORM(MAC)
 #include "ArgumentCoders.h"
+#endif
 #include "ArgumentDecoder.h"
 #include "Connection.h"
 #include "HandleMessage.h"
+#if PLATFORM(MAC)
 #include "MachPort.h"
+#endif
 #include "Plugin.h"
+#if PLATFORM(MAC)
 #include "WebCoreArgumentCoders.h"
+#endif
+#if ENABLE(TOUCH_EVENTS)
 #include "WebEvent.h"
+#endif
 #include "WebPageMessages.h"
 #include "WebPreferencesStore.h"
 
@@ -525,9 +539,11 @@ void WebPage::didReceiveWebPageMessage(CoreIPC::Connection*, CoreIPC::MessageID
     case Messages::WebPage::SendIntsID:
         CoreIPC::handleMessage<Messages::WebPage::SendInts>(arguments, this, &WebPage::sendInts);
         return;
+#if PLATFORM(MAC)
     case Messages::WebPage::DidCreateWebProcessConnectionID:
         CoreIPC::handleMessage<Messages::WebPage::DidCreateWebProcessConnection>(arguments, this, &WebPage::didCreateWebProcessConnection);
         return;
+#endif
     default:
         break;
     }