73e33bc876
* chore: bump chromium in DEPS to 119.0.5994.0 * chore: update patches * Add some more debugging for navigation origin & process lock mismatch https://chromium-review.googlesource.com/c/chromium/src/+/4829483 * chore: bump chromium in DEPS to 119.0.5996.2 * chore: bump chromium in DEPS to 119.0.5997.0 * chore: bump chromium in DEPS to 119.0.6000.0 * chore: bump chromium in DEPS to 119.0.6002.0 * 4781766: Port remaining control color ids to the color pipeline https://chromium-review.googlesource.com/c/chromium/src/+/4781766 * 4846057: Preloading: Move prefetch_prefs to chrome/browser/preloading/ https://chromium-review.googlesource.com/c/chromium/src/+/4846057 * chore: fixup patch indices * 4848108: Pass v8::Isolate into FromV8Value calls on blink API https://chromium-review.googlesource.com/c/chromium/src/+/4848108 * 4834471: Reland "[api] allow v8::Data as internal field" https://chromium-review.googlesource.com/c/v8/v8/+/4834471 * 4808884: Major overhaul of ExceptionState in the v8 bindings https://chromium-review.googlesource.com/c/chromium/src/+/4808884 * 4791643: [sandbox] Add a TRUSTED_SPACE and TRUSTED_LO_SPACE to the V8 heap https://chromium-review.googlesource.com/c/v8/v8/+/4791643 * chore: bump chromium in DEPS to 119.0.6005.0 * 4776268: [v8][etw] Enables filtering of ETW tracing by URL https://chromium-review.googlesource.com/c/chromium/src/+/4776268 * chore: fixup patch indices * 4673258: WebSQL: Disable WebSQL by default https://chromium-review.googlesource.com/c/chromium/src/+/4673258 * chore: bump chromium in DEPS to 119.0.6006.0 * chore: update patches * 4854732: Reland^2 "[iterator-helpers] Unship due to incompat" https://chromium-review.googlesource.com/c/v8/v8/+/4854732 * 4794133: [AWC] Add `display-state` CSS @media feature https://chromium-review.googlesource.com/c/chromium/src/+/4794133 * fixup! Add some more debugging for navigation origin & process lock mismatch * Revert "fixup! Add some more debugging for navigation origin & process lock mismatch" This reverts commit 38fef075fc5690f7db6d4bbcabbe877a1618a964. * 4858437: Revert "[iOS] Delete GN flags for mach absolute time ticks" https://chromium-review.googlesource.com/c/chromium/src/+/4858437 * refactor: fix_crash_loading_non-standard_schemes_in_iframes.patch (#39879) * chore: 4869108: handle absolute and relative gn imports in autoninja https://chromium-review.googlesource.com/c/chromium/tools/depot_tools/+/4869108 * chore: set GOMA_DIR for autoninja * Revert "chore: 4869108: handle absolute and relative gn imports in autoninja" This reverts commit d94c7720bab96d1de25499383948da2cb8862d90. --------- Co-authored-by: electron-roller[bot] <84116207+electron-roller[bot]@users.noreply.github.com> Co-authored-by: John Kleinschmidt <jkleinsc@electronjs.org> Co-authored-by: Shelley Vohr <shelley.vohr@gmail.com> Co-authored-by: PatchUp <73610968+patchup[bot]@users.noreply.github.com> Co-authored-by: Robo <hop2deep@gmail.com>
108 lines
4.4 KiB
Diff
108 lines
4.4 KiB
Diff
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
From: deepak1556 <hop2deep@gmail.com>
|
|
Date: Thu, 13 Oct 2022 20:30:12 +0900
|
|
Subject: Preconnect manager
|
|
|
|
* Patch disables the profile related changes added in
|
|
https://chromium-review.googlesource.com/c/chromium/src/+/3928470.
|
|
* Also avoids including chrome/browser/predictors/resource_prefetch_predictor.h
|
|
in favor of defining PreconnectRequest in this file since we don't build
|
|
the header.
|
|
|
|
diff --git a/chrome/browser/predictors/preconnect_manager.cc b/chrome/browser/predictors/preconnect_manager.cc
|
|
index 5ab9d7b6723fe472516e2c3bda58c68c6e66b73a..60e1b55af76e0deb712646d77a91204a5456b321 100644
|
|
--- a/chrome/browser/predictors/preconnect_manager.cc
|
|
+++ b/chrome/browser/predictors/preconnect_manager.cc
|
|
@@ -10,9 +10,11 @@
|
|
#include "base/functional/bind.h"
|
|
#include "base/metrics/histogram_macros.h"
|
|
#include "base/trace_event/trace_event.h"
|
|
+#if 0
|
|
#include "chrome/browser/predictors/resource_prefetch_predictor.h"
|
|
#include "chrome/browser/preloading/preloading_prefs.h"
|
|
#include "chrome/browser/profiles/profile.h"
|
|
+#endif
|
|
#include "content/public/browser/browser_context.h"
|
|
#include "content/public/browser/browser_task_traits.h"
|
|
#include "content/public/browser/browser_thread.h"
|
|
@@ -23,6 +25,20 @@ namespace predictors {
|
|
|
|
const bool kAllowCredentialsOnPreconnectByDefault = true;
|
|
|
|
+// NOTE(nornagon): this is copied from
|
|
+// //chrome/browser/predictors/resource_prefetch_predictor.cc we don't need
|
|
+// anything in that file other than this constructor.
|
|
+PreconnectRequest::PreconnectRequest(
|
|
+ const url::Origin& origin,
|
|
+ int num_sockets,
|
|
+ const net::NetworkAnonymizationKey& network_anonymization_key)
|
|
+ : origin(origin),
|
|
+ num_sockets(num_sockets),
|
|
+ network_anonymization_key(network_anonymization_key) {
|
|
+ DCHECK_GE(num_sockets, 0);
|
|
+ DCHECK(!network_anonymization_key.IsEmpty());
|
|
+}
|
|
+
|
|
PreconnectedRequestStats::PreconnectedRequestStats(const url::Origin& origin,
|
|
bool was_preconnected)
|
|
: origin(origin), was_preconnected(was_preconnected) {}
|
|
@@ -83,12 +99,15 @@ PreconnectManager::PreconnectManager(base::WeakPtr<Delegate> delegate,
|
|
PreconnectManager::~PreconnectManager() = default;
|
|
|
|
bool PreconnectManager::IsEnabled() {
|
|
+#if 0
|
|
Profile* profile = Profile::FromBrowserContext(browser_context_);
|
|
if (!profile) {
|
|
return false;
|
|
}
|
|
return prefetch::IsSomePreloadingEnabled(*profile->GetPrefs()) ==
|
|
content::PreloadingEligibility::kEligible;
|
|
+#endif
|
|
+ return true;
|
|
}
|
|
|
|
void PreconnectManager::Start(const GURL& url,
|
|
diff --git a/chrome/browser/predictors/preconnect_manager.h b/chrome/browser/predictors/preconnect_manager.h
|
|
index 2f079f4b9144b3e01749f54f553b06262e38627e..42c6b442f6ddb2cecc7f47ec5f5785f285689efe 100644
|
|
--- a/chrome/browser/predictors/preconnect_manager.h
|
|
+++ b/chrome/browser/predictors/preconnect_manager.h
|
|
@@ -17,7 +17,9 @@
|
|
#include "base/time/time.h"
|
|
#include "chrome/browser/predictors/proxy_lookup_client_impl.h"
|
|
#include "chrome/browser/predictors/resolve_host_client_impl.h"
|
|
+#if 0
|
|
#include "chrome/browser/predictors/resource_prefetch_predictor.h"
|
|
+#endif
|
|
#include "net/base/network_anonymization_key.h"
|
|
#include "url/gurl.h"
|
|
|
|
@@ -33,7 +35,28 @@ class NetworkContext;
|
|
|
|
namespace predictors {
|
|
|
|
-struct PreconnectRequest;
|
|
+// Stores all values needed to trigger a preconnect/preresolve job to a single
|
|
+// origin.
|
|
+struct PreconnectRequest {
|
|
+ // |network_anonymization_key| specifies the key that network requests for the
|
|
+ // preconnected URL are expected to use. If a request is issued with a
|
|
+ // different key, it may not use the preconnected socket. It has no effect
|
|
+ // when |num_sockets| == 0.
|
|
+ PreconnectRequest(
|
|
+ const url::Origin& origin,
|
|
+ int num_sockets,
|
|
+ const net::NetworkAnonymizationKey& network_anonymization_key);
|
|
+ PreconnectRequest(const PreconnectRequest&) = default;
|
|
+ PreconnectRequest(PreconnectRequest&&) = default;
|
|
+ PreconnectRequest& operator=(const PreconnectRequest&) = default;
|
|
+ PreconnectRequest& operator=(PreconnectRequest&&) = default;
|
|
+
|
|
+ url::Origin origin;
|
|
+ // A zero-value means that we need to preresolve a host only.
|
|
+ int num_sockets = 0;
|
|
+ bool allow_credentials = true;
|
|
+ net::NetworkAnonymizationKey network_anonymization_key;
|
|
+};
|
|
|
|
struct PreconnectedRequestStats {
|
|
PreconnectedRequestStats(const url::Origin& origin, bool was_preconnected);
|