Skip to content

Commit

Permalink
Partition Blink memory cache: remove duplicate code
Browse files Browse the repository at this point in the history
  • Loading branch information
uazo committed Nov 15, 2024
1 parent cfd9beb commit a85e301
Showing 1 changed file with 3 additions and 5 deletions.
8 changes: 3 additions & 5 deletions build/patches/Partition-Blink-memory-cache.patch
Original file line number Diff line number Diff line change
Expand Up @@ -23,8 +23,8 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html
.../platform/loader/fetch/memory_cache.cc | 8 +--
.../platform/loader/fetch/memory_cache.h | 5 +-
.../platform/loader/fetch/resource_fetcher.cc | 51 +++++++++++++++----
.../platform/loader/fetch/resource_fetcher.h | 9 +++-
10 files changed, 65 insertions(+), 23 deletions(-)
.../platform/loader/fetch/resource_fetcher.h | 7 ++-
10 files changed, 63 insertions(+), 23 deletions(-)

diff --git a/third_party/blink/renderer/core/html/parser/html_srcset_parser.cc b/third_party/blink/renderer/core/html/parser/html_srcset_parser.cc
--- a/third_party/blink/renderer/core/html/parser/html_srcset_parser.cc
Expand Down Expand Up @@ -243,7 +243,7 @@ diff --git a/third_party/blink/renderer/platform/loader/fetch/resource_fetcher.c
diff --git a/third_party/blink/renderer/platform/loader/fetch/resource_fetcher.h b/third_party/blink/renderer/platform/loader/fetch/resource_fetcher.h
--- a/third_party/blink/renderer/platform/loader/fetch/resource_fetcher.h
+++ b/third_party/blink/renderer/platform/loader/fetch/resource_fetcher.h
@@ -282,7 +282,14 @@ class PLATFORM_EXPORT ResourceFetcher
@@ -282,7 +282,12 @@ class PLATFORM_EXPORT ResourceFetcher
// `url` is used for finding a matching WebBundle.
// If `skip_service_worker` is true, the identifier won't be a ServiceWorker's
// identifier to keep the cache separated.
Expand All @@ -254,8 +254,6 @@ diff --git a/third_party/blink/renderer/platform/loader/fetch/resource_fetcher.h
+ scoped_refptr<const blink::SecurityOrigin> origin) const;
+ String GetCacheIdentifier(const KURL& url, bool skip_service_worker,
+ const String origin_url) const;
+
+ blink::mojom::ControllerServiceWorkerMode IsControlledByServiceWorker() const;

// If `url` exists as a resource in a subresource bundle in this frame,
// returns its UnguessableToken; otherwise, returns std::nullopt.
Expand Down

0 comments on commit a85e301

Please sign in to comment.