From e38f40150dac6e0af08e3cdcfb1e502a2223c87c Mon Sep 17 00:00:00 2001 From: "brettw@google.com" Date: Fri, 12 Sep 2008 23:08:30 +0000 Subject: Revert the change that fixed the encoding when viewing source in subframes. This makes view source for some pages (for example Google Reader) not work properly. I speculate that telling WebKit to change the encoding (which causes a reload) right after starting the real load makes it confused. Review URL: http://codereview.chromium.org/3022 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@2143 0039d316-1c4b-4281-b951-d872f2087c98 --- chrome/common/render_messages.h | 7 +------ chrome/common/render_messages_internal.h | 4 ++-- 2 files changed, 3 insertions(+), 8 deletions(-) (limited to 'chrome/common') diff --git a/chrome/common/render_messages.h b/chrome/common/render_messages.h index a47b05b..e39b392e 100644 --- a/chrome/common/render_messages.h +++ b/chrome/common/render_messages.h @@ -150,9 +150,6 @@ struct ViewHostMsg_ContextMenu_Params { // These flags indicate to the browser whether the renderer believes it is // able to perform the corresponding action. int edit_flags; - - // |frame_encoding|indicates the encoding of current focused sub frame. - std::string frame_encoding; }; // Values that may be OR'd together to form the 'flags' parameter of a @@ -769,7 +766,6 @@ struct ParamTraits { WriteParam(m, p.misspelled_word); WriteParam(m, p.dictionary_suggestions); WriteParam(m, p.edit_flags); - WriteParam(m, p.frame_encoding); } static bool Read(const Message* m, void** iter, param_type* p) { return @@ -783,8 +779,7 @@ struct ParamTraits { ReadParam(m, iter, &p->selection_text) && ReadParam(m, iter, &p->misspelled_word) && ReadParam(m, iter, &p->dictionary_suggestions) && - ReadParam(m, iter, &p->edit_flags) && - ReadParam(m, iter, &p->frame_encoding); + ReadParam(m, iter, &p->edit_flags); } static void Log(const param_type& p, std::wstring* l) { l->append(L""); diff --git a/chrome/common/render_messages_internal.h b/chrome/common/render_messages_internal.h index f6c595d..66941ef 100644 --- a/chrome/common/render_messages_internal.h +++ b/chrome/common/render_messages_internal.h @@ -229,7 +229,7 @@ IPC_BEGIN_MESSAGES(View, 1) // Change encoding of page in the renderer. IPC_MESSAGE_ROUTED1(ViewMsg_SetPageEncoding, - std::string /*new encoding name*/) + std::wstring /*new encoding name*/) // Inspect the element at the specified coordinates IPC_MESSAGE_ROUTED2(ViewMsg_InspectElement, @@ -529,7 +529,7 @@ IPC_BEGIN_MESSAGES(ViewHost, 2) // Change the encoding name of the page in UI when the page has detected proper // encoding name. IPC_MESSAGE_ROUTED1(ViewHostMsg_UpdateEncoding, - std::string /* new encoding name */) + std::wstring /* new encoding name */) // Notifies the browser that we want to show a destination url for a potential // action (e.g. when the user is hovering over a link). -- cgit v1.1