Add support for V8PerContextData to the leak detector (Chromium side)

content/shell/renderer/layout_test/leak_detector.cc

 // Copyright 2014 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.
 
 #include "content/shell/renderer/layout_test/leak_detector.h"
 
 #include "base/json/json_writer.h"
 #include "base/logging.h"
 #include "base/values.h"
 #include "content/shell/renderer/layout_test/blink_test_runner.h"
@@ skipping 10 matching lines @@
 // objects like RefCounted whose initial state is diffcult to estimate, we stop
 // using hard-coded values. Instead, we need to load about:blank ahead of the
 // layout tests actually and initialize LeakDetector by the got values.
 const int kInitialNumberOfLiveAudioNodes = 0;
 const int kInitialNumberOfLiveDocuments = 1;
 const int kInitialNumberOfLiveNodes = 4;
 const int kInitialNumberOfLiveRenderObjects = 3;
 const int kInitialNumberOfLiveResources = 0;
 const int kInitialNumberOfScriptPromises = 0;
 const int kInitialNumberOfLiveFrames = 1;
+const int kInitialNumberOfV8PerContextData = 1;
 
 // In the initial state, there are two ActiveDOMObjects (FontFaceSet created by
 // HTMLDocument and SuspendableTimer created by DocumentLoader).
 const int kInitialNumberOfLiveActiveDOMObject = 2;
 
 LeakDetector::LeakDetector(BlinkTestRunner* test_runner)
     : test_runner_(test_runner),
       web_leak_detector_(blink::WebLeakDetector::create(this)) {
   previous_result_.numberOfLiveAudioNodes = kInitialNumberOfLiveAudioNodes;
   previous_result_.numberOfLiveDocuments = kInitialNumberOfLiveDocuments;
   previous_result_.numberOfLiveNodes = kInitialNumberOfLiveNodes;
   previous_result_.numberOfLiveRenderObjects =
       kInitialNumberOfLiveRenderObjects;
   previous_result_.numberOfLiveResources = kInitialNumberOfLiveResources;
   previous_result_.numberOfLiveActiveDOMObjects =
     kInitialNumberOfLiveActiveDOMObject;
   previous_result_.numberOfLiveScriptPromises = kInitialNumberOfScriptPromises;
   previous_result_.numberOfLiveFrames = kInitialNumberOfLiveFrames;
+  previous_result_.numberOfLiveV8PerContextData =
+    kInitialNumberOfV8PerContextData;
 }
 
 LeakDetector::~LeakDetector() {
 }
 
 void LeakDetector::TryLeakDetection(blink::WebLocalFrame* frame) {
   web_leak_detector_->collectGarbageAndGetDOMCounts(frame);
 }
 
 void LeakDetector::onLeakDetectionComplete(
@@ skipping 46 matching lines @@
     list->AppendInteger(previous_result_.numberOfLiveScriptPromises);
     list->AppendInteger(result.numberOfLiveScriptPromises);
     detail.Set("numberOfLiveScriptPromises", list);
   }
   if (previous_result_.numberOfLiveFrames < result.numberOfLiveFrames) {
     base::ListValue* list = new base::ListValue();
     list->AppendInteger(previous_result_.numberOfLiveFrames);
     list->AppendInteger(result.numberOfLiveFrames);
     detail.Set("numberOfLiveFrames", list);
   }
+  if (previous_result_.numberOfLiveFrames <

[haraken, 2015/07/09 14:25:07]

numberOfLiveFrames => numberOfLiveV8ContextData

[hajimehoshi, 2015/07/09 14:27:36]

Ooops!

[hajimehoshi, 2015/07/10 04:27:55]

Done. Fortunately, the tests I added to LeakExpectations are still leaking
V8PerContextData since kInitialNumberOfLiveFrames ==
kInitialNumberOfV8PerContextData.

+      result.numberOfLiveV8PerContextData) {
+    base::ListValue* list = new base::ListValue();
+    list->AppendInteger(previous_result_.numberOfLiveV8PerContextData);
+    list->AppendInteger(result.numberOfLiveV8PerContextData);
+    detail.Set("numberOfLiveV8PerContextData", list);
+  }
 
   if (!detail.empty()) {
     std::string detail_str;
     base::JSONWriter::Write(detail, &detail_str);
     report.detail = detail_str;
     report.leaked = true;
   }
 
   previous_result_ = result;
   test_runner_->ReportLeakDetectionResult(report);
 }
 
 }  // namespace content