Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(2178)

Unified Diff: chrome/browser/net/predictor_tab_helper.cc

Issue 2916533002: Introduce chrome://flags/#network-prediction-options-for-service-worker
Patch Set: use StartServiceWorkerForNavigationHint Created 3 years, 6 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « chrome/browser/net/predictor_tab_helper.h ('k') | chrome/common/chrome_switches.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/net/predictor_tab_helper.cc
diff --git a/chrome/browser/net/predictor_tab_helper.cc b/chrome/browser/net/predictor_tab_helper.cc
index 20f4157dc7a7f79007760e8283694255455f9516..e6954d8610f7df70efa2aaa9ab6c71f93ea380da 100644
--- a/chrome/browser/net/predictor_tab_helper.cc
+++ b/chrome/browser/net/predictor_tab_helper.cc
@@ -5,11 +5,18 @@
#include "chrome/browser/net/predictor_tab_helper.h"
#include "base/feature_list.h"
+#include "base/trace_event/trace_event.h"
+#include "chrome/browser/net/prediction_options.h"
#include "chrome/browser/net/predictor.h"
#include "chrome/browser/profiles/profile.h"
#include "chrome/common/url_constants.h"
+#include "content/public/browser/browser_thread.h"
#include "content/public/browser/navigation_handle.h"
+#include "content/public/browser/render_process_host.h"
+#include "content/public/browser/service_worker_context.h"
+#include "content/public/browser/storage_partition.h"
#include "content/public/common/browser_side_navigation_policy.h"
+#include "content/public/common/content_features.h"
#if defined(OS_CHROMEOS)
#include "chrome/browser/chromeos/profiles/profile_helper.h"
@@ -30,14 +37,16 @@ const base::Feature kPreconnectMore{"PreconnectMore",
PredictorTabHelper::PredictorTabHelper(content::WebContents* web_contents)
: content::WebContentsObserver(web_contents),
- predicted_from_pending_entry_(false) {
-}
+ predicted_from_pending_entry_(false),
+ weak_factory_(this) {}
PredictorTabHelper::~PredictorTabHelper() {
}
void PredictorTabHelper::DidStartNavigation(
content::NavigationHandle* navigation_handle) {
+ TRACE_EVENT1("net", "PredictorTabHelper::DidStartNavigation", "url",
+ navigation_handle->GetURL().spec());
if (!base::FeatureList::IsEnabled(kPreconnectMore) &&
(!content::IsBrowserSideNavigationEnabled() ||
navigation_handle->IsRendererInitiated()))
@@ -49,19 +58,21 @@ void PredictorTabHelper::DidStartNavigation(
predicted_from_pending_entry_ = false;
return;
}
- PreconnectUrl(navigation_handle->GetURL());
+ HandleNavigation(navigation_handle->GetURL());
}
void PredictorTabHelper::DidStartNavigationToPendingEntry(
const GURL& url,
content::ReloadType reload_type) {
+ TRACE_EVENT1("net", "PredictorTabHelper::DidStartNavigationToPendingEntry",
+ "url", url.spec());
// This method isn't needed with PlzNavigate (see comment in header for
// predicted_from_pending_entry_)
if (content::IsBrowserSideNavigationEnabled())
return;
// The standard way to preconnect based on navigation.
- PreconnectUrl(url);
+ HandleNavigation(url);
predicted_from_pending_entry_ = true;
}
@@ -77,12 +88,70 @@ void PredictorTabHelper::DocumentOnLoadCompletedInMainFrame() {
predictor->SaveStateForNextStartup();
}
+void PredictorTabHelper::HandleNavigation(const GURL& url) {
+ DCHECK_CURRENTLY_ON(content::BrowserThread::UI);
+ TRACE_EVENT1("net", "PredictorTabHelper::HandleNavigation", "url",
+ url.spec());
+ if (!url.SchemeIsHTTPOrHTTPS())
+ return;
+ content::RenderProcessHost* host = web_contents()->GetRenderProcessHost();
+ NetworkPredictionOptionsForServiceWorker options =
+ GetNetworkPredictionOptionsForServiceWorker();
+ if (!host ||
+ options == NetworkPredictionOptionsForServiceWorker::PRECONNECT_ONLY) {
+ PreconnectUrl(url);
+ return;
+ }
+
+ host->GetStoragePartition()
+ ->GetServiceWorkerContext()
+ ->StartServiceWorkerForNavigationHint(
+ url,
+ base::Bind(
+ &PredictorTabHelper::DidStartServiceWorkerForNavigationPreconnect,
+ weak_factory_.GetWeakPtr(), url));
+ if (options == NetworkPredictionOptionsForServiceWorker::
+ START_SERVICE_WORKER_AND_PRECONNECT) {
+ PreconnectUrl(url);
+ }
+}
+
+void PredictorTabHelper::DidStartServiceWorkerForNavigationPreconnect(
+ const GURL& url,
+ content::StartServiceWorkerForNavigationHintResult result) {
+ DCHECK_CURRENTLY_ON(content::BrowserThread::UI);
+ TRACE_EVENT1("net", "PredictorTabHelper::DidStartServiceWorkerForPreconnect",
+ "result", static_cast<int>(result));
+ switch (GetNetworkPredictionOptionsForServiceWorker()) {
+ case NetworkPredictionOptionsForServiceWorker::PRECONNECT_ONLY:
+ NOTREACHED();
+ break;
+ case NetworkPredictionOptionsForServiceWorker::
+ START_SERVICE_WORKER_AND_PRECONNECT:
+ break;
+ case NetworkPredictionOptionsForServiceWorker::
+ START_SERVICE_WORKER_AND_DEFER_PRECONNECT:
+ PreconnectUrl(url);
+ break;
+ case NetworkPredictionOptionsForServiceWorker::START_SERVICE_WORKER_ONLY:
+ if (result ==
+ content::StartServiceWorkerForNavigationHintResult::STARTED ||
+ result == content::StartServiceWorkerForNavigationHintResult::
+ ALREADY_RUNNING) {
+ return;
+ }
+ PreconnectUrl(url);
+ break;
+ }
+}
+
void PredictorTabHelper::PreconnectUrl(const GURL& url) {
Profile* profile =
Profile::FromBrowserContext(web_contents()->GetBrowserContext());
Predictor* predictor(profile->GetNetworkPredictor());
- if (predictor && url.SchemeIsHTTPOrHTTPS())
- predictor->PreconnectUrlAndSubresources(url, GURL());
+ if (!predictor)
+ return;
+ predictor->PreconnectUrlAndSubresources(url, GURL());
}
} // namespace chrome_browser_net
« no previous file with comments | « chrome/browser/net/predictor_tab_helper.h ('k') | chrome/common/chrome_switches.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698