diff options
| -rw-r--r-- | DEPS | 2 | ||||
| -rw-r--r-- | webkit/glue/webframeloaderclient_impl.cc | 8 | ||||
| -rw-r--r-- | webkit/tools/layout_tests/test_expectations.txt | 9 |
3 files changed, 12 insertions, 7 deletions
@@ -1,7 +1,7 @@ vars = { "webkit_trunk": "http://svn.webkit.org/repository/webkit/trunk", - "webkit_revision": "49278", + "webkit_revision": "49309", "ffmpeg_revision": "27457", } diff --git a/webkit/glue/webframeloaderclient_impl.cc b/webkit/glue/webframeloaderclient_impl.cc index 4343fd8..8ee9f7c 100644 --- a/webkit/glue/webframeloaderclient_impl.cc +++ b/webkit/glue/webframeloaderclient_impl.cc @@ -759,7 +759,7 @@ void WebFrameLoaderClient::dispatchDecidePolicyForMIMEType( } // NOTE: ERR_POLICY_CHANGE will be generated when action is not PolicyUse. - (webframe_->frame()->loader()->*function)(action); + (webframe_->frame()->loader()->policyChecker()->*function)(action); } void WebFrameLoaderClient::dispatchDecidePolicyForNewWindowAction( @@ -784,7 +784,7 @@ void WebFrameLoaderClient::dispatchDecidePolicyForNewWindowAction( // to keep this state. next_navigation_policy_ = navigation_policy; } - (webframe_->frame()->loader()->*function)(policy_action); + (webframe_->frame()->loader()->policyChecker()->*function)(policy_action); } void WebFrameLoaderClient::dispatchDecidePolicyForNavigationAction( @@ -836,7 +836,7 @@ void WebFrameLoaderClient::dispatchDecidePolicyForNavigationAction( } } - (webframe_->frame()->loader()->*function)(policy_action); + (webframe_->frame()->loader()->policyChecker()->*function)(policy_action); } void WebFrameLoaderClient::cancelPolicyCheck() { @@ -853,7 +853,7 @@ void WebFrameLoaderClient::dispatchWillSubmitForm(FramePolicyFunction function, webframe_->client()->willSubmitForm( webframe_, webkit_glue::HTMLFormElementToWebForm(form_ref->form())); } - (webframe_->frame()->loader()->*function)(PolicyUse); + (webframe_->frame()->loader()->policyChecker()->*function)(PolicyUse); } void WebFrameLoaderClient::dispatchDidLoadMainResource(DocumentLoader*) { diff --git a/webkit/tools/layout_tests/test_expectations.txt b/webkit/tools/layout_tests/test_expectations.txt index 75686887..d15eaea 100644 --- a/webkit/tools/layout_tests/test_expectations.txt +++ b/webkit/tools/layout_tests/test_expectations.txt @@ -716,7 +716,7 @@ BUG4363 LINUX MAC SKIP : LayoutTests/http/tests/security/local-video-src-from-re BUG13907 SKIP : LayoutTests/accessibility/media-element.html = TIMEOUT BUG13907 SKIP : LayoutTests/http/tests/security/local-video-source-from-remote.html = FAIL BUG13907 SKIP : LayoutTests/http/tests/media = FAIL -BUG13907 : LayoutTests/media/audio-constructor-autobuffer.html = FAIL +BUG13907 : LayoutTests/media/audio-constructor-autobuffer.html = FAIL TIMEOUT BUG13907 : LayoutTests/media/audio-constructor-src.html = TIMEOUT BUG13907 : LayoutTests/media/audio-delete-while-slider-thumb-clicked.html = PASS FAIL CRASH BUG13907 : LayoutTests/media/audio-delete-while-step-button-clicked.html = FAIL @@ -3141,9 +3141,14 @@ BUG_AA : LayoutTests/http/tests/security/isolatedWorld/string-prototype.html = F BUG_AA : LayoutTests/http/tests/security/isolatedWorld/window-properties.html = FAIL BUG_AA : LayoutTests/http/tests/security/isolatedWorld/window-setTimeout-function.html = TIMEOUT BUG_AA : LayoutTests/http/tests/security/isolatedWorld/window-setTimeout-string.html = TIMEOUT -BUG_AA SKIP : LayoutTests/http/tests/security/isolatedWorld/iframe.html = FAIL BUG_JOHNNYG : LayoutTests/http/tests/globalhistory/history-delegate-basic-title.html = FAIL BUG_JOHNNYG WIN DEBUG : LayoutTests/fast/frames/onlyCommentInIFrame.html = FAIL BUG_24308 MAC : LayoutTests/http/tests/navigation/back-send-referrer.html = PASS TIMEOUT + +// Webkit roll 49278-49309 +BUG_JOHNNYG : LayoutTests/media/media-load-event.html = FAIL +BUG_JOHNNYG : LayoutTests/media/progress-event-at-least-one.html = FAIL +BUG_JOHNNYG : LayoutTests/media/audio-constructor.html = TIMEOUT + |