Merge changes I55c6d71a,Ifb3277d4,Ia1b847a2,I7ba9cf3f,Ida2b2a8a,I1280ec90,I72f818d5,I2e3b588b,I9a4e6289,Ia724c78b,Icd8612c8,Ie31b15d7,Ie125edae,I77941a88,I89dae78b,I3516e5ca,I1a4c17b5,I2c4ecc1a,I9c8e6537,Ifac13115,Ie1f80e09,Ia541ed77,I60ce9d78

* changes:
  Merge WebKit at r82507: Update ThirdPartyProject.prop
  Merge WebKit at r82507: Cherry-pick change r88166 to add INSPECTOR guards to ScriptProfiler
  Merge WebKit at r82507: Work around a V8 bug
  Merge WebKit at r82507: JNIType renamed to JavaType
  Merge WebKit at r82507: IconDatabaseClient interface expanded
  Merge WebKit at r82507: Don't use new loss-free code path in HTMLCanvasElement::toDataURL()
  Merge WebKit at r82507: IcondDatabaseBase::iconForPageURL() renamed
  Merge WebKit at r82507: IconDatabaseBase::Open() signature changed
  Merge WebKit at r82507: Node::isContentEditable() renamed
  Merge WebKit at r82507: Use icon database through IconDatabaseBase
  Merge WebKit at r82507: toInputElement() is now a member of Node
  Merge WebKit at r82507: FrameLoaderClient::objectContentType() signature changed
  Merge WebKit at r82507: StringImpl::computeHash() removed
  Merge WebKit at r82507: Stub out FontPlatformData::setOrientation()
  Merge WebKit at r82507: Path::strokeBoundingRect() is now const
  Merge WebKit at r82507: Add missing UnusedParam.h include in ApplicationCacheGroup.cpp
  Merge WebKit at r82507: Continue to use Android's version of FontPlatformData.h
  Merge WebKit at r82507: Update signature of FontCustomPlatformData::fontPlatformData()
  Merge WebKit at r82507: Fix conflicts due to JNI refactoring
  Merge WebKit at r82507: Fix conflicts due to new StorageTracker
  Merge WebKit at r82507: Fix conflicts
  Merge WebKit at r82507: Fix makefiles
  Merge WebKit at r82507: Initial merge by git

1 files changed, 39 insertions, 11 deletions

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')