diff options
| -rw-r--r-- | DEPS | 2 | ||||
| -rw-r--r-- | webkit/glue/webview_impl.cc | 3 | ||||
| -rwxr-xr-x | webkit/tools/layout_tests/test_expectations.txt | 4 |
3 files changed, 7 insertions, 2 deletions
@@ -1,7 +1,7 @@ vars = { "webkit_trunk": "http://svn.webkit.org/repository/webkit/trunk", - "webkit_revision": "48747", + "webkit_revision": "48766", "ffmpeg_revision": "26428", } diff --git a/webkit/glue/webview_impl.cc b/webkit/glue/webview_impl.cc index 409d766..6900853 100644 --- a/webkit/glue/webview_impl.cc +++ b/webkit/glue/webview_impl.cc @@ -410,7 +410,8 @@ WebViewImpl::WebViewImpl(WebViewDelegate* delegate) &context_menu_client_impl_, &editor_client_impl_, &drag_client_impl_, - &inspector_client_impl_)); + &inspector_client_impl_, + NULL)); page_->backForwardList()->setClient(&back_forward_list_client_impl_); page_->setGroupName(kPageGroupName); diff --git a/webkit/tools/layout_tests/test_expectations.txt b/webkit/tools/layout_tests/test_expectations.txt index ec7c938..336286b 100755 --- a/webkit/tools/layout_tests/test_expectations.txt +++ b/webkit/tools/layout_tests/test_expectations.txt @@ -2351,3 +2351,7 @@ BUG_DGLAZKOV : LayoutTests/http/tests/xmlhttprequest/xmlhttprequest-abort-readyS // WebKit update 48734:48747 BUG_LEVIN : LayoutTests/platform/gtk/scrollbars/overflow-scrollbar-horizontal-wheel-scroll.html = TIMEOUT + +// WebKit update 48747:48766 +BUG_LEVIN : LayoutTests/fast/dom/timer-clear-interval-in-handler-and-generate-error.html = FAIL +BUG_LEVIN WIN LINUX : LayoutTests/editing/pasteboard/5478250.html = FAIL |