Skip to content

GitLab

T
tangled
Commit 5f9b871d authored by jcivelli@chromium.org's avatar jcivelli@chromium.org
Browse files
Options

Adding base URL to the frame committed message. 

Adding the base URL to the frame committed message.

BUG=None
TEST=See browser test RenderViewHostTest.BaseURLParam


Review URL: http://codereview.chromium.org/8584010

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@111333 0039d316-1c4b-4281-b951-d872f2087c98
parent a9c36832
Hide whitespace changes
Inline Side-by-side
Showing with 55 additions and 0 deletions
chrome/test/data/google.mht 0 → 100644
View file @ 5f9b871d
From: <Saved by UnMHT>
Subject: The Google
Date: Mon, Nov 21 2011 10:59:06 GMT-0800
MIME-Version: 1.0
Content-Type: multipart/related;
boundary="----=_NextPart_000_0000_0324C3DC.A3C79392";
type="text/html"
------=_NextPart_000_0000_0324C3DC.A3C79392
Content-Type: text/html; charset="UTF-8"
Content-Transfer-Encoding: quoted-printable
Content-Location: http://www.google.com/
<html>
Welcome to the Google!
</html>
------=_NextPart_000_0000_0324C3DC.A3C79392--
content/browser/renderer_host/render_view_host_browsertest.cc
View file @ 5f9b871d
......@@ -14,6 +14,7 @@
#include "content/common/view_messages.h"
#include "content/public/browser/notification_types.h"
#include "net/base/host_port_pair.h"
#include "net/base/net_util.h"
#include "net/test/test_server.h"
class RenderViewHostTest : public InProcessBrowserTest {
......@@ -171,6 +172,7 @@ class RenderViewHostTestTabContentsObserver : public TabContentsObserver {
const content::LoadCommittedDetails& details,
const content::FrameNavigateParams& params) OVERRIDE {
observed_socket_address_ = params.socket_address;
base_url_ = params.base_url;
++navigation_count_;
}
......@@ -178,10 +180,15 @@ class RenderViewHostTestTabContentsObserver : public TabContentsObserver {
return observed_socket_address_;
}
GURL base_url() const {
return base_url_;
}
int navigation_count() const { return navigation_count_; }
private:
net::HostPortPair observed_socket_address_;
GURL base_url_;
int navigation_count_;
DISALLOW_COPY_AND_ASSIGN(RenderViewHostTestTabContentsObserver);
......@@ -199,3 +206,23 @@ IN_PROC_BROWSER_TEST_F(RenderViewHostTest, FrameNavigateSocketAddress) {
observer.observed_socket_address().ToString());
EXPECT_EQ(1, observer.navigation_count());
}
// TODO(jcivelli): temporarily disabled while I figure-out why the EOL is
// getting messed-up in google.mht (causing it to fail to load).
IN_PROC_BROWSER_TEST_F(RenderViewHostTest, DISABLED_BaseURLParam) {
ASSERT_TRUE(test_server()->Start());
RenderViewHostTestTabContentsObserver observer(
browser()->GetSelectedTabContents());
// Base URL is not set if it is the same as the URL.
GURL test_url = test_server()->GetURL("files/simple.html");
ui_test_utils::NavigateToURL(browser(), test_url);
EXPECT_TRUE(observer.base_url().is_empty());
EXPECT_EQ(1, observer.navigation_count());
// But should be set to the original page when reading MHTML.
test_url = net::FilePathToFileURL(test_server()->document_root().Append(
FILE_PATH_LITERAL("google.mht")));
ui_test_utils::NavigateToURL(browser(), test_url);
EXPECT_EQ("http://www.google.com/", observer.base_url().spec());
}
content/common/view_messages.h
View file @ 5f9b871d
......@@ -251,6 +251,7 @@ IPC_STRUCT_TRAITS_END()
IPC_STRUCT_TRAITS_BEGIN(content::FrameNavigateParams)
IPC_STRUCT_TRAITS_MEMBER(page_id)
IPC_STRUCT_TRAITS_MEMBER(url)
IPC_STRUCT_TRAITS_MEMBER(base_url)
IPC_STRUCT_TRAITS_MEMBER(referrer)
IPC_STRUCT_TRAITS_MEMBER(transition)
IPC_STRUCT_TRAITS_MEMBER(redirects)
......
content/public/common/frame_navigate_params.h
View file @ 5f9b871d
......@@ -31,6 +31,13 @@ struct CONTENT_EXPORT FrameNavigateParams {
// URL of the page being loaded.
GURL url;
// The base URL for the page's document when the frame was committed. Empty if
// similar to 'url' above. Note that any base element in the page has not been
// parsed yet and is therefore not reflected.
// This is of interest when a MHTML file is loaded, as the base URL has been
// set to original URL of the site the MHTML represents.
GURL base_url;
// URL of the referrer of this load. WebKit generates this based on the
// source of the event that caused the load.
GURL referrer;
......
content/renderer/render_view_impl.cc
View file @ 5f9b871d
......@@ -1059,6 +1059,9 @@ void RenderViewImpl::UpdateURL(WebFrame* frame) {
params.url = request.url();
}
if (frame->document().baseURL() != params.url)
params.base_url = frame->document().baseURL();
GetRedirectChain(ds, &params.redirects);
params.should_update_history = !ds->hasUnreachableURL() &&
!response.isMultipartPayload() && (response.httpStatusCode() != 404);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment