From 72c94f309664498277eee70eeccc05b44f0f255a Mon Sep 17 00:00:00 2001 From: "jnd@google.com" Date: Mon, 18 Aug 2008 21:24:29 +0000 Subject: The CL is consist of CLs(1624,1580) for bug:1281734 which are reviewed and LG by brett. I just merge them to single one for passing compilation. The CL is to fix bug http://b/issue?id=1281734. FireFox uses encoding used by the original webpage to decode the source of the webpage, Chrome does not. We need to add a new parameter which carries the override encoding when opening a view-source URL for viewing its source. git-svn-id: svn://svn.chromium.org/chrome/trunk/src@997 0039d316-1c4b-4281-b951-d872f2087c98 --- webkit/tools/test_shell/test_webview_delegate.cc | 3 ++- webkit/tools/test_shell/test_webview_delegate.h | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) (limited to 'webkit/tools/test_shell') diff --git a/webkit/tools/test_shell/test_webview_delegate.cc b/webkit/tools/test_shell/test_webview_delegate.cc index 231415f..3e23252 100644 --- a/webkit/tools/test_shell/test_webview_delegate.cc +++ b/webkit/tools/test_shell/test_webview_delegate.cc @@ -507,7 +507,8 @@ void TestWebViewDelegate::ShowContextMenu(WebView* webview, const GURL& frame_url, const std::wstring& selection_text, const std::wstring& misspelled_word, - int edit_flags) { + int edit_flags, + const std::wstring& frame_encoding) { CapturedContextMenuEvent context(type, x, y); captured_context_menu_events_.push_back(context); } diff --git a/webkit/tools/test_shell/test_webview_delegate.h b/webkit/tools/test_shell/test_webview_delegate.h index 9a6f5e7..e21ee53 100644 --- a/webkit/tools/test_shell/test_webview_delegate.h +++ b/webkit/tools/test_shell/test_webview_delegate.h @@ -115,7 +115,8 @@ class TestWebViewDelegate : public base::RefCounted, public const GURL& frame_url, const std::wstring& selection_text, const std::wstring& misspelled_word, - int edit_flags); + int edit_flags, + const std::wstring& frame_encoding); virtual void DidStartProvisionalLoadForFrame( WebView* webview, WebFrame* frame, -- cgit v1.1