diff options
| -rw-r--r-- | DEPS | 2 | ||||
| -rw-r--r-- | WEBKIT_MERGE_REVISION | 2 | ||||
| -rw-r--r-- | webkit/build/WebCore/SConscript | 2 |
3 files changed, 3 insertions, 3 deletions
@@ -1,7 +1,7 @@ vars = { "webkit_trunk": "http://svn.webkit.org/repository/webkit/trunk", - "webkit_revision": "41402", + "webkit_revision": "41420", } diff --git a/WEBKIT_MERGE_REVISION b/WEBKIT_MERGE_REVISION index c257d12..6a56d94 100644 --- a/WEBKIT_MERGE_REVISION +++ b/WEBKIT_MERGE_REVISION @@ -1 +1 @@ -http://svn.webkit.org/repository/webkit/trunk@41402
\ No newline at end of file +http://svn.webkit.org/repository/webkit/trunk@41420
\ No newline at end of file diff --git a/webkit/build/WebCore/SConscript b/webkit/build/WebCore/SConscript index ed4afbc..b1d724b 100644 --- a/webkit/build/WebCore/SConscript +++ b/webkit/build/WebCore/SConscript @@ -959,7 +959,7 @@ if env.Bit('linux'): '$WEBCORE_DIR/platform/graphics/chromium/IconChromiumLinux.cpp', '$WEBCORE_DIR/platform/graphics/chromium/SimpleFontDataLinux.cpp', - '$WEBCORE_DIR/rendering/RenderThemeChromiumGtk.cpp', + '$WEBCORE_DIR/rendering/RenderThemeChromiumLinux.cpp', ]) # Remove from the list files that haven't yet been made portable to Linux. to_be_ported_files = [ |