diff options
| author | brettw@chromium.org <brettw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-03-04 20:15:54 +0000 |
|---|---|---|
| committer | brettw@chromium.org <brettw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-03-04 20:15:54 +0000 |
| commit | 3a2dcf02f9bcfbb257bd8e59d9c5ac0e0ca06331 (patch) | |
| tree | 853a60ae1363f93dd2d0d288c323a393d15934d8 | |
| parent | d07e600c5b6ce21802b5c576d180011433351700 (diff) | |
| download | chromium_src-3a2dcf02f9bcfbb257bd8e59d9c5ac0e0ca06331.zip chromium_src-3a2dcf02f9bcfbb257bd8e59d9c5ac0e0ca06331.tar.gz chromium_src-3a2dcf02f9bcfbb257bd8e59d9c5ac0e0ca06331.tar.bz2 | |
Chrome side of WebKit merge 41402:41420
Review URL: http://codereview.chromium.org/39139
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@10911 0039d316-1c4b-4281-b951-d872f2087c98
| -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 = [ |