diff options
author | Michael BrĂ¼ning <michael.bruning@qt.io> | 2022-01-06 08:36:45 +0000 |
---|---|---|
committer | Michael BrĂ¼ning <michael.bruning@qt.io> | 2022-02-18 14:17:53 +0000 |
commit | 93eecf5a24bcb703e85adf7faf9d64dcef5c5ca5 (patch) | |
tree | b4f0bd08ad5d38af0355b6f624f49a5ad87592ca | |
parent | 80a9238f372f81cb73bb97a9e59f243e13ad8588 (diff) | |
download | qtwebengine-chromium-93eecf5a24bcb703e85adf7faf9d64dcef5c5ca5.tar.gz |
Fixup for CVE-2022-0289
Patch got prematurely merged and needs a fix to build on 90-based.
Change-Id: I150e62b91c021bd53208234b2fcae541f816e654
Reviewed-by: Michal Klocek <michal.klocek@qt.io>
-rw-r--r-- | chromium/components/safe_browsing/content/browser/threat_details.cc | 4 | ||||
-rw-r--r-- | chromium/components/safe_browsing/content/browser/threat_details.h | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/chromium/components/safe_browsing/content/browser/threat_details.cc b/chromium/components/safe_browsing/content/browser/threat_details.cc index fb623966690..360ab1b74dc 100644 --- a/chromium/components/safe_browsing/content/browser/threat_details.cc +++ b/chromium/components/safe_browsing/content/browser/threat_details.cc @@ -656,13 +656,13 @@ void ThreatDetails::RequestThreatDOMDetails(content::RenderFrameHost* frame) { pending_render_frame_hosts_.push_back(frame); raw_threat_report->GetThreatDOMDetails( base::BindOnce(&ThreatDetails::OnReceivedThreatDOMDetails, GetWeakPtr(), - std::move(threat_reporter), frame->GetGlobalId())); + std::move(threat_reporter), frame->GetGlobalFrameRoutingId())); } // When the renderer is done, this is called. void ThreatDetails::OnReceivedThreatDOMDetails( mojo::Remote<mojom::ThreatReporter> threat_reporter, - content::GlobalRenderFrameHostId sender_id, + content::GlobalFrameRoutingId sender_id, std::vector<mojom::ThreatDOMDetailsNodePtr> params) { // If the RenderFrameHost was closed between sending the IPC and this callback // running, |sender| will be invalid. diff --git a/chromium/components/safe_browsing/content/browser/threat_details.h b/chromium/components/safe_browsing/content/browser/threat_details.h index 0598d9fb313..d7ac771f954 100644 --- a/chromium/components/safe_browsing/content/browser/threat_details.h +++ b/chromium/components/safe_browsing/content/browser/threat_details.h @@ -170,7 +170,7 @@ class ThreatDetails : public content::WebContentsObserver { void OnReceivedThreatDOMDetails( mojo::Remote<mojom::ThreatReporter> threat_reporter, - content::GlobalRenderFrameHostId sender_id, + content::GlobalFrameRoutingId sender_id, std::vector<mojom::ThreatDOMDetailsNodePtr> params); void AddRedirectUrlList(const std::vector<GURL>& urls); |