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 /Tools/Scripts/check-for-global-initializers | |
| 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 'Tools/Scripts/check-for-global-initializers')
| -rwxr-xr-x | Tools/Scripts/check-for-global-initializers | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/Tools/Scripts/check-for-global-initializers b/Tools/Scripts/check-for-global-initializers index 102fa09..7f90577 100755 --- a/Tools/Scripts/check-for-global-initializers +++ b/Tools/Scripts/check-for-global-initializers @@ -124,6 +124,12 @@ for my $file (sort @files) { next if $shortName eq "HostedNetscapePluginStream.o"; next if $shortName eq "NetscapePluginInstanceProxy.o"; } + if ($target eq "WebKit2") { + next if $shortName eq "WebContext.o"; + next if $shortName eq "WebFrame.o"; + next if $shortName eq "WebPage.o"; + next if $shortName eq "WebPageProxy.o"; + } } print "ERROR: $shortName has one or more global initializers in it! ($file), near @globals\n"; |