electron/patches/chromium/preconnect_manager.patch
electron-roller[bot] 92496c1930
chore: bump chromium to 129.0.6616.0 (main) (#43012)
* chore: bump chromium in DEPS to 128.0.6613.0

* chore: 5725076: Update EventType names | https://chromium-review.googlesource.com/c/chromium/src/+/5725076

* chore: export patches

* chore: 5725076: Update EventType names | https://chromium-review.googlesource.com/c/chromium/src/+/5725076 for windows

* chore: bump chromium in DEPS to 129.0.6614.0

* 5725672: Add a feature to limit the number of preconnect in LoadingPredictor | https://chromium-review.googlesource.com/c/chromium/src/+/5725672

* chore: bump chromium in DEPS to 129.0.6616.0

* chore: e patches all and resolve conflict in  patches/v8/fix_disable_scope_reuse_associated_dchecks.patch

* 5730656: Show an error dialog when UpdatePrintSettings() fails | https://chromium-review.googlesource.com/c/chromium/src/+/5730656

* chore: gen-libc++-filenames

* 5729956: Finally remove string_piece.h | https://chromium-review.googlesource.com/c/chromium/src/+/5729956

* chore: replace all references of base::StringPiece with std::string_view

* chore: remove more references of stringPiece in favor of string_view

* chore: rename string_piece variables to string_view

* 5508795: Remove the NotificationService | https://chromium-review.googlesource.com/c/chromium/src/+/5508795

* 5734053: Revert Rename GlobalFeatures to GlobalDesktopFeatures. | https://chromium-review.googlesource.com/c/chromium/src/+/5734053

* chore: resolve conflict with main without merge

---------

Co-authored-by: electron-roller[bot] <84116207+electron-roller[bot]@users.noreply.github.com>
Co-authored-by: Alice Zhao <alice@makenotion.com>
2024-07-29 09:37:35 -04:00

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 02bdfd1f176d4ce44984387226b6fc2e6551f15e..1fabbbdd5359073692724ff722e205bbbb08e8be 100644
--- a/chrome/browser/predictors/preconnect_manager.cc
+++ b/chrome/browser/predictors/preconnect_manager.cc
@@ -13,9 +13,11 @@
#include "base/not_fatal_until.h"
#include "base/trace_event/trace_event.h"
#include "chrome/browser/predictors/predictors_features.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"
@@ -26,6 +28,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) {}
@@ -86,12 +102,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 d18470c05cdaffbc48b83cc0c76f7085442dccce..0c0a3f11a2da083ef5437a0e6abcf91afbcf9df3 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);