[tracing] Use trace event profiling for heap profiling

base/trace_event/trace_event.h

 // Copyright (c) 2012 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.
 
 #ifndef BASE_TRACE_EVENT_TRACE_EVENT_H_
 #define BASE_TRACE_EVENT_TRACE_EVENT_H_
 
 // This header file defines implementation details of how the trace macros in
 // trace_event_common.h collect and store trace events. Anything not
 // implementation-specific should go in trace_event_common.h instead of here.
@@ skipping 968 matching lines @@
       arg_values, nullptr, TRACE_EVENT_FLAG_NONE);
 }
 
 // Used by TRACE_EVENTx macros. Do not use directly.
 class TRACE_EVENT_API_CLASS_EXPORT ScopedTracer {
  public:
   // Note: members of data_ intentionally left uninitialized. See Initialize.
   ScopedTracer() : p_data_(NULL) {}
 
   ~ScopedTracer() {
-    if (p_data_ && *data_.category_group_enabled) {
-      TRACE_EVENT_API_UPDATE_TRACE_EVENT_DURATION(
-          data_.category_group_enabled, data_.name, data_.event_handle);
+    if (data_.name) {
+      if (p_data_ && *data_.category_group_enabled) {
+        TRACE_EVENT_API_UPDATE_TRACE_EVENT_DURATION(
+            data_.category_group_enabled, data_.name, data_.event_handle);
+      }
+      if (data_.initialized_for_profiling) {
+        base::trace_event::AllocationContextTracker::
+            GetInstanceForCurrentThread()
+                ->PopPseudoStackFrame(data_.name);
+      }
     }
-    // TODO(ssid): Pop the frame from the pseudo stack if initialized for
-    // profiling is true, after adding profiling mode in skia and Blink
-    // crbug.com/598426.
   }
 
   void Initialize(const unsigned char* category_group_enabled,
                   const char* name,
                   base::trace_event::TraceEventHandle event_handle) {
     data_.category_group_enabled = category_group_enabled;
     data_.name = name;
     data_.event_handle = event_handle;
     p_data_ = &data_;
   }
 
   void InitializeForHeapProfiling(const char* name, unsigned int flags) {
     if (!(flags & TRACE_EVENT_FLAG_COPY)) {
       data_.initialized_for_profiling = true;
       data_.name = name;
-      // TODO(ssid): Add the frame to the pseudo stack after adding profiling
-      // mode in skia and Blink crbug.com/598426.
+      base::trace_event::AllocationContextTracker::GetInstanceForCurrentThread()
+          ->PushPseudoStackFrame(name);
     }
   }
 
  private:
   // This Data struct workaround is to avoid initializing all the members
   // in Data during construction of this object, since this object is always
   // constructed, even when tracing is disabled. If the members of Data were
   // members of this class instead, compiler warnings occur about potential
   // uninitialized accesses.
   struct Data {
@@ skipping 86 matching lines @@
   const char* name_;
   IDType id_;
 
   DISALLOW_COPY_AND_ASSIGN(TraceScopedTrackableObject);
 };
 
 }  // namespace trace_event
 }  // namespace base
 
 #endif  // BASE_TRACE_EVENT_TRACE_EVENT_H_