From 1139798e6ba6e018abc7fa50efbb74672897d85d Mon Sep 17 00:00:00 2001
From: Andrey Kosyakov <caseq@chromium.org>
Date: Thu, 21 Oct 2021 10:53:14 -0700
Subject: [PATCH] Correctly show contentDocument of OOPIFs created by <embed>
 and <object>

This implement handling for frame owner elements like <embed> and <object>
consistent with the way we handle iframes.

- treat "webview" targets similarly to iframes;
- request child document for <embed> and <object> elements in addition to <iframe>
- (drive-by) createChildDocumentPromiseForTesting => requestChildDocument, because
it's not specific to testing.

Bug: 1250673
Change-Id: I183ae0e55fee0368721cf401c8a7d5148bed071c
Reviewed-on: https://chromium-review.googlesource.com/c/devtools/devtools-frontend/+/3235721
Commit-Queue: Andrey Kosyakov <caseq@chromium.org>
Reviewed-by: Alex Rudenko <alexrudenko@chromium.org>
---
 front_end/core/sdk/ChildTargetManager.ts |  4 ++--
 front_end/core/sdk/DOMModel.ts           | 14 +++++---------
 2 files changed, 7 insertions(+), 11 deletions(-)

diff --git a/front_end/core/sdk/ChildTargetManager.ts b/front_end/core/sdk/ChildTargetManager.ts
index 111b8589df..cc1ee99a50 100644
--- a/front_end/core/sdk/ChildTargetManager.ts
+++ b/front_end/core/sdk/ChildTargetManager.ts
@@ -118,14 +118,14 @@ export class ChildTargetManager extends SDKModel<EventTypes> implements Protocol
     let targetName = '';
     if (targetInfo.type === 'worker' && targetInfo.title && targetInfo.title !== targetInfo.url) {
       targetName = targetInfo.title;
-    } else if (targetInfo.type !== 'iframe') {
+    } else if (targetInfo.type !== 'iframe' && targetInfo.type !== 'webview') {
       const parsedURL = Common.ParsedURL.ParsedURL.fromString(targetInfo.url);
       targetName =
           parsedURL ? parsedURL.lastPathComponentWithFragment() : '#' + (++ChildTargetManager.lastAnonymousTargetId);
     }
 
     let type = Type.Browser;
-    if (targetInfo.type === 'iframe') {
+    if (targetInfo.type === 'iframe' || targetInfo.type === 'webview') {
       type = Type.Frame;
     }
     // TODO(lfg): ensure proper capabilities for child pages (e.g. portals).
diff --git a/front_end/core/sdk/DOMModel.ts b/front_end/core/sdk/DOMModel.ts
index 35c0a99e90..4fea4123c8 100644
--- a/front_end/core/sdk/DOMModel.ts
+++ b/front_end/core/sdk/DOMModel.ts
@@ -159,14 +159,14 @@ export class DOMNode {
       this.childrenInternal = [];
     }
 
+    const frameOwnerTags = ['IFRAME', 'PORTAL', 'EMBED', 'OBJECT'];
     if (payload.contentDocument) {
       this.contentDocumentInternal = new DOMDocument(this.#domModelInternal, payload.contentDocument);
       this.contentDocumentInternal.parentNode = this;
       this.childrenInternal = [];
-    } else if ((payload.nodeName === 'IFRAME' || payload.nodeName === 'PORTAL') && payload.frameId) {
+    } else if (payload.frameId && frameOwnerTags.includes(payload.nodeName)) {
       // At this point we know we are in an OOPIF, otherwise #payload.contentDocument would have been set.
-      this.childDocumentPromiseForTesting =
-          this.createChildDocumentPromiseForTesting(payload.frameId, this.#domModelInternal.target());
+      this.childDocumentPromiseForTesting = this.requestChildDocument(payload.frameId, this.#domModelInternal.target());
       this.childrenInternal = [];
     }
 
@@ -205,14 +205,10 @@ export class DOMNode {
     }
   }
 
-  private async createChildDocumentPromiseForTesting(frameId: Protocol.Page.FrameId, notInTarget: Target):
-      Promise<DOMDocument|null> {
+  private async requestChildDocument(frameId: Protocol.Page.FrameId, notInTarget: Target): Promise<DOMDocument|null> {
     const frame = await FrameManager.instance().getOrWaitForFrame(frameId, notInTarget);
     const childModel = frame.resourceTreeModel()?.target().model(DOMModel);
-    if (childModel) {
-      return childModel.requestDocument();
-    }
-    return null;
+    return childModel?.requestDocument() || null;
   }
 
   isAdFrameNode(): boolean {