diff options
| author | Steve Block <steveblock@google.com> | 2010-04-27 16:31:00 +0100 |
|---|---|---|
| committer | Steve Block <steveblock@google.com> | 2010-05-11 14:42:12 +0100 |
| commit | dcc8cf2e65d1aa555cce12431a16547e66b469ee (patch) | |
| tree | 92a8d65cd5383bca9749f5327fb5e440563926e6 /WebKitTools/wx | |
| parent | ccac38a6b48843126402088a309597e682f40fe6 (diff) | |
| download | external_webkit-dcc8cf2e65d1aa555cce12431a16547e66b469ee.zip external_webkit-dcc8cf2e65d1aa555cce12431a16547e66b469ee.tar.gz external_webkit-dcc8cf2e65d1aa555cce12431a16547e66b469ee.tar.bz2 | |
Merge webkit.org at r58033 : Initial merge by git
Change-Id: If006c38561af287c50cd578d251629b51e4d8cd1
Diffstat (limited to 'WebKitTools/wx')
| -rw-r--r-- | WebKitTools/wx/browser/browser.cpp | 2 | ||||
| -rw-r--r-- | WebKitTools/wx/build/settings.py | 14 |
2 files changed, 11 insertions, 5 deletions
diff --git a/WebKitTools/wx/browser/browser.cpp b/WebKitTools/wx/browser/browser.cpp index df701bb..95c39d4 100644 --- a/WebKitTools/wx/browser/browser.cpp +++ b/WebKitTools/wx/browser/browser.cpp @@ -61,7 +61,7 @@ bool MyApp::OnInit() #if __WXMSW__ || __WXMAC__ settings.SetPluginsEnabled(true); #endif - settings.SetDatabasesEnabled(true); + frame->webview->SetDatabasesEnabled(true); settings.SetEditableLinkBehavior(wxEditableLinkOnlyLiveWithShiftKey); frame->CentreOnScreen(); frame->Show(true); diff --git a/WebKitTools/wx/build/settings.py b/WebKitTools/wx/build/settings.py index d3b7b2c..baf9657 100644 --- a/WebKitTools/wx/build/settings.py +++ b/WebKitTools/wx/build/settings.py @@ -60,7 +60,7 @@ common_libpaths = [] common_frameworks = [] ports = [ - 'CF', + 'Brew', 'Chromium', 'Gtk', 'Haiku', @@ -90,6 +90,7 @@ jscore_dirs = [ 'profiler', 'runtime', 'wtf', + 'wtf/text', 'wtf/unicode', 'wtf/unicode/icu', 'yarr', @@ -120,7 +121,8 @@ webcore_dirs = [ 'page/animation', 'platform', 'platform/animation', - 'platform/graphics', + 'platform/graphics', + 'platform/graphics/filters', 'platform/graphics/transforms', 'platform/image-decoders', 'platform/image-decoders/bmp', @@ -135,7 +137,11 @@ webcore_dirs = [ 'plugins', 'rendering', 'rendering/style', - 'storage', + 'storage', + 'svg', + 'svg/animation', + 'svg/graphics', + 'svg/graphics/filters', 'websockets', 'xml' ] @@ -168,7 +174,7 @@ if building_on_win32: create_hash_table = get_output('cygpath --unix "%s"' % create_hash_table) os.environ['CREATE_HASH_TABLE'] = create_hash_table -feature_defines = ['ENABLE_DATABASE', 'ENABLE_XSLT', 'ENABLE_JAVASCRIPT_DEBUGGER'] +feature_defines = ['ENABLE_DATABASE', 'ENABLE_XSLT', 'ENABLE_JAVASCRIPT_DEBUGGER', 'ENABLE_SVG', 'ENABLE_SVG_USE', 'ENABLE_FILTERS', 'ENABLE_SVG_FONTS', 'ENABLE_SVG_ANIMATION', 'ENABLE_SVG_AS_IMAGE'] msvc_version = 'msvc2008' |