diff options
| -rw-r--r-- | DEPS | 2 | ||||
| -rw-r--r-- | webkit/build/WebCore/SConscript | 3 | ||||
| -rw-r--r-- | webkit/tools/test_shell/test_shell_gtk.cc | 6 |
3 files changed, 2 insertions, 9 deletions
@@ -12,7 +12,7 @@ deps = { "http://googletest.googlecode.com/svn/trunk@167", "src/third_party/WebKit": - "/trunk/deps/third_party/WebKit@8865", + "/trunk/deps/third_party/WebKit@8876", "src/third_party/icu38": "/trunk/deps/third_party/icu38@7525", diff --git a/webkit/build/WebCore/SConscript b/webkit/build/WebCore/SConscript index c37fd25..553b45e 100644 --- a/webkit/build/WebCore/SConscript +++ b/webkit/build/WebCore/SConscript @@ -931,6 +931,7 @@ 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', @@ -942,8 +943,6 @@ 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 b7ecfcd..d910329 100644 --- a/webkit/tools/test_shell/test_shell_gtk.cc +++ b/webkit/tools/test_shell/test_shell_gtk.cc @@ -50,17 +50,11 @@ 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; |