Split up leak detector into two stages for better leak reporting.

third_party/WebKit/Source/web/WebLeakDetector.cpp

 /*
  * Copyright (C) 2014 Google Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are
  * met:
  *
  *     * Redistributions of source code must retain the above copyright
  * notice, this list of conditions and the following disclaimer.
  *     * Redistributions in binary form must reproduce the above
@@ skipping 47 matching lines @@
         : m_client(client)
         , m_delayedGCAndReportTimer(this, &WebLeakDetectorImpl::delayedGCAndReport)
         , m_delayedReportTimer(this, &WebLeakDetectorImpl::delayedReport)
         , m_numberOfGCNeeded(0)
     {
         ASSERT(m_client);
     }
 
     ~WebLeakDetectorImpl() override {}
 
-    void collectGarbageAndGetDOMCounts(WebLocalFrame*) override;
+    void prepareForLeakDetection(WebLocalFrame*) override;
+    void collectGarbageAndReport() override;
 
 private:
     void delayedGCAndReport(Timer<WebLeakDetectorImpl>*);
     void delayedReport(Timer<WebLeakDetectorImpl>*);
 
     WebLeakDetectorClient* m_client;
     Timer<WebLeakDetectorImpl> m_delayedGCAndReportTimer;
     Timer<WebLeakDetectorImpl> m_delayedReportTimer;
     int m_numberOfGCNeeded;
 };
 
-void WebLeakDetectorImpl::collectGarbageAndGetDOMCounts(WebLocalFrame* frame)
+void WebLeakDetectorImpl::prepareForLeakDetection(WebLocalFrame* frame)
 {
     v8::Isolate* isolate = v8::Isolate::GetCurrent();
     v8::HandleScope handleScope(isolate);
 
     // For example, calling isValidEmailAddress in EmailInputType.cpp with a
     // non-empty string creates a static ScriptRegexp value which holds a
     // V8PerContextData indirectly. This affects the number of V8PerContextData.
     // To ensure that context data is created, call ensureScriptRegexpContext
     // here.
     V8PerIsolateData::from(isolate)->ensureScriptRegexpContext();
 
     WorkerThread::terminateAndWaitForAllWorkers();
     memoryCache()->evictResources();
 
     {
         RefPtrWillBeRawPtr<Document> document = PassRefPtrWillBeRawPtr<Document>(frame->document());
         if (ResourceFetcher* fetcher = document->fetcher())
             fetcher->garbageCollectDocumentResources();
     }
 
     // FIXME: HTML5 Notification should be closed because notification affects the result of number of DOM objects.
 
-    V8GCController::collectAllGarbageForTesting(isolate);
+    V8PerIsolateData::from(isolate)->clearScriptRegexpContext();
+}
+
+void WebLeakDetectorImpl::collectGarbageAndReport()
+{
+    V8GCController::collectAllGarbageForTesting(V8PerIsolateData::mainThreadIsolate());
     // Note: Oilpan precise GC is scheduled at the end of the event loop.
 
-    V8PerIsolateData::from(isolate)->clearScriptRegexpContext();
-
     // Task queue may contain delayed object destruction tasks.
     // This method is called from navigation hook inside FrameLoader,
     // so previous document is still held by the loader until the next event loop.
     // Complete all pending tasks before proceeding to gc.
     m_numberOfGCNeeded = 2;
     m_delayedGCAndReportTimer.startOneShot(0, BLINK_FROM_HERE);
 }
 
 void WebLeakDetectorImpl::delayedGCAndReport(Timer<WebLeakDetectorImpl>*)
 {
@@ skipping 34 matching lines @@
 }
 
 } // namespace
 
 WebLeakDetector* WebLeakDetector::create(WebLeakDetectorClient* client)
 {
     return new WebLeakDetectorImpl(client);
 }
 
 } // namespace blink