summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--DEPS2
-rw-r--r--webkit/build/WebCore/SConscript3
2 files changed, 3 insertions, 2 deletions
diff --git a/DEPS b/DEPS
index 04eba95..17e46c0 100644
--- a/DEPS
+++ b/DEPS
@@ -12,7 +12,7 @@ deps = {
"http://googletest.googlecode.com/svn/trunk@167",
"src/third_party/WebKit":
- "/trunk/deps/third_party/WebKit@7944",
+ "/trunk/deps/third_party/WebKit@7958",
"src/third_party/icu38":
"/trunk/deps/third_party/icu38@7525",
diff --git a/webkit/build/WebCore/SConscript b/webkit/build/WebCore/SConscript
index 8bb8a57..be7e4f0 100644
--- a/webkit/build/WebCore/SConscript
+++ b/webkit/build/WebCore/SConscript
@@ -909,7 +909,6 @@ if env.Bit('linux'):
'$WEBCORE_DIR/platform/chromium/FileSystemChromiumLinux.cpp',
'$WEBCORE_DIR/platform/chromium/gtk2drawing.c',
'$WEBCORE_DIR/platform/chromium/KeyCodeConversionGtk.cpp',
- '$WEBCORE_DIR/platform/chromium/RenderThemeGtk.cpp',
'$WEBCORE_DIR/platform/chromium/ScrollbarThemeChromiumLinux.cpp',
'$WEBCORE_DIR/platform/chromium/SoundChromiumPosix.cpp',
@@ -919,6 +918,8 @@ if env.Bit('linux'):
'$WEBCORE_DIR/platform/graphics/chromium/GlyphPageTreeNodeLinux.cpp',
'$WEBCORE_DIR/platform/graphics/chromium/IconChromiumLinux.cpp',
'$WEBCORE_DIR/platform/graphics/chromium/SimpleFontDataLinux.cpp',
+
+ '$WEBCORE_DIR/rendering/RenderThemeChromiumGtk.cpp',
])
# Remove from the list files that haven't yet been made portable to Linux.
to_be_ported_files = [