Skip to content

Commit 626bb9a

Browse files
sreejakshettyChromium LUCI CQ
authored and
Chromium LUCI CQ
committed
Rename RFH::IsDocumentOnLoadCompletedInPrimaryMainFrame to InMainFrame
Currently, RenderFrameHost::IsDocumentOnLoadCompletedForPrimaryMainFrame returns the value of just the is_on_load_completed_in_main_document() of any page. Correct the naming to represent the current behavior. Bug: 1307726 Change-Id: I609743bda24d71505a45639917c4fad33fb82e29 Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/3534698 Reviewed-by: Alex Moshchuk <[email protected]> Owners-Override: Alex Moshchuk <[email protected]> Commit-Queue: Sreeja Kamishetty <[email protected]> Cr-Commit-Position: refs/heads/main@{#983504}
1 parent 2d8c16d commit 626bb9a

File tree

5 files changed

+6
-6
lines changed

5 files changed

+6
-6
lines changed

chrome/browser/android/oom_intervention/oom_intervention_tab_helper.cc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -164,7 +164,7 @@ void OomInterventionTabHelper::DidStartNavigation(
164164
}
165165

166166
void OomInterventionTabHelper::PrimaryPageChanged(content::Page& page) {
167-
if (!page.GetMainDocument().IsDocumentOnLoadCompletedInPrimaryMainFrame())
167+
if (!page.GetMainDocument().IsDocumentOnLoadCompletedInMainFrame())
168168
return;
169169
if (IsLastVisibleWebContents(web_contents()))
170170
StartMonitoringIfNeeded();

components/favicon/content/content_favicon_driver.cc

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -173,7 +173,7 @@ void ContentFaviconDriver::DidUpdateFaviconURL(
173173
if (!entry)
174174
return;
175175

176-
if (!rfh->IsDocumentOnLoadCompletedInPrimaryMainFrame())
176+
if (!rfh->IsDocumentOnLoadCompletedInMainFrame())
177177
return;
178178

179179
OnUpdateCandidates(rfh->GetLastCommittedURL(),
@@ -188,7 +188,7 @@ void ContentFaviconDriver::DidUpdateWebManifestURL(
188188
// occur when loading an initially blank page.
189189
content::NavigationEntry* entry =
190190
web_contents()->GetController().GetLastCommittedEntry();
191-
if (!entry || !rfh->IsDocumentOnLoadCompletedInPrimaryMainFrame())
191+
if (!entry || !rfh->IsDocumentOnLoadCompletedInMainFrame())
192192
return;
193193

194194
DocumentManifestData* document_data =

content/browser/renderer_host/render_frame_host_impl.cc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13022,7 +13022,7 @@ void RenderFrameHostImpl::DisableWebRtcEventLogOutput(int lid) {
1302213022
GetPeerConnectionTrackerHost().StopEventLog(lid);
1302313023
}
1302413024

13025-
bool RenderFrameHostImpl::IsDocumentOnLoadCompletedInPrimaryMainFrame() {
13025+
bool RenderFrameHostImpl::IsDocumentOnLoadCompletedInMainFrame() {
1302613026
return GetPage().is_on_load_completed_in_main_document();
1302713027
}
1302813028

content/browser/renderer_host/render_frame_host_impl.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2333,7 +2333,7 @@ class CONTENT_EXPORT RenderFrameHostImpl
23332333
mojo::PendingReceiver<blink::mojom::PeerConnectionTrackerHost> receiver);
23342334
void EnableWebRtcEventLogOutput(int lid, int output_period_ms) override;
23352335
void DisableWebRtcEventLogOutput(int lid) override;
2336-
bool IsDocumentOnLoadCompletedInPrimaryMainFrame() override;
2336+
bool IsDocumentOnLoadCompletedInMainFrame() override;
23372337
const std::vector<blink::mojom::FaviconURLPtr>& FaviconURLs() override;
23382338

23392339
#if BUILDFLAG(ENABLE_MDNS)

content/public/browser/render_frame_host.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1007,7 +1007,7 @@ class CONTENT_EXPORT RenderFrameHost : public IPC::Listener,
10071007
virtual void DisableWebRtcEventLogOutput(int lid) = 0;
10081008

10091009
// Return true if onload has been executed in the renderer in the main frame.
1010-
virtual bool IsDocumentOnLoadCompletedInPrimaryMainFrame() = 0;
1010+
virtual bool IsDocumentOnLoadCompletedInMainFrame() = 0;
10111011

10121012
// Returns the raw list of favicon candidates as reported to observers via
10131013
// since the last navigation start. If called on a subframe, returns the

0 commit comments

Comments
 (0)