From 9dcc9ff7c3692675811205e4d69db5756d1b1782 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=A8=E6=96=87=E9=9B=AA?= Date: Sat, 4 Jan 2025 01:56:21 +0000 Subject: [PATCH] Revert "preload" This reverts commit b933f7ccf2dce2ac62085ddea2e8734d0ee28a72. --- blink/renderer/core/dom/document.cc | 6 ++---- blink/renderer/core/frame/local_frame_view.cc | 2 +- blink/renderer/core/loader/document_loader.cc | 12 ++++-------- .../platform/loader/fetch/resource_fetcher.cc | 15 ++++----------- .../platform/loader/fetch/resource_fetcher.h | 9 ++++----- .../platform/loader/fetch/resource_request.cc | 4 ++-- .../platform/loader/fetch/resource_request.h | 11 +++++------ .../loader/fetch/url_loader/request_conversion.cc | 4 ++-- 8 files changed, 24 insertions(+), 39 deletions(-) diff --git a/blink/renderer/core/dom/document.cc b/blink/renderer/core/dom/document.cc index 45692e562..2018b6b6d 100644 --- a/blink/renderer/core/dom/document.cc +++ b/blink/renderer/core/dom/document.cc @@ -2863,10 +2863,8 @@ void Document::Initialize() { if (View()) View()->DidAttachDocument(); -#if BUILDFLAG(IS_OHOS_PRPP) - if (fetcher_) { - fetcher_->SetMainUrl(base_url_); - } +#if BUILDFLAG(IS_OHOS) + fetcher_->SetMainPage(base_url_); #endif } diff --git a/blink/renderer/core/frame/local_frame_view.cc b/blink/renderer/core/frame/local_frame_view.cc index c25e73ff0..603311e54 100644 --- a/blink/renderer/core/frame/local_frame_view.cc +++ b/blink/renderer/core/frame/local_frame_view.cc @@ -839,7 +839,7 @@ void LocalFrameView::PerformLayout() { } document->Fetcher()->UpdateAllImageResourcePriorities(); -#if BUILDFLAG(IS_OHOS_PRPP) +#if BUILDFLAG(IS_OHOS) if (!document->Url().GetString().Utf8().empty()) { LayoutBox* body_box = nullptr; const LayoutBox* html_box = nullptr; diff --git a/blink/renderer/core/loader/document_loader.cc b/blink/renderer/core/loader/document_loader.cc index 34ba2849a..8c040f50f 100644 --- a/blink/renderer/core/loader/document_loader.cc +++ b/blink/renderer/core/loader/document_loader.cc @@ -845,10 +845,8 @@ void DocumentLoader::UpdateForSameDocumentNavigation( soft_navigation_heuristics_task_id) { DCHECK_EQ(IsBackForwardLoadType(type), !!history_item); -#if BUILDFLAG(IS_OHOS_PRPP) - if (frame_ && frame_->GetDocument() && frame_->GetDocument()->Fetcher()) { - frame_->GetDocument()->Fetcher()->UpdateAllowPreloadRecord(true); - } +#if BUILDFLAG(IS_OHOS) + frame_->GetDocument()->Fetcher()->UpdateAllowPreloadRecord(true); #endif SinglePageAppNavigationType single_page_app_navigation_type = CategorizeSinglePageAppNavigation(same_document_navigation_type, type); @@ -2757,10 +2755,8 @@ void DocumentLoader::CommitNavigation() { // is available by tracking the execution context's lifetime. ProfilerGroup::InitializeIfEnabled(frame_->DomWindow()); -#if BUILDFLAG(IS_OHOS_PRPP) - if (frame_ && frame_->GetDocument() && frame_->GetDocument()->Fetcher()) { - frame_->GetDocument()->Fetcher()->UpdateAllowPreloadRecord(true); - } +#if BUILDFLAG(IS_OHOS) + frame_->GetDocument()->Fetcher()->UpdateAllowPreloadRecord(true); #endif // Load the document if needed. StartLoadingResponse(); diff --git a/blink/renderer/platform/loader/fetch/resource_fetcher.cc b/blink/renderer/platform/loader/fetch/resource_fetcher.cc index 52a846205..a5c7fdd0f 100644 --- a/blink/renderer/platform/loader/fetch/resource_fetcher.cc +++ b/blink/renderer/platform/loader/fetch/resource_fetcher.cc @@ -1146,9 +1146,9 @@ absl::optional ResourceFetcher::PrepareRequest( resource_request.SetAllowStoredCredentials(false); } -#if BUILDFLAG(IS_OHOS_PRPP) +#if BUILDFLAG(IS_OHOS) resource_request.SetAllowPreloadRecord(allow_preload_record_); - resource_request.SetMainUrl(main_url_); + resource_request.SetMainPage(main_page_); #endif return absl::nullopt; } @@ -1231,9 +1231,8 @@ Resource* ResourceFetcher::RequestResource(FetchParameters& params, #if BUILDFLAG(IS_OHOS) int request_id_perf_stat = GenerateRequestId(); TRACE_EVENT2("blink,blink.resource", "ResourceFetcher::requestResource", - "id", request_id_perf_stat, - "method", params.GetResourceRequest().HttpMethod().Utf8() + - " | url =" + params.Url().ElidedString().Utf8()); + "url", params.Url().ElidedString().Utf8() + " | method=" + params.GetResourceRequest().HttpMethod().Utf8(), + "id", request_id_perf_stat); #endif // |resource_request|'s origin can be null here, corresponding to the "client" // value in the spec. In that case client's origin is used. @@ -1403,12 +1402,6 @@ Resource* ResourceFetcher::RequestResource(FetchParameters& params, ImageLoadBlockingPolicy load_blocking_policy = ImageLoadBlockingPolicy::kDefault; if (resource->GetType() == ResourceType::kImage) { -#if BUILDFLAG(IS_OHOS_PRPP) - if (resource->PriorityFromObservers().first.visibility == - ResourcePriority::kVisible) { - resource_request.SetAllowPreloadRecord(true); - } -#endif image_resources_.insert(resource); not_loaded_image_resources_.insert(resource); if (params.GetImageRequestBehavior() == diff --git a/blink/renderer/platform/loader/fetch/resource_fetcher.h b/blink/renderer/platform/loader/fetch/resource_fetcher.h index 6b1b4ac09..52df891d2 100644 --- a/blink/renderer/platform/loader/fetch/resource_fetcher.h +++ b/blink/renderer/platform/loader/fetch/resource_fetcher.h @@ -34,7 +34,6 @@ #include "base/task/single_thread_task_runner.h" #include "base/unguessable_token.h" #include "mojo/public/cpp/bindings/pending_remote.h" -#include "net/base/prp_preload_buildflags.h" #include "services/metrics/public/cpp/mojo_ukm_recorder.h" #include "third_party/abseil-cpp/absl/types/optional.h" #include "third_party/blink/public/common/subresource_load_metrics.h" @@ -230,9 +229,9 @@ class PLATFORM_EXPORT ResourceFetcher void ClearPreloads(ClearPreloadsPolicy = kClearAllPreloads); void ScheduleWarnUnusedPreloads(); -#if BUILDFLAG(IS_OHOS_PRPP) +#if BUILDFLAG(IS_OHOS) void UpdateAllowPreloadRecord(bool allow) { allow_preload_record_ = allow; } - void SetMainUrl(const KURL& url) { main_url_ = url; } + void SetMainPage(const KURL& url) { main_page_ = url; } #endif MHTMLArchive* Archive() const { return archive_.Get(); } @@ -650,9 +649,9 @@ class PLATFORM_EXPORT ResourceFetcher // Area (in pixels) below which an image is considered "small" uint32_t small_image_max_size_ = 0; -#if BUILDFLAG(IS_OHOS_PRPP) +#if BUILDFLAG(IS_OHOS) bool allow_preload_record_ = true; - KURL main_url_; + KURL main_page_; #endif }; diff --git a/blink/renderer/platform/loader/fetch/resource_request.cc b/blink/renderer/platform/loader/fetch/resource_request.cc index 4167aa8e3..de47e6926 100644 --- a/blink/renderer/platform/loader/fetch/resource_request.cc +++ b/blink/renderer/platform/loader/fetch/resource_request.cc @@ -116,10 +116,10 @@ ResourceRequestHead::ResourceRequestHead(const KURL& url) referrer_policy_(network::mojom::ReferrerPolicy::kDefault), cors_preflight_policy_( network::mojom::CorsPreflightPolicy::kConsiderPreflight) -#if BUILDFLAG(IS_OHOS_PRPP) +#if BUILDFLAG(IS_OHOS) , allow_preload_record_(false), - main_url_(KURL()) + main_page_(KURL()) #endif {} diff --git a/blink/renderer/platform/loader/fetch/resource_request.h b/blink/renderer/platform/loader/fetch/resource_request.h index f1bc74eae..8f8c211c6 100644 --- a/blink/renderer/platform/loader/fetch/resource_request.h +++ b/blink/renderer/platform/loader/fetch/resource_request.h @@ -33,7 +33,6 @@ #include "base/containers/flat_set.h" #include "base/time/time.h" #include "base/unguessable_token.h" -#include "net/base/prp_preload_buildflags.h" #include "net/cookies/site_for_cookies.h" #include "net/filter/source_stream.h" #include "services/metrics/public/cpp/ukm_source_id.h" @@ -572,12 +571,12 @@ class PLATFORM_EXPORT ResourceRequestHead { attribution_reporting_eligibility_ = eligibility; } -#if BUILDFLAG(IS_OHOS_PRPP) +#if BUILDFLAG(IS_OHOS) bool GetAllowPreloadRecord() const { return allow_preload_record_; } void SetAllowPreloadRecord(bool allow) { allow_preload_record_ = allow; } - const KURL& GetMainUrl() const { return main_url_; } - void SetMainUrl(const KURL& url) { main_url_ = url; } + const KURL& GetMainPage() const { return main_page_; } + void SetMainPage(const KURL& url) { main_page_ = url; } #endif private: @@ -706,9 +705,9 @@ class PLATFORM_EXPORT ResourceRequestHead { network::mojom::AttributionReportingEligibility attribution_reporting_eligibility_ = network::mojom::AttributionReportingEligibility::kUnset; -#if BUILDFLAG(IS_OHOS_PRPP) +#if BUILDFLAG(IS_OHOS) bool allow_preload_record_ = false; - KURL main_url_; + KURL main_page_; #endif }; diff --git a/blink/renderer/platform/loader/fetch/url_loader/request_conversion.cc b/blink/renderer/platform/loader/fetch/url_loader/request_conversion.cc index 28b34fa0a..a0aa1e24f 100644 --- a/blink/renderer/platform/loader/fetch/url_loader/request_conversion.cc +++ b/blink/renderer/platform/loader/fetch/url_loader/request_conversion.cc @@ -407,9 +407,9 @@ void PopulateResourceRequest(const ResourceRequestHead& src, dest->attribution_reporting_eligibility = src.GetAttributionReportingEligibility(); -#if BUILDFLAG(IS_OHOS_PRPP) +#if BUILDFLAG(IS_OHOS) dest->allow_preload_record = src.GetAllowPreloadRecord(); - dest->main_url = GURL(src.GetMainUrl()); + dest->main_page = GURL(src.GetMainPage()); #endif } -- Gitee