summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--DEPS2
-rw-r--r--webkit/glue/webview_impl.cc5
-rw-r--r--webkit/tools/layout_tests/test_expectations.txt2
3 files changed, 8 insertions, 1 deletions
diff --git a/DEPS b/DEPS
index 8bcabc8..5fd5333 100644
--- a/DEPS
+++ b/DEPS
@@ -1,7 +1,7 @@
vars = {
"webkit_trunk":
"http://svn.webkit.org/repository/webkit/trunk",
- "webkit_revision": "46594",
+ "webkit_revision": "46622",
}
diff --git a/webkit/glue/webview_impl.cc b/webkit/glue/webview_impl.cc
index b40f60c..dcd5764 100644
--- a/webkit/glue/webview_impl.cc
+++ b/webkit/glue/webview_impl.cc
@@ -205,6 +205,11 @@ class AutocompletePopupMenuClient : public WebCore::PopupMenuClient {
return suggestions_[list_index];
}
+ virtual WebCore::String itemToolTip(unsigned last_index) const {
+ NOTIMPLEMENTED();
+ return WebCore::String();
+ }
+
virtual bool itemIsEnabled(unsigned listIndex) const {
return true;
}
diff --git a/webkit/tools/layout_tests/test_expectations.txt b/webkit/tools/layout_tests/test_expectations.txt
index 4bb62b0..36f8fa0f 100644
--- a/webkit/tools/layout_tests/test_expectations.txt
+++ b/webkit/tools/layout_tests/test_expectations.txt
@@ -3086,3 +3086,5 @@ BUG18089 LINUX MAC : LayoutTests/http/tests/xmlhttprequest/redirect-cross-origin
BUG18089 LINUX MAC : LayoutTests/http/tests/xmlhttprequest/redirect-cross-origin-sync-double.html = FAIL
BUG18089 LINUX : LayoutTests/http/tests/xmlhttprequest/redirect-cross-origin-sync.html = FAIL
BUG18089 LINUX MAC : LayoutTests/http/tests/xmlhttprequest/xmlhttprequest-unsafe-redirect.html = FAIL
+
+BUG18143 : LayoutTests/fast/forms/button-style-color.html = FAIL