diff options
| author | Steve Block <steveblock@google.com> | 2011-01-05 12:15:11 +0000 |
|---|---|---|
| committer | Steve Block <steveblock@google.com> | 2011-01-06 14:14:00 +0000 |
| commit | d06194330da2bb8da887d2e1adeacb3a5c1504b2 (patch) | |
| tree | e0af8413af65a8e30630563441af7bdb8478e513 /WebKitTools/wx/build/settings.py | |
| parent | 419a5cf2f8db6ca014df624865197ffb82caad37 (diff) | |
| download | external_webkit-d06194330da2bb8da887d2e1adeacb3a5c1504b2.zip external_webkit-d06194330da2bb8da887d2e1adeacb3a5c1504b2.tar.gz external_webkit-d06194330da2bb8da887d2e1adeacb3a5c1504b2.tar.bz2 | |
Merge WebKit at r72805: Initial merge by Git
Note that this is a backwards merge from Chromium release 9.0.600.0
to 9.0.597.0, to align with the Chromium 9 stable release branch.
Change-Id: I5d2bb4e8cee9d39ae8485abf48bdb55ecf8b3790
Diffstat (limited to 'WebKitTools/wx/build/settings.py')
| -rw-r--r-- | WebKitTools/wx/build/settings.py | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/WebKitTools/wx/build/settings.py b/WebKitTools/wx/build/settings.py index 03c0880..cd3358c 100644 --- a/WebKitTools/wx/build/settings.py +++ b/WebKitTools/wx/build/settings.py @@ -118,9 +118,8 @@ webcore_dirs = [ 'WebCore/html/parser', 'WebCore/inspector', 'WebCore/loader', - 'WebCore/loader/appcache', - 'WebCore/loader/archive', - 'WebCore/loader/cache', + 'WebCore/loader/appcache', + 'WebCore/loader/archive', 'WebCore/loader/icon', 'WebCore/notifications', 'WebCore/page', @@ -136,7 +135,6 @@ webcore_dirs = [ 'WebCore/platform/image-decoders/ico', 'WebCore/platform/image-decoders/jpeg', 'WebCore/platform/image-decoders/png', - 'WebCore/platform/image-decoders/webp', 'WebCore/platform/mock', 'WebCore/platform/network', 'WebCore/platform/sql', @@ -151,7 +149,7 @@ webcore_dirs = [ 'WebCore/svg/animation', 'WebCore/svg/graphics', 'WebCore/svg/graphics/filters', - 'WebCore/svg/properties', + 'WebCore/websockets', 'WebCore/xml' ] |