diff options
| author | Ben Murdoch <benm@google.com> | 2011-05-24 11:24:40 +0100 |
|---|---|---|
| committer | Ben Murdoch <benm@google.com> | 2011-06-02 09:53:15 +0100 |
| commit | 81bc750723a18f21cd17d1b173cd2a4dda9cea6e (patch) | |
| tree | 7a9e5ed86ff429fd347a25153107221543909b19 /Source/WebKit2/Scripts/webkit2 | |
| parent | 94088a6d336c1dd80a1e734af51e96abcbb689a7 (diff) | |
| download | external_webkit-81bc750723a18f21cd17d1b173cd2a4dda9cea6e.zip external_webkit-81bc750723a18f21cd17d1b173cd2a4dda9cea6e.tar.gz external_webkit-81bc750723a18f21cd17d1b173cd2a4dda9cea6e.tar.bz2 | |
Merge WebKit at r80534: Intial merge by Git
Change-Id: Ia7a83357124c9e1cdb1debf55d9661ec0bd09a61
Diffstat (limited to 'Source/WebKit2/Scripts/webkit2')
| -rw-r--r-- | Source/WebKit2/Scripts/webkit2/messages.py | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/Source/WebKit2/Scripts/webkit2/messages.py b/Source/WebKit2/Scripts/webkit2/messages.py index 800dc39..1c6ae97 100644 --- a/Source/WebKit2/Scripts/webkit2/messages.py +++ b/Source/WebKit2/Scripts/webkit2/messages.py @@ -251,16 +251,19 @@ def message_to_struct_declaration(message): def struct_or_class(namespace, type): structs = frozenset([ 'WebCore::CompositionUnderline', + 'WebCore::GrammarDetail', 'WebCore::KeypressCommand', 'WebCore::PluginInfo', 'WebCore::PrintInfo', 'WebCore::ViewportArguments', 'WebCore::WindowFeatures', 'WebKit::ContextMenuState', + 'WebKit::DictionaryPopupInfo', 'WebKit::DrawingAreaInfo', 'WebKit::PlatformPopupMenuData', 'WebKit::PluginProcessCreationParameters', 'WebKit::PrintInfo', + 'WebKit::SecurityOriginData', 'WebKit::SelectionState', 'WebKit::TextCheckerState', 'WebKit::WebNavigationDataStore', @@ -311,7 +314,7 @@ def forward_declarations_and_headers(receiver): # Include its header instead. headers.update(headers_for_type(type)) - forward_declarations = '\n'.join([forward_declarations_for_namespace(namespace, types) for (namespace, types) in sorted(types_by_namespace.iteritems())]) + forward_declarations = '\n'.join([forward_declarations_for_namespace(namespace, types) for (namespace, types) in sorted(types_by_namespace.items())]) headers = ['#include %s\n' % header for header in sorted(headers)] return (forward_declarations, headers) @@ -424,7 +427,7 @@ def headers_for_type(type): 'WebCore::CompositionUnderline': '<WebCore/Editor.h>', 'WebCore::KeypressCommand': '<WebCore/KeyboardEvent.h>', 'WebCore::PluginInfo': '<WebCore/PluginData.h>', - 'WebCore::TextCheckingResult': '<WebCore/EditorClient.h>', + 'WebCore::TextCheckingResult': '<WebCore/TextCheckerClient.h>', 'WebKit::WebGestureEvent': '"WebEvent.h"', 'WebKit::WebKeyboardEvent': '"WebEvent.h"', 'WebKit::WebMouseEvent': '"WebEvent.h"', |