diff options
| author | antonm@chromium.org <antonm@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-01-05 18:51:30 +0000 |
|---|---|---|
| committer | antonm@chromium.org <antonm@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-01-05 18:51:30 +0000 |
| commit | a6d0e407f1a0a3776ab89e0376c2e28853b3300c (patch) | |
| tree | cda853fbd2c49affa6bd14e074fdd806188bc4b9 | |
| parent | 97365aed3a622822ee6f49e0bbe6b184b4274779 (diff) | |
| download | chromium_src-a6d0e407f1a0a3776ab89e0376c2e28853b3300c.zip chromium_src-a6d0e407f1a0a3776ab89e0376c2e28853b3300c.tar.gz chromium_src-a6d0e407f1a0a3776ab89e0376c2e28853b3300c.tar.bz2 | |
WebKit roll 52769 -> 52793.
Review URL: http://codereview.chromium.org/523053
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@35541 0039d316-1c4b-4281-b951-d872f2087c98
| -rw-r--r-- | DEPS | 2 | ||||
| -rw-r--r-- | chrome/renderer/render_view_unittest.cc | 4 |
2 files changed, 3 insertions, 3 deletions
@@ -1,7 +1,7 @@ vars = { "webkit_trunk": "http://svn.webkit.org/repository/webkit/trunk", - "webkit_revision": "52769", + "webkit_revision": "52793", "ffmpeg_revision": "34297", "skia_revision": "470", "chromium_git": "http://src.chromium.org/git", diff --git a/chrome/renderer/render_view_unittest.cc b/chrome/renderer/render_view_unittest.cc index 51f2a3c..d5a4335 100644 --- a/chrome/renderer/render_view_unittest.cc +++ b/chrome/renderer/render_view_unittest.cc @@ -22,7 +22,7 @@ using WebKit::WebString; using WebKit::WebTextDirection; using WebKit::WebURLError; -#if !defined(OS_LINUX) +#if 0 // !defined(OS_LINUX) static WebCompositionCommand ToCompositionCommand(int string_type) { switch (string_type) { default: @@ -144,7 +144,7 @@ TEST_F(RenderViewTest, OnImeStateChanged) { // RenderWidget class, but also call some RenderWidget members, e.g. // ExecuteJavaScript(), RenderWidget::OnSetFocus(), etc. // Disabled on Linux: http://crbug.com/27927 -#if !defined(OS_LINUX) +#if 0 // !defined(OS_LINUX) TEST_F(RenderViewTest, ImeComposition) { enum ImeCommand { IME_INITIALIZE, |