summaryrefslogtreecommitdiff
path: root/chromium/components/guest_view
diff options
context:
space:
mode:
authorAllan Sandfeld Jensen <allan.jensen@qt.io>2022-05-17 17:24:03 +0200
committerAllan Sandfeld Jensen <allan.jensen@qt.io>2022-06-22 07:51:41 +0000
commit774f54339e5db91f785733232d3950366db65d07 (patch)
tree068e1b47bd1af94d77094ed12b604a6b83d9c22a /chromium/components/guest_view
parentf7eaed5286974984ba5f9e3189d8f49d03e99f81 (diff)
downloadqtwebengine-chromium-774f54339e5db91f785733232d3950366db65d07.tar.gz
BASELINE: Update Chromium to 102.0.5005.57
Change-Id: I885f714bb40ee724c28f94ca6bd8dbdb39915158 Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
Diffstat (limited to 'chromium/components/guest_view')
-rw-r--r--chromium/components/guest_view/browser/guest_view_base.cc9
-rw-r--r--chromium/components/guest_view/common/guest_view.mojom2
2 files changed, 2 insertions, 9 deletions
diff --git a/chromium/components/guest_view/browser/guest_view_base.cc b/chromium/components/guest_view/browser/guest_view_base.cc
index 3b579b818d1..b2b771157cf 100644
--- a/chromium/components/guest_view/browser/guest_view_base.cc
+++ b/chromium/components/guest_view/browser/guest_view_base.cc
@@ -72,17 +72,10 @@ class GuestViewBase::OwnerContentsObserver : public WebContentsObserver {
Destroy();
}
- void DidFinishNavigation(
- content::NavigationHandle* navigation_handle) override {
+ void PrimaryPageChanged(content::Page& page) override {
// TODO(1206312, 1205920): It is incorrect to assume that a navigation will
// destroy the embedder.
// If the embedder navigates to a different page then destroy the guest.
- if (!navigation_handle->IsInMainFrame() ||
- !navigation_handle->HasCommitted() ||
- navigation_handle->IsSameDocument()) {
- return;
- }
-
Destroy();
}
diff --git a/chromium/components/guest_view/common/guest_view.mojom b/chromium/components/guest_view/common/guest_view.mojom
index 8929e45a9d4..cf98794cadc 100644
--- a/chromium/components/guest_view/common/guest_view.mojom
+++ b/chromium/components/guest_view/common/guest_view.mojom
@@ -18,7 +18,7 @@ interface GuestViewHost {
int32 embedder_local_frame_routing_id,
int32 element_instance_id,
int32 guest_instance_id,
- mojo_base.mojom.DictionaryValue params) => ();
+ mojo_base.mojom.DeprecatedDictionaryValue params) => ();
// Sent by the renderer when a GuestView (identified by |view_instance_id|)
// has been created in JavaScript.