diff options
| author | agl@chromium.org <agl@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-01-29 02:55:36 +0000 |
|---|---|---|
| committer | agl@chromium.org <agl@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-01-29 02:55:36 +0000 |
| commit | 507bdd1707edb7a90971f90e9b7e654c96cbb810 (patch) | |
| tree | 6425f13022a90b750e581c80bd9ce2fbacca76b5 | |
| parent | 90d1acbc1aad659607d52d5b037c0bbb1fd3f320 (diff) | |
| download | chromium_src-507bdd1707edb7a90971f90e9b7e654c96cbb810.zip chromium_src-507bdd1707edb7a90971f90e9b7e654c96cbb810.tar.gz chromium_src-507bdd1707edb7a90971f90e9b7e654c96cbb810.tar.bz2 | |
Linux: use WebKit HEAD's gtk2drawing.c
Review URL: http://codereview.chromium.org/18053
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@8862 0039d316-1c4b-4281-b951-d872f2087c98
| -rw-r--r-- | webkit/build/WebCore/SConscript | 3 | ||||
| -rw-r--r-- | webkit/tools/test_shell/test_shell_gtk.cc | 6 |
2 files changed, 8 insertions, 1 deletions
diff --git a/webkit/build/WebCore/SConscript b/webkit/build/WebCore/SConscript index 553b45e..c37fd25 100644 --- a/webkit/build/WebCore/SConscript +++ b/webkit/build/WebCore/SConscript @@ -931,7 +931,6 @@ if env.Bit('linux'): # Linux specific implementations. input_files.extend([ '$WEBCORE_DIR/platform/chromium/FileSystemChromiumLinux.cpp', - '$WEBCORE_DIR/platform/chromium/gtk2drawing.c', '$WEBCORE_DIR/platform/chromium/KeyCodeConversionGtk.cpp', '$WEBCORE_DIR/platform/chromium/ScrollbarThemeChromiumLinux.cpp', '$WEBCORE_DIR/platform/chromium/SoundChromiumPosix.cpp', @@ -943,6 +942,8 @@ if env.Bit('linux'): '$WEBCORE_DIR/platform/graphics/chromium/IconChromiumLinux.cpp', '$WEBCORE_DIR/platform/graphics/chromium/SimpleFontDataLinux.cpp', + '$WEBCORE_DIR/platform/gtk/gtk2drawing.c', + '$WEBCORE_DIR/rendering/RenderThemeChromiumGtk.cpp', ]) # Remove from the list files that haven't yet been made portable to Linux. diff --git a/webkit/tools/test_shell/test_shell_gtk.cc b/webkit/tools/test_shell/test_shell_gtk.cc index d910329..b7ecfcd 100644 --- a/webkit/tools/test_shell/test_shell_gtk.cc +++ b/webkit/tools/test_shell/test_shell_gtk.cc @@ -50,11 +50,17 @@ static FilePath* g_ahem_path = NULL; } +extern "C" { + extern gint moz_gtk_init(); +} + // static void TestShell::InitializeTestShell(bool layout_test_mode) { window_list_ = new WindowList; layout_test_mode_ = layout_test_mode; + moz_gtk_init(); + web_prefs_ = new WebPreferences; g_resource_data_pack = new base::DataPack; |