DevTools: "Inspect" context menu in an OOPIF doesn't expand to element on first try

Bug: 817653 Change-Id: I29fed9cfc734439aa4a97cf591dafc440232de12 Reviewed-on: https://chromium-review.googlesource.com/943938Reviewed-by: Dmitry Gozman <dgozman@chromium.org> Commit-Queue: Pavel Feldman <pfeldman@chromium.org> Cr-Commit-Position: refs/heads/master@{#540337}

DevTools: "Inspect" context menu in an OOPIF doesn't expand to element on first try
Bug: 817653 Change-Id: I29fed9cfc734439aa4a97cf591dafc440232de12 Reviewed-on: https://chromium-review.googlesource.com/943938Reviewed-by: Dmitry Gozman <dgozman@chromium.org> Commit-Queue: Pavel Feldman <pfeldman@chromium.org> Cr-Commit-Position: refs/heads/master@{#540337}
6d73147b · Pavel Feldman · Commit Bot · abe2d76d · 6d73147b · 6d73147b
Commit 6d73147b authored Mar 01, 2018 by Pavel Feldman Committed by Commit Bot Mar 01, 2018
4 changed files
--- a/third_party/WebKit/LayoutTests/http/tests/devtools/oopif/oopif-elements-inspect-expected.txt
+++ b/third_party/WebKit/LayoutTests/http/tests/devtools/oopif/oopif-elements-inspect-expected.txt
+Tests that inspect request works for nested OOPIF elements.
+
+Selected node has text: #text
+
--- a/third_party/WebKit/LayoutTests/http/tests/devtools/oopif/oopif-elements-inspect.js
+++ b/third_party/WebKit/LayoutTests/http/tests/devtools/oopif/oopif-elements-inspect.js
+// Copyright 2018 The Chromium Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+(async function() {
+  TestRunner.addResult(`Tests that inspect request works for nested OOPIF elements.\n`);
+  await TestRunner.loadModule('elements_test_runner');
+  await TestRunner.showPanel('elements');
+
+  // Save time on style updates.
+  Elements.StylesSidebarPane.prototype.update = function() {};
+  Elements.MetricsSidebarPane.prototype.update = function() {};
+
+  TestRunner.navigatePromise('resources/page-inspect.html');
+
+  SDK.targetManager.observeTargets({
+    targetAdded: async function(target) {
+      if (target.name() === 'Main')
+        return;
+      let complete = false;
+      target.pageAgent().setLifecycleEventsEnabled(true);
+      target.model(SDK.ResourceTreeModel).addEventListener(SDK.ResourceTreeModel.Events.LifecycleEvent, async (event) => {
+        if (event.data.name === 'load' && !complete) {
+          complete = true;
+
+          target.model(SDK.RuntimeModel).defaultExecutionContext().evaluate({
+            expression: 'inspect(document.body)',
+            includeCommandLineAPI: true
+          }, false, false);
+
+          UI.context.addFlavorChangeListener(SDK.DOMNode, (event) => {
+            const treeOutline = Elements.ElementsTreeOutline.forDOMModel(event.data.domModel());
+            TestRunner.addResult(`Selected node has text: ${treeOutline.selectedDOMNode().children()[0].nodeName()}`);
+            TestRunner.completeTest();
+          });
+        }
+      });
+    },
+
+    targetRemoved: function(target) {},
+  });
+
+})();
--- a/third_party/WebKit/LayoutTests/http/tests/devtools/oopif/resources/page-inspect.html
+++ b/third_party/WebKit/LayoutTests/http/tests/devtools/oopif/resources/page-inspect.html
+<body>
+    <div>
+        <iframe id="iframe" src="http://devtools.oopif.test:8000/devtools/oopif/resources/inner-iframe.html"></iframe>
+    </div>
+</body>
--- a/third_party/WebKit/Source/devtools/front_end/sdk/DOMModel.js
+++ b/third_party/WebKit/Source/devtools/front_end/sdk/DOMModel.js
@@ -120,6 +120,7 @@ SDK.DOMNode = class {
      const childModel = childTarget ? childTarget.model(SDK.DOMModel) : null;
      if (childModel)
        childModel.requestDocument();
+      this._children = [];
    }

    if (payload.importedDocument) {
@@ -1192,6 +1193,7 @@ SDK.DOMModel = class extends SDK.SDKModel {
    if (this._frameOwnerNode) {
      const oldDocument = this._frameOwnerNode._contentDocument;
      this._frameOwnerNode._contentDocument = this._document;
+      this._frameOwnerNode._children = [];
      if (this._document) {
        this._document.parentNode = this._frameOwnerNode;
        this.dispatchEventToListeners(SDK.DOMModel.Events.NodeInserted, this._document);