[DevTools] Send heap snapshot to the frontend immediatly when it is ready

Source/core/inspector/InspectorHeapProfilerAgent.cpp

 /*
  * Copyright (C) 2013 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 236 matching lines @@
     }
 }
 
 void InspectorHeapProfilerAgent::removeProfile(ErrorString*, int rawUid)
 {
     unsigned uid = static_cast<unsigned>(rawUid);
     if (m_snapshots.contains(uid))
         m_snapshots.remove(uid);
 }
 
-void InspectorHeapProfilerAgent::takeHeapSnapshot(ErrorString*, const bool* reportProgress)
+void InspectorHeapProfilerAgent::takeHeapSnapshot(ErrorString* errorString, const bool* reportProgress)
 {
     class HeapSnapshotProgress: public ScriptProfiler::HeapSnapshotProgress {
     public:
         explicit HeapSnapshotProgress(InspectorFrontend::HeapProfiler* frontend)
             : m_frontend(frontend) { }
         void Start(int totalWork)
         {
             m_totalWork = totalWork;
         }
         void Worked(int workDone)
         {
             if (m_frontend)
-                m_frontend->reportHeapSnapshotProgress(workDone, m_totalWork);
+                m_frontend->reportHeapSnapshotProgress(workDone, m_totalWork, 0);
         }
-        void Done() { }
+        void Done()
+        {
+            const bool finished = true;
+            if (m_frontend)
+                m_frontend->reportHeapSnapshotProgress(m_totalWork, m_totalWork, &finished);

[alph, 2013/12/23 14:06:59]

Do you really need to add this parameter?
Can't it just assume the snapshotting is finished when workDone equals
totalWork?

+        }
         bool isCanceled() { return false; }
     private:
         InspectorFrontend::HeapProfiler* m_frontend;
         int m_totalWork;
     };
 
     String title = "Snapshot " + String::number(m_nextUserInitiatedHeapSnapshotNumber++);
     HeapSnapshotProgress progress(reportProgress && *reportProgress ? m_frontend : 0);
     RefPtr<ScriptHeapSnapshot> snapshot = ScriptProfiler::takeHeapSnapshot(title, &progress);
-    if (snapshot) {
-        m_snapshots.add(snapshot->uid(), snapshot);
-        if (m_frontend)
-            m_frontend->addProfileHeader(createSnapshotHeader(*snapshot));
+    if (!snapshot) {
+        *errorString = "Failed to take heap snapshot";
+        return;
+    }
+
+    class OutputStream : public ScriptHeapSnapshot::OutputStream {
+    public:
+        OutputStream(InspectorFrontend::HeapProfiler* frontend, unsigned uid)
+            : m_frontend(frontend), m_uid(uid) { }
+        void Write(const String& chunk) { m_frontend->addHeapSnapshotChunk(m_uid, chunk); }
+        void Close() { }
+    private:
+        InspectorFrontend::HeapProfiler* m_frontend;
+        int m_uid;
+    };
+
+    if (m_frontend) {
+        unsigned uid = static_cast<unsigned>(snapshot->uid());
+        OutputStream stream(m_frontend, uid);
+        snapshot->writeJSON(&stream);
     }
 }
 
 void InspectorHeapProfilerAgent::getObjectByHeapObjectId(ErrorString* error, const String& heapSnapshotObjectId, const String* objectGroup, RefPtr<TypeBuilder::Runtime::RemoteObject>& result)
 {
     bool ok;
     unsigned id = heapSnapshotObjectId.toUInt(&ok);
     if (!ok) {
         *error = "Invalid heap snapshot object id";
         return;
@@ skipping 25 matching lines @@
     if (value.hasNoValue() || value.isUndefined()) {
         *errorString = "Object with given id not found";
         return;
     }
     unsigned id = ScriptProfiler::getHeapObjectId(value);
     *heapSnapshotObjectId = String::number(id);
 }
 
 } // namespace WebCore