Merge WebKit at r72805: Initial merge by Git

Note that this is a backwards merge from Chromium release 9.0.600.0
to 9.0.597.0, to align with the Chromium 9 stable release branch.

Change-Id: I5d2bb4e8cee9d39ae8485abf48bdb55ecf8b3790

1 files changed, 2 insertions, 21 deletions

diff --git a/WebCore/inspector/InspectorProfilerAgent.cpp b/WebCore/inspector/InspectorProfilerAgent.cpp
index 6d5364f..1248677 100644
--- a/WebCore/inspector/InspectorProfilerAgent.cpp
+++ b/WebCore/inspector/InspectorProfilerAgent.cpp
@@ -156,21 +156,6 @@ void InspectorProfilerAgent::getProfileHeaders(RefPtr<InspectorArray>* headers)
         (*headers)->pushObject(createSnapshotHeader(*it->second));
 }
 
-namespace {
-
-class OutputStream : public ScriptHeapSnapshot::OutputStream {
-public:
-    OutputStream(InspectorFrontend* frontend, unsigned long uid)
-        : m_frontend(frontend), m_uid(uid) { }
-    void Write(const String& chunk) { m_frontend->addHeapSnapshotChunk(m_uid, chunk); }
-    void Close() { m_frontend->finishHeapSnapshot(m_uid); }
-private:
-    InspectorFrontend* m_frontend;
-    unsigned long m_uid;
-};
-
-} // namespace
-
 void InspectorProfilerAgent::getProfile(const String& type, unsigned uid, RefPtr<InspectorObject>* profileObject)
 {
     if (type == CPUProfileType) {
@@ -182,12 +167,8 @@ void InspectorProfilerAgent::getProfile(const String& type, unsigned uid, RefPtr
     } else if (type == HeapProfileType) {
         HeapSnapshotsMap::iterator it = m_snapshots.find(uid);
         if (it != m_snapshots.end()) {
-            RefPtr<ScriptHeapSnapshot> snapshot = it->second;
-            *profileObject = createSnapshotHeader(*snapshot);
-            if (m_frontend) {
-                OutputStream stream(m_frontend, uid);
-                snapshot->writeJSON(&stream);
-            }
+            *profileObject = createSnapshotHeader(*it->second);
+            (*profileObject)->setObject("head", it->second->buildInspectorObjectForHead());
         }
     }
 }