Reland^2 "[heap-profiler] Merge DOM node and its JS wrapper node in heap snapshot."

This relands commit d690c638.

This time the new test is marked as timeout in MSAN expectation.

Original change's description:
> [heap-profiler] Merge DOM node and its JS wrapper node in heap snapshot.
>
> Each DOM node has a corresponding JS wrapper node. In heap snapshot
> they appear as duplicates.
>
> Example retaining path with duplicates:
> - [1] in InternalNode @2041178784
> - [1] in HTMLDivElement @2041079168  // DOM node
> - [3] in HTMLDivElement @2231// JS wrapper
> - retainer in Window / @2105
>
> The heap snapshot generator now can merge an embedder node with a node
> returned by EmbedderGraph::Node::WrapperNode() function.
>
> This patch implements the WrapperNode() function for each DOM node.
>
> Bug: chromium:811925
> Change-Id: I9ea6bc7e45f8ab3d54828b9ac61f7230d04d8019
> Reviewed-on: https://chromium-review.googlesource.com/928503
> Reviewed-by: Michael Lippautz <mlippautz@chromium.org>
> Commit-Queue: Ulan Degenbaev <ulan@chromium.org>
> Cr-Commit-Position: refs/heads/master@{#539132}

Change-Id: I0523477d562c68512a2a92902022826df8a32820
Reviewed-on: https://chromium-review.googlesource.com/955243Reviewed-by: Kentaro Hara <haraken@chromium.org>
Commit-Queue: Ulan Degenbaev <ulan@chromium.org>
Cr-Commit-Position: refs/heads/master@{#541775}

third_party/WebKit/LayoutTests/MSANExpectations

@@ -34,6 +34,7 @@ crbug.com/704360 [ Linux ] shapedetection/detection-ImageData.html [ Timeout Pas
 
 # Times out on MSAN
 crbug.com/462190 [ Linux ] inspector-protocol/heap-profiler/heap-samples-in-snapshot.js [ Timeout ]
+crbug.com/462190 [ Linux ] inspector-protocol/heap-profiler/heap-snapshot-merged-nodes.js [ Timeout ]
 crbug.com/462190 [ Linux ] inspector-protocol/heap-profiler/heap-snapshot-with-active-dom-object.js [ Timeout ]
 crbug.com/462190 [ Linux ] inspector-protocol/heap-profiler/heap-snapshot-with-event-listener.js [ Timeout ]
 crbug.com/462190 [ Linux ] inspector-protocol/heap-profiler/heap-snapshot-with-multiple-retainers.js [ Timeout ]

third_party/WebKit/LayoutTests/inspector-protocol/heap-profiler/heap-snapshot-merged-nodes-expected.txt

+Test that DOM node and its JS wrapper appear as a single node.
+Took heap snapshot
+Parsed snapshot
+SUCCESS: found leaking
+SUCCESS: retaining path = [EventListener, InternalNode, HTMLDivElement, Window / file://, ]
+

third_party/WebKit/LayoutTests/inspector-protocol/heap-profiler/heap-snapshot-merged-nodes.js

+(async function(testRunner) {
+  var {page, session, dp} = await testRunner.startBlank(
+      `Test that DOM node and its JS wrapper appear as a single node.`);
+
+  await session.evaluate(`
+    var retainer = null;
+    function run() {
+      function leaking() {
+        console.log('leaking');
+      }
+      var div = document.createElement('div');
+      div.addEventListener('click', leaking, true);
+      retainer = div;
+    }
+    run();
+  `);
+
+  var Helper = await testRunner.loadScript('resources/heap-snapshot-common.js');
+  var helper = await Helper(testRunner, session);
+
+  var snapshot = await helper.takeHeapSnapshot();
+  var node;
+  for (var it = snapshot._allNodes(); it.hasNext(); it.next()) {
+    if (it.node.type() === 'closure' && it.node.name() === 'leaking') {
+      node = it.node;
+      break;
+    }
+  }
+  if (node)
+    testRunner.log('SUCCESS: found ' + node.name());
+  else
+    return testRunner.fail('cannot find leaking node');
+
+  var retainers = helper.firstRetainingPath(node).map(node => node.name());
+  var actual = retainers.join(', ');
+  testRunner.log(`SUCCESS: retaining path = [${actual}]`);
+  testRunner.completeTest();
+})

third_party/WebKit/LayoutTests/inspector-protocol/heap-profiler/heap-snapshot-with-event-listener-expected.txt

@@ -2,5 +2,5 @@ Test retaining path for an event listener.
 Took heap snapshot
 Parsed snapshot
 SUCCESS: found myEventListener
-SUCCESS: retaining path = [EventListener, InternalNode, HTMLBodyElement, HTMLHtmlElement, HTMLDocument]
+SUCCESS: retaining path = [EventListener, InternalNode, HTMLBodyElement, HTMLHtmlElement, HTMLDocument, Window / file://, ]
 

third_party/WebKit/LayoutTests/inspector-protocol/heap-profiler/heap-snapshot-with-event-listener.js

@@ -29,9 +29,6 @@
     return testRunner.fail('cannot find myEventListener node');
 
   var retainers = helper.firstRetainingPath(node).map(node => node.name());
-  // Limit to the retainers until the Window object to keep the test robust
-  // against root node name changes.
-  retainers = retainers.slice(0, retainers.indexOf('Window'));
   var actual = retainers.join(', ');
   testRunner.log(`SUCCESS: retaining path = [${actual}]`);
   testRunner.completeTest();

third_party/WebKit/LayoutTests/inspector-protocol/heap-profiler/heap-snapshot-with-multiple-retainers-expected.txt

@@ -4,6 +4,6 @@ Parsed snapshot
 SUCCESS: found leaking
 SUCCESS: immediate retainer is EventListener.
 SUCCESS: found multiple retaining paths.
-SUCCESS: path1 = [HTMLBodyElement, HTMLHtmlElement, HTMLDocument]
-SUCCESS: path2 = [HTMLDivElement, HTMLBodyElement, HTMLHtmlElement, HTMLDocument]
+SUCCESS: path1 = [HTMLBodyElement, HTMLHtmlElement, HTMLDocument, Window / file://, ]
+SUCCESS: path2 = [HTMLDivElement, HTMLBodyElement, HTMLHtmlElement, HTMLDocument, Window / file://, ]
 

third_party/WebKit/LayoutTests/inspector-protocol/heap-profiler/heap-snapshot-with-multiple-retainers.js

@@ -43,9 +43,6 @@
   for (var iter = eventListener.retainers(); iter.hasNext(); iter.next()) {
     var path = helper.firstRetainingPath(iter.retainer.node());
     path = path.map(node => node.name());
-    // Limit the path until the Window object to keep the test robust
-    // against root node name changes.
-    path = path.slice(0, path.indexOf('Window'));
     retainingPaths.push(path.join(', '));
   }
 

third_party/WebKit/Source/bindings/core/v8/V8EmbedderGraphBuilder.cpp

@@ -40,10 +40,9 @@ void V8EmbedderGraphBuilder::VisitPersistentHandle(
       isolate_, v8::Persistent<v8::Object>::Cast(*value));
   ScriptWrappable* traceable = ToScriptWrappable(v8_value);
   if (traceable) {
-    // Add v8_value => traceable edge.
+    Graph::Node* wrapper = GraphNode(v8_value);
     Graph::Node* graph_node =
-        GraphNode(traceable, traceable->NameInHeapSnapshot());
-    graph_->AddEdge(GraphNode(v8_value), graph_node);
+        GraphNode(traceable, traceable->NameInHeapSnapshot(), wrapper);
     // Visit traceable members. This will also add traceable => v8_value edge.
     ParentScope parent(this, graph_node);
     traceable->TraceWrappers(this);
@@ -65,8 +64,8 @@ void V8EmbedderGraphBuilder::Visit(
   // Add an edge from the current parent to this object.
   // Also push the object to the worklist in order to process its members.
   const void* traceable = wrapper_descriptor.base_object_payload;
-  Graph::Node* graph_node =
-      GraphNode(traceable, wrapper_descriptor.name_callback(traceable));
+  Graph::Node* graph_node = GraphNode(
+      traceable, wrapper_descriptor.name_callback(traceable), nullptr);
   graph_->AddEdge(current_parent_, graph_node);
   if (!visited_.Contains(traceable)) {
     visited_.insert(traceable);
@@ -90,14 +89,15 @@ v8::EmbedderGraph::Node* V8EmbedderGraphBuilder::GraphNode(
 
 v8::EmbedderGraph::Node* V8EmbedderGraphBuilder::GraphNode(
     Traceable traceable,
-    const char* name) const {
+    const char* name,
+    v8::EmbedderGraph::Node* wrapper) const {
   auto iter = graph_node_.find(traceable);
   if (iter != graph_node_.end())
     return iter->value;
   // Ownership of the new node is transferred to the graph_.
   // graph_node_.at(tracable) is valid for all BuildEmbedderGraph execution.
-  auto node =
-      graph_->AddNode(std::unique_ptr<Graph::Node>(new EmbedderNode(name)));
+  auto node = graph_->AddNode(
+      std::unique_ptr<Graph::Node>(new EmbedderNode(name, wrapper)));
   graph_node_.insert(traceable, node);
   return node;
 }

third_party/WebKit/Source/bindings/core/v8/V8EmbedderGraphBuilder.h

@@ -36,19 +36,22 @@ class V8EmbedderGraphBuilder : public ScriptWrappableVisitor,
  private:
   class EmbedderNode : public Graph::Node {
    public:
-    explicit EmbedderNode(const char* name) : name_(name) {}
+    EmbedderNode(const char* name, Graph::Node* wrapper)
+        : name_(name), wrapper_(wrapper) {}
 
     // Graph::Node overrides.
     const char* Name() override { return name_; }
     size_t SizeInBytes() override { return 0; }
+    Graph::Node* WrapperNode() override { return wrapper_; }
 
    private:
     const char* name_;
+    Graph::Node* wrapper_;
   };
 
   class EmbedderRootNode : public EmbedderNode {
    public:
-    explicit EmbedderRootNode(const char* name) : EmbedderNode(name) {}
+    explicit EmbedderRootNode(const char* name) : EmbedderNode(name, nullptr) {}
     // Graph::Node override.
     bool IsRootNode() { return true; }
   };
@@ -78,7 +81,9 @@ class V8EmbedderGraphBuilder : public ScriptWrappableVisitor,
                               const TraceWrapperDescriptor&) const;
 
   Graph::Node* GraphNode(const v8::Local<v8::Value>&) const;
-  Graph::Node* GraphNode(Traceable, const char* name) const;
+  Graph::Node* GraphNode(Traceable,
+                         const char* name,
+                         Graph::Node* wrapper) const;
 
   void VisitPendingActivities();
   void VisitTransitiveClosure();