DevTools: Move usedHeapSize from TimelineEvent into counters.

Source/core/inspector/InspectorTimelineAgent.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 1042 matching lines @@
 
 static size_t getUsedHeapSize()
 {
     HeapInfo info;
     ScriptGCEvent::getHeapSize(info);
     return info.usedJSHeapSize;
 }
 
 void InspectorTimelineAgent::setCounters(TimelineEvent* record)
 {
-    record->setUsedHeapSize(getUsedHeapSize());
-
-    if (m_state->getBoolean(TimelineAgentState::includeCounters) && m_inspectorType == PageInspector) {
-        RefPtr<TypeBuilder::Timeline::Counters> counters = TypeBuilder::Timeline::Counters::create();
+    if (!m_state->getBoolean(TimelineAgentState::includeCounters))
+        return;
+    RefPtr<TypeBuilder::Timeline::Counters> counters = TypeBuilder::Timeline::Counters::create();
+    if (m_inspectorType == PageInspector) {
         counters->setDocuments(InspectorCounters::counterValue(InspectorCounters::DocumentCounter));
         counters->setNodes(InspectorCounters::counterValue(InspectorCounters::NodeCounter));
         counters->setJsEventListeners(InspectorCounters::counterValue(InspectorCounters::JSEventListenerCounter));
-        record->setCounters(counters.release());
     }
+    counters->setJsHeapSizeUsed(static_cast<double>(getUsedHeapSize()));
+    record->setCounters(counters.release());
 }
 
 void InspectorTimelineAgent::setFrameIdentifier(TimelineEvent* record, Frame* frame)
 {
     if (!frame || !m_pageAgent)
         return;
     String frameId;
     if (frame && m_pageAgent)
         frameId = m_pageAgent->frameId(frame);
     record->setFrameId(frameId);
@@ skipping 188 matching lines @@
 
 #ifndef NDEBUG
 bool TimelineRecordStack::isOpenRecordOfType(const String& type)
 {
     return !m_stack.isEmpty() && m_stack.last().type == type;
 }
 #endif
 
 } // namespace WebCore