diff options
4 files changed, 31 insertions, 26 deletions
diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/forms/mailto/advanced-get-expected.txt b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/forms/mailto/advanced-get-expected.txt deleted file mode 100644 index 5a1ff4d..0000000 --- a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/forms/mailto/advanced-get-expected.txt +++ /dev/null @@ -1,4 +0,0 @@ -Policy delegate: attempt to load mailto:?to=to1%40site.com%2Cto2%40site.com%2Cto3%40site.com&cc=cc1%40site.com%2Ccc2%40site.com%2Ccc3%40site.com&bcc=bcc1%40site.com%2Cbcc2%40site.com%2Cbcc3%40site.com&subject=m%26m%3B%3F%3D&body=line1%0D%0Aline2%0D%0Aline3%0D%0Aline4 -Press Compose button and check that the created e-mail has correct headers and body. - - diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/forms/mailto/advanced-put-expected.txt b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/forms/mailto/advanced-put-expected.txt deleted file mode 100644 index 5a1ff4d..0000000 --- a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/forms/mailto/advanced-put-expected.txt +++ /dev/null @@ -1,4 +0,0 @@ -Policy delegate: attempt to load mailto:?to=to1%40site.com%2Cto2%40site.com%2Cto3%40site.com&cc=cc1%40site.com%2Ccc2%40site.com%2Ccc3%40site.com&bcc=bcc1%40site.com%2Cbcc2%40site.com%2Cbcc3%40site.com&subject=m%26m%3B%3F%3D&body=line1%0D%0Aline2%0D%0Aline3%0D%0Aline4 -Press Compose button and check that the created e-mail has correct headers and body. - - diff --git a/webkit/tools/layout_tests/test_lists/tests_fixable.txt b/webkit/tools/layout_tests/test_lists/tests_fixable.txt index 6801a30..1362133 100644 --- a/webkit/tools/layout_tests/test_lists/tests_fixable.txt +++ b/webkit/tools/layout_tests/test_lists/tests_fixable.txt @@ -1932,22 +1932,6 @@ LayoutTests/animations/keyframes-from-missing.html = FAIL LayoutTests/animations/keyframes-rule.html = FAIL LayoutTests/animations/keyframes-to-missing.html = FAIL LayoutTests/fast/dom/object-embed-plugin-scripting.html = FAIL -LayoutTests/fast/encoding/mailto-always-utf-8.html = FAIL -LayoutTests/fast/forms/mailto/get-multiple-items-text-plain.html = FAIL -LayoutTests/fast/forms/mailto/get-multiple-items-x-www-form-urlencoded.html = FAIL -LayoutTests/fast/forms/mailto/get-multiple-items.html = FAIL -LayoutTests/fast/forms/mailto/get-non-ascii-always-utf-8.html = FAIL -LayoutTests/fast/forms/mailto/get-non-ascii-text-plain-latin-1.html = FAIL -LayoutTests/fast/forms/mailto/get-non-ascii-text-plain.html = FAIL -LayoutTests/fast/forms/mailto/get-non-ascii.html = FAIL -LayoutTests/fast/forms/mailto/get-overwrite-query.html = FAIL -LayoutTests/fast/forms/mailto/post-append-query.html = FAIL -LayoutTests/fast/forms/mailto/post-multiple-items-multipart-form-data.html = FAIL -LayoutTests/fast/forms/mailto/post-multiple-items-text-plain.html = FAIL -LayoutTests/fast/forms/mailto/post-multiple-items-x-www-form-urlencoded.html = FAIL -LayoutTests/fast/forms/mailto/post-multiple-items.html = FAIL -LayoutTests/fast/forms/mailto/post-text-plain-with-accept-charset.html = FAIL -LayoutTests/fast/forms/mailto/post-text-plain.html = FAIL LayoutTests/fast/js/regexp-no-extensions.html = FAIL LayoutTests/fast/regex/quantified-assertions.html = FAIL LayoutTests/http/tests/security/feed-urls-from-remote.html = FAIL diff --git a/webkit/tools/test_shell/test_webview_delegate.cc b/webkit/tools/test_shell/test_webview_delegate.cc index 9e79b30..cc56330 100644 --- a/webkit/tools/test_shell/test_webview_delegate.cc +++ b/webkit/tools/test_shell/test_webview_delegate.cc @@ -36,6 +36,15 @@ namespace { +// WebNavigationType debugging strings taken from PolicyDelegate.mm. +const char* kLinkClickedString = "link clicked"; +const char* kFormSubmittedString = "form submitted"; +const char* kBackForwardString = "back/forward"; +const char* kReloadString = "reload"; +const char* kFormResubmittedString = "form resubmitted"; +const char* kOtherString = "other"; +const char* kIllegalString = "illegal value"; + int next_page_id_ = 1; // Used to write a platform neutral file:/// URL by only taking the filename @@ -56,6 +65,25 @@ void AddDRTFakeFileToDataObject(WebDropData* drop_data) { drop_data->filenames.push_back(L"DRTFakeFile"); } +// Get a debugging string from a WebNavigationType. +const char* WebNavigationTypeToString(WebNavigationType type) { + switch (type) { + case WebNavigationTypeLinkClicked: + return kLinkClickedString; + case WebNavigationTypeFormSubmitted: + return kFormSubmittedString; + case WebNavigationTypeBackForward: + return kBackForwardString; + case WebNavigationTypeReload: + return kReloadString; + case WebNavigationTypeFormResubmitted: + return kFormResubmittedString; + case WebNavigationTypeOther: + return kOtherString; + } + return kIllegalString; +} + } // namespace // WebViewDelegate ----------------------------------------------------------- @@ -102,8 +130,8 @@ WindowOpenDisposition TestWebViewDelegate::DispositionForNavigationAction( bool is_redirect) { if (is_custom_policy_delegate_) { std::wstring frame_name = frame->GetName(); - printf("Policy delegate: attempt to load %s\n", - request->GetURL().spec().c_str()); + printf("Policy delegate: attempt to load %s with navigation type '%s'\n", + request->GetURL().spec().c_str(), WebNavigationTypeToString(type)); return IGNORE_ACTION; } else { return WebViewDelegate::DispositionForNavigationAction( @@ -111,6 +139,7 @@ WindowOpenDisposition TestWebViewDelegate::DispositionForNavigationAction( } } + void TestWebViewDelegate::SetCustomPolicyDelegate(bool isCustom) { is_custom_policy_delegate_ = isCustom; } |