Commit 9a03b9d4 authored by Hiroki Nakagawa's avatar Hiroki Nakagawa Committed by Chromium LUCI CQ

NoStatePrefetch: Remove PrerenderContents::SetPrerenderMode()

PrerenderContents::SetPrerenderMode() is called with
mojom::PrerenderMode::kPrefetchOnly right after an instance of
PrerenderContents is constructed. For code simplification, that should
be set in the constructor instead of the public setter function.

Historically, the setter function was meaningful because that can be
called with another value of mojom::PrerenderMode ("kPrerender") but
that was removed due to deprecation of the legacy prerender.

Bug: 755921
Change-Id: I01d9987765411ef79d8596c71a14d3d9674dcbd9
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2589574Reviewed-by: default avatarMatt Falkenhagen <falken@chromium.org>
Commit-Queue: Hiroki Nakagawa <nhiroki@chromium.org>
Cr-Commit-Position: refs/heads/master@{#837039}
parent 3d3fc6cf
...@@ -129,8 +129,7 @@ PrerenderContents::PrerenderContents( ...@@ -129,8 +129,7 @@ PrerenderContents::PrerenderContents(
const content::Referrer& referrer, const content::Referrer& referrer,
const base::Optional<url::Origin>& initiator_origin, const base::Optional<url::Origin>& initiator_origin,
Origin origin) Origin origin)
: prerender_mode_(prerender::mojom::PrerenderMode::kNoPrerender), : prerendering_has_started_(false),
prerendering_has_started_(false),
prerender_manager_(prerender_manager), prerender_manager_(prerender_manager),
delegate_(std::move(delegate)), delegate_(std::move(delegate)),
prerender_url_(url), prerender_url_(url),
...@@ -170,11 +169,6 @@ bool PrerenderContents::Init() { ...@@ -170,11 +169,6 @@ bool PrerenderContents::Init() {
return AddAliasURL(prerender_url_); return AddAliasURL(prerender_url_);
} }
void PrerenderContents::SetPrerenderMode(prerender::mojom::PrerenderMode mode) {
DCHECK(!prerendering_has_started_);
prerender_mode_ = mode;
}
// static // static
PrerenderContents::Factory* PrerenderContents::CreateFactory() { PrerenderContents::Factory* PrerenderContents::CreateFactory() {
return new PrerenderContentsFactoryImpl(); return new PrerenderContentsFactoryImpl();
......
...@@ -111,9 +111,6 @@ class PrerenderContents : public content::NotificationObserver, ...@@ -111,9 +111,6 @@ class PrerenderContents : public content::NotificationObserver,
bool Init(); bool Init();
// Set the mode of this contents. This must be called before prerender has
// started.
void SetPrerenderMode(prerender::mojom::PrerenderMode mode);
prerender::mojom::PrerenderMode prerender_mode() const { prerender::mojom::PrerenderMode prerender_mode() const {
return prerender_mode_; return prerender_mode_;
} }
...@@ -241,7 +238,8 @@ class PrerenderContents : public content::NotificationObserver, ...@@ -241,7 +238,8 @@ class PrerenderContents : public content::NotificationObserver,
std::unique_ptr<content::WebContents> CreateWebContents( std::unique_ptr<content::WebContents> CreateWebContents(
content::SessionStorageNamespace* session_storage_namespace); content::SessionStorageNamespace* session_storage_namespace);
prerender::mojom::PrerenderMode prerender_mode_; const prerender::mojom::PrerenderMode prerender_mode_ =
mojom::PrerenderMode::kPrefetchOnly;
bool prerendering_has_started_; bool prerendering_has_started_;
// Time at which we started to load the URL. This is used to compute // Time at which we started to load the URL. This is used to compute
......
...@@ -324,10 +324,8 @@ PrerenderManager::GetAllNoStatePrefetchingContentsForTesting() const { ...@@ -324,10 +324,8 @@ PrerenderManager::GetAllNoStatePrefetchingContentsForTesting() const {
for (const auto& prerender : active_prerenders_) { for (const auto& prerender : active_prerenders_) {
WebContents* contents = prerender->contents()->prerender_contents(); WebContents* contents = prerender->contents()->prerender_contents();
if (contents && prerender->contents()->prerender_mode() == if (contents)
prerender::mojom::PrerenderMode::kPrefetchOnly) {
result.push_back(contents); result.push_back(contents);
}
} }
return result; return result;
...@@ -609,8 +607,6 @@ PrerenderManager::AddPrerenderWithPreconnectFallback( ...@@ -609,8 +607,6 @@ PrerenderManager::AddPrerenderWithPreconnectFallback(
CreatePrerenderContents(url, referrer, initiator_origin, origin); CreatePrerenderContents(url, referrer, initiator_origin, origin);
DCHECK(prerender_contents); DCHECK(prerender_contents);
PrerenderContents* prerender_contents_ptr = prerender_contents.get(); PrerenderContents* prerender_contents_ptr = prerender_contents.get();
prerender_contents_ptr->SetPrerenderMode(
prerender::mojom::PrerenderMode::kPrefetchOnly);
active_prerenders_.push_back( active_prerenders_.push_back(
std::make_unique<PrerenderData>(this, std::move(prerender_contents), std::make_unique<PrerenderData>(this, std::move(prerender_contents),
GetExpiryTimeForNewPrerender(origin))); GetExpiryTimeForNewPrerender(origin)));
......
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