Import Qt5x2 branch of QtWebkit for Qt 5.2

Importing a new snapshot of webkit.

Change-Id: I2d01ad12cdc8af8cb015387641120a9d7ea5f10c
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@digia.com>

1 files changed, 4 insertions, 4 deletions

diff --git a/Source/WebKit2/Scripts/webkit2/model.py b/Source/WebKit2/Scripts/webkit2/model.py
index b10416c96..a84ebcb28 100644
--- a/Source/WebKit2/Scripts/webkit2/model.py
+++ b/Source/WebKit2/Scripts/webkit2/model.py
@@ -24,8 +24,9 @@ import itertools
 
 
 class MessageReceiver(object):
-    def __init__(self, name, messages, condition):
+    def __init__(self, name, attributes, messages, condition):
         self.name = name
+        self.attributes = frozenset(attributes or [])
         self.messages = messages
         self.condition = condition
 
@@ -33,6 +34,8 @@ class MessageReceiver(object):
         return itertools.chain((parameter for message in self.messages for parameter in message.parameters),
             (reply_parameter for message in self.messages if message.reply_parameters for reply_parameter in message.reply_parameters))
 
+    def has_attribute(self, attribute):
+        return attribute in self.attributes
 
 class Message(object):
     def __init__(self, name, parameters, reply_parameters, attributes, condition):
@@ -42,9 +45,6 @@ class Message(object):
         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