diff options
author | Steve Block <steveblock@google.com> | 2011-05-18 13:36:51 +0100 |
---|---|---|
committer | Steve Block <steveblock@google.com> | 2011-05-24 15:38:28 +0100 |
commit | 2fc2651226baac27029e38c9d6ef883fa32084db (patch) | |
tree | e396d4bf89dcce6ed02071be66212495b1df1dec /Source/WebKit2/Scripts | |
parent | b3725cedeb43722b3b175aaeff70552e562d2c94 (diff) | |
download | external_webkit-2fc2651226baac27029e38c9d6ef883fa32084db.zip external_webkit-2fc2651226baac27029e38c9d6ef883fa32084db.tar.gz external_webkit-2fc2651226baac27029e38c9d6ef883fa32084db.tar.bz2 |
Merge WebKit at r78450: Initial merge by git.
Change-Id: I6d3e5f1f868ec266a0aafdef66182ddc3f265dc1
Diffstat (limited to 'Source/WebKit2/Scripts')
-rwxr-xr-x | Source/WebKit2/Scripts/generate-forwarding-headers.pl | 2 | ||||
-rw-r--r-- | Source/WebKit2/Scripts/webkit2/messages.py | 14 | ||||
-rw-r--r-- | Source/WebKit2/Scripts/webkit2/messages_unittest.py | 4 |
3 files changed, 17 insertions, 3 deletions
diff --git a/Source/WebKit2/Scripts/generate-forwarding-headers.pl b/Source/WebKit2/Scripts/generate-forwarding-headers.pl index 6e2b2c2..738d413 100755 --- a/Source/WebKit2/Scripts/generate-forwarding-headers.pl +++ b/Source/WebKit2/Scripts/generate-forwarding-headers.pl @@ -78,7 +78,7 @@ sub collectFameworkHeaderPaths { my $file = $_; if ($filePath =~ '\.h$' && $filePath !~ "ForwardingHeaders" && grep{$file eq $_} keys %neededHeaders) { my $headerPath = substr($filePath, length(File::Spec->catfile($srcRoot, $framework)) + 1 ); - push(@frameworkHeaders, $headerPath) unless (grep($headerPath =~ "$_/", @skippedPrefixes)); + push(@frameworkHeaders, $headerPath) unless (grep($headerPath =~ "$_/", @skippedPrefixes) || $headerPath =~ "config.h"); } } diff --git a/Source/WebKit2/Scripts/webkit2/messages.py b/Source/WebKit2/Scripts/webkit2/messages.py index 8fc0eaa..800dc39 100644 --- a/Source/WebKit2/Scripts/webkit2/messages.py +++ b/Source/WebKit2/Scripts/webkit2/messages.py @@ -48,6 +48,7 @@ _license_header = """/* * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ + """ class MessageReceiver(object): @@ -255,9 +256,13 @@ def struct_or_class(namespace, type): 'WebCore::PrintInfo', 'WebCore::ViewportArguments', 'WebCore::WindowFeatures', + 'WebKit::ContextMenuState', 'WebKit::DrawingAreaInfo', 'WebKit::PlatformPopupMenuData', 'WebKit::PluginProcessCreationParameters', + 'WebKit::PrintInfo', + 'WebKit::SelectionState', + 'WebKit::TextCheckerState', 'WebKit::WebNavigationDataStore', 'WebKit::WebOpenPanelParameters::Data', 'WebKit::WebPageCreationParameters', @@ -318,7 +323,6 @@ def generate_messages_header(file): result = [] result.append(_license_header) - result.append('\n') result.append('#ifndef %s\n' % header_guard) result.append('#define %s\n\n' % header_guard) @@ -371,9 +375,13 @@ def async_case_statement(receiver, message): def sync_case_statement(receiver, message): + dispatch_function = 'handleMessage' + if message.is_variadic: + dispatch_function += 'Variadic' + result = [] result.append(' case Messages::%s::%s:\n' % (receiver.name, message.id())) - result.append(' CoreIPC::handleMessage<Messages::%s::%s>(arguments, reply, this, &%s);\n' % (receiver.name, message.name, handler_function(receiver, message))) + result.append(' CoreIPC::%s<Messages::%s::%s>(arguments, reply, this, &%s);\n' % (dispatch_function, receiver.name, message.name, handler_function(receiver, message))) # FIXME: Handle delayed replies result.append(' return CoreIPC::AutomaticReply;\n') return surround_in_condition(''.join(result), message.condition) @@ -417,6 +425,7 @@ def headers_for_type(type): 'WebCore::KeypressCommand': '<WebCore/KeyboardEvent.h>', 'WebCore::PluginInfo': '<WebCore/PluginData.h>', 'WebCore::TextCheckingResult': '<WebCore/EditorClient.h>', + 'WebKit::WebGestureEvent': '"WebEvent.h"', 'WebKit::WebKeyboardEvent': '"WebEvent.h"', 'WebKit::WebMouseEvent': '"WebEvent.h"', 'WebKit::WebTouchEvent': '"WebEvent.h"', @@ -468,6 +477,7 @@ def generate_message_handler(file): result = [] result.append(_license_header) + result.append('#include "config.h"\n') result.append('\n') if receiver.condition: diff --git a/Source/WebKit2/Scripts/webkit2/messages_unittest.py b/Source/WebKit2/Scripts/webkit2/messages_unittest.py index 25123c0..8ed8cee 100644 --- a/Source/WebKit2/Scripts/webkit2/messages_unittest.py +++ b/Source/WebKit2/Scripts/webkit2/messages_unittest.py @@ -47,6 +47,8 @@ _messages_file_contents = """# Copyright (C) 2010 Apple Inc. All rights reserved # OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +#include "config.h" + #if ENABLE(WEBKIT2) messages -> WebPage { @@ -478,6 +480,8 @@ _expected_receiver_implementation = """/* * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ +#include "config.h" + #if ENABLE(WEBKIT2) #include "WebPage.h" |