From 3d10ff03d61a1e9daadda14417ea41563ed24b51 Mon Sep 17 00:00:00 2001 From: Aldo Culquicondor <acondor@chromium.org> Date: Thu, 30 Jan 2025 11:01:03 -0800 Subject: [PATCH] Make NavigationRequest::GetNavigationEntryOffset const There is no reason for the method not to be constant. This clean-up was suggested in https://crrev.com/c/6180277 Change-Id: I48c9a4a30fe8e8aa650949315eaf0c6f07edbce7 Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/6219243 Auto-Submit: Aldo Culquicondor <acondor@chromium.org> Reviewed-by: Charlie Reis <creis@chromium.org> Commit-Queue: Charlie Reis <creis@chromium.org> Cr-Commit-Position: refs/heads/main@{#1413615} --- content/browser/renderer_host/navigation_request.cc | 2 +- content/browser/renderer_host/navigation_request.h | 2 +- .../navigation_transitions/navigation_transition_utils.cc | 4 ++-- .../navigation_transitions/navigation_transition_utils.h | 2 +- content/public/browser/navigation_handle.h | 2 +- content/public/test/mock_navigation_handle.h | 2 +- 6 files changed, 7 insertions(+), 7 deletions(-) diff --git a/content/browser/renderer_host/navigation_request.cc b/content/browser/renderer_host/navigation_request.cc index 5d6118daf9562..85044aec3ec4d 100644 --- a/content/browser/renderer_host/navigation_request.cc +++ b/content/browser/renderer_host/navigation_request.cc @@ -9146,7 +9146,7 @@ NavigationEntry* NavigationRequest::GetNavigationEntry() const { nav_entry_id_); } -int NavigationRequest::GetNavigationEntryOffset() { +int NavigationRequest::GetNavigationEntryOffset() const { return navigation_entry_offset_; } diff --git a/content/browser/renderer_host/navigation_request.h b/content/browser/renderer_host/navigation_request.h index 41bc43055846d..53508ad531c76 100644 --- a/content/browser/renderer_host/navigation_request.h +++ b/content/browser/renderer_host/navigation_request.h @@ -424,7 +424,7 @@ class CONTENT_EXPORT NavigationRequest const std::vector<std::string>& GetDnsAliases() override; bool IsSameProcess() override; NavigationEntry* GetNavigationEntry() const override; - int GetNavigationEntryOffset() override; + int GetNavigationEntryOffset() const override; void RegisterSubresourceOverride( blink::mojom::TransferrableURLLoaderPtr transferrable_loader) override; GlobalRenderFrameHostId GetPreviousRenderFrameHostId() override; diff --git a/content/browser/renderer_host/navigation_transitions/navigation_transition_utils.cc b/content/browser/renderer_host/navigation_transitions/navigation_transition_utils.cc index a132a42be780f..9af9379ebbf3a 100644 --- a/content/browser/renderer_host/navigation_transitions/navigation_transition_utils.cc +++ b/content/browser/renderer_host/navigation_transitions/navigation_transition_utils.cc @@ -240,7 +240,7 @@ void RemoveScreenshotFromDestination( } bool ShouldSkipScreenshotWithMissReason( - NavigationRequest& navigation_request, + const NavigationRequest& navigation_request, std::optional<CacheHitOrMissReason>& reason) { if (gfx::Animation::PrefersReducedMotion()) { reason = CacheHitOrMissReason::kCacheMissPrefersReducedMotion; @@ -575,7 +575,7 @@ int NavigationTransitionUtils::FindEntryIndexForNavigationTransitionID( } bool NavigationTransitionUtils::ShouldSkipScreenshot( - NavigationRequest& navigation_request) { + const NavigationRequest& navigation_request) { if (!base::FeatureList::IsEnabled(blink::features::kBackForwardTransitions)) { // Preserve existing behavior, where the renderer decides. return false; diff --git a/content/browser/renderer_host/navigation_transitions/navigation_transition_utils.h b/content/browser/renderer_host/navigation_transitions/navigation_transition_utils.h index 15b82aaf1739d..6dfd0214a124f 100644 --- a/content/browser/renderer_host/navigation_transitions/navigation_transition_utils.h +++ b/content/browser/renderer_host/navigation_transitions/navigation_transition_utils.h @@ -61,7 +61,7 @@ class NavigationTransitionUtils { NavigationControllerImpl* controller, NavigationTransitionData::UniqueId id); - static bool ShouldSkipScreenshot(NavigationRequest& navigation_request); + static bool ShouldSkipScreenshot(const NavigationRequest& navigation_request); // Used by tests to deterministically validate the memory budgeting / eviction // logic. diff --git a/content/public/browser/navigation_handle.h b/content/public/browser/navigation_handle.h index f6c9454d8ede6..b70e47506d7ce 100644 --- a/content/public/browser/navigation_handle.h +++ b/content/public/browser/navigation_handle.h @@ -559,7 +559,7 @@ class CONTENT_EXPORT NavigationHandle : public base::SupportsUserData { // - History navigation to the page with subframes. The subframe // navigations will return 1 here although they don't create a new // navigation entry. - virtual int GetNavigationEntryOffset() = 0; + virtual int GetNavigationEntryOffset() const = 0; virtual void RegisterSubresourceOverride( blink::mojom::TransferrableURLLoaderPtr transferrable_loader) = 0; diff --git a/content/public/test/mock_navigation_handle.h b/content/public/test/mock_navigation_handle.h index 169377a202c91..ba8046acabf81 100644 --- a/content/public/test/mock_navigation_handle.h +++ b/content/public/test/mock_navigation_handle.h @@ -217,7 +217,7 @@ class MockNavigationHandle : public NavigationHandle { (blink::mojom::TransferrableURLLoaderPtr)); MOCK_METHOD(bool, IsSameProcess, ()); MOCK_METHOD(NavigationEntry*, GetNavigationEntry, (), (const, override)); - MOCK_METHOD(int, GetNavigationEntryOffset, ()); + MOCK_METHOD(int, GetNavigationEntryOffset, (), (const, override)); MOCK_METHOD(void, ForceEnableOriginTrials, (const std::vector<std::string>& trials));