Modified: trunk/Source/WebKit2/ChangeLog (89139 => 89140)
--- trunk/Source/WebKit2/ChangeLog 2011-06-17 15:34:13 UTC (rev 89139)
+++ trunk/Source/WebKit2/ChangeLog 2011-06-17 17:17:19 UTC (rev 89140)
@@ -1,3 +1,16 @@
+2011-06-17 Anders Carlsson <[email protected]>
+
+ Reviewed by Darin Adler.
+
+ Fix message generator to include headers for all types
+ https://bugs.webkit.org/show_bug.cgi?id=62870
+
+ Previously, if we found an argument coder header for a type, we'd assume
+ that that header includes the necessary headers for the type.
+
+ * Scripts/webkit2/messages.py:
+ * Scripts/webkit2/messages_unittest.py:
+
2011-06-17 Chang Shu <[email protected]>
Reviewed by Andreas Kling.
Modified: trunk/Source/WebKit2/Scripts/webkit2/messages.py (89139 => 89140)
--- trunk/Source/WebKit2/Scripts/webkit2/messages.py 2011-06-17 15:34:13 UTC (rev 89139)
+++ trunk/Source/WebKit2/Scripts/webkit2/messages.py 2011-06-17 17:17:19 UTC (rev 89140)
@@ -456,20 +456,22 @@
return ['<wtf/Vector.h>'] + headers_for_type(element_type)
special_cases = {
- 'WTF::String': '<wtf/text/WTFString.h>',
- 'WebCore::CompositionUnderline': '<WebCore/Editor.h>',
- 'WebCore::GrammarDetail': '<WebCore/TextCheckerClient.h>',
- 'WebCore::KeypressCommand': '<WebCore/KeyboardEvent.h>',
- 'WebCore::PluginInfo': '<WebCore/PluginData.h>',
- 'WebCore::TextCheckingResult': '<WebCore/TextCheckerClient.h>',
- 'WebKit::WebGestureEvent': '"WebEvent.h"',
- 'WebKit::WebKeyboardEvent': '"WebEvent.h"',
- 'WebKit::WebMouseEvent': '"WebEvent.h"',
- 'WebKit::WebTouchEvent': '"WebEvent.h"',
- 'WebKit::WebWheelEvent': '"WebEvent.h"',
+ 'WTF::String': ['<wtf/text/WTFString.h>'],
+ 'WebCore::CompositionUnderline': ['<WebCore/Editor.h>'],
+ 'WebCore::GrammarDetail': ['<WebCore/TextCheckerClient.h>'],
+ 'WebCore::KeypressCommand': ['<WebCore/KeyboardEvent.h>'],
+ 'WebCore::PluginInfo': ['<WebCore/PluginData.h>'],
+ 'WebCore::TextCheckingResult': ['<WebCore/TextCheckerClient.h>'],
+ 'WebKit::InjectedBundleUserMessageEncoder': [],
+ 'WebKit::WebContextUserMessageEncoder': [],
+ 'WebKit::WebGestureEvent': ['"WebEvent.h"'],
+ 'WebKit::WebKeyboardEvent': ['"WebEvent.h"'],
+ 'WebKit::WebMouseEvent': ['"WebEvent.h"'],
+ 'WebKit::WebTouchEvent': ['"WebEvent.h"'],
+ 'WebKit::WebWheelEvent': ['"WebEvent.h"'],
}
if type in special_cases:
- return [special_cases[type]]
+ return special_cases[type]
# We assume that we must include a header for a type iff it has a scope
# resolution operator (::).
@@ -507,7 +509,6 @@
if header not in headers:
headers[header] = []
headers[header].extend(conditions)
- continue
type_headers = headers_for_type(type)
for header in type_headers:
@@ -525,7 +526,6 @@
if header not in headers:
headers[header] = []
headers[header].append(message.condition)
- continue
type_headers = headers_for_type(type)
for header in type_headers:
Modified: trunk/Source/WebKit2/Scripts/webkit2/messages_unittest.py (89139 => 89140)
--- trunk/Source/WebKit2/Scripts/webkit2/messages_unittest.py 2011-06-17 15:34:13 UTC (rev 89139)
+++ trunk/Source/WebKit2/Scripts/webkit2/messages_unittest.py 2011-06-17 17:17:19 UTC (rev 89140)
@@ -600,6 +600,12 @@
#endif
#include "WebPageMessages.h"
#include "WebPreferencesStore.h"
+#if PLATFORM(MAC)
+#include <WebCore/KeyboardEvent.h>
+#endif
+#include <WebCore/PluginData.h>
+#include <wtf/Vector.h>
+#include <wtf/text/WTFString.h>
namespace Messages {
