diff options
| author | dglazkov@google.com <dglazkov@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-04-06 16:12:08 +0000 |
|---|---|---|
| committer | dglazkov@google.com <dglazkov@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-04-06 16:12:08 +0000 |
| commit | a48474f220ae202e95c48a6b9b94d9397be8f4c6 (patch) | |
| tree | d920a96e035be06b85c80191859ff09c57a39536 | |
| parent | 07ecd35ee99706bf7eb834c30928aac4cad23710 (diff) | |
| download | chromium_src-a48474f220ae202e95c48a6b9b94d9397be8f4c6.zip chromium_src-a48474f220ae202e95c48a6b9b94d9397be8f4c6.tar.gz chromium_src-a48474f220ae202e95c48a6b9b94d9397be8f4c6.tar.bz2 | |
Roll out dominantScript, getGenericFontFamily patches to unfork a bunch of files, Chromium side.
R=jshin
BUG=9768
Review URL: http://codereview.chromium.org/60058
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@13157 0039d316-1c4b-4281-b951-d872f2087c98
| -rw-r--r-- | DEPS | 2 | ||||
| -rw-r--r-- | webkit/glue/webview_impl.cc | 3 | ||||
| -rw-r--r-- | webkit/tools/layout_tests/test_expectations.txt | 12 |
3 files changed, 14 insertions, 3 deletions
@@ -19,7 +19,7 @@ deps = { "http://googletest.googlecode.com/svn/trunk@214", "src/third_party/WebKit": - "/trunk/deps/third_party/WebKit@13094", + "/trunk/deps/third_party/WebKit@13156", "src/third_party/icu38": "/trunk/deps/third_party/icu38@13083", diff --git a/webkit/glue/webview_impl.cc b/webkit/glue/webview_impl.cc index 9d4fc2c..6860e09 100644 --- a/webkit/glue/webview_impl.cc +++ b/webkit/glue/webview_impl.cc @@ -150,8 +150,7 @@ class AutocompletePopupMenuClient : public WebCore::PopupMenuClient { FontDescription font_description; #if defined(OS_WIN) - theme()->systemFont(CSSValueWebkitControl, text_field->document(), - font_description); + theme()->systemFont(CSSValueWebkitControl, font_description); #else NOTIMPLEMENTED(); #endif diff --git a/webkit/tools/layout_tests/test_expectations.txt b/webkit/tools/layout_tests/test_expectations.txt index 390b3c7..e855b57 100644 --- a/webkit/tools/layout_tests/test_expectations.txt +++ b/webkit/tools/layout_tests/test_expectations.txt @@ -2287,3 +2287,15 @@ DEBUG WIN : LayoutTests/http/tests/navigation/post-basic.html = CRASH // Flaky since rev 13111. MAC : LayoutTests/fast/events/standalone-image-drag-to-editable.html = FAIL PASS + +// These tests were affected by rolling out WebKit i8n patches. +DEFER BUG9768 : LayoutTests/fast/block/positioning/047.html = FAIL +DEFER BUG9768 : LayoutTests/fast/css/rtl-ordering.html = FAIL +DEFER BUG9768 : LayoutTests/fast/forms/select-initial-position.html = FAIL +DEFER BUG9768 : LayoutTests/fast/forms/select-visual-hebrew.html = FAIL +DEFER BUG9768 : LayoutTests/fast/forms/visual-hebrew-text-field.html = FAIL +DEFER BUG9768 : LayoutTests/fast/text/cg-fallback-bolding.html = FAIL +DEFER BUG9768 : LayoutTests/fast/text/international/001.html = FAIL +DEFER BUG9768 : LayoutTests/fast/text/international/002.html = FAIL +DEFER BUG9768 : LayoutTests/fast/text/international/003.html = FAIL +DEFER BUG9768 : LayoutTests/fast/text/international/wrap-CJK-001.html = FAIL |