JavaScriptCore-7601.1.46.3.tar.gz

[apple/javascriptcore.git] / tools / CodeProfile.h

diff --git a/tools/CodeProfile.h b/tools/CodeProfile.h
index ea360bcbc0bf24519fc25679c8961dbe87a75184..42f6de50ca4a69974134957b007134898caf99fb 100644 (file)
--- a/tools/CodeProfile.h
+++ b/tools/CodeProfile.h
@@ -33,14 +33,15 @@
 namespace JSC {
 
 class CodeProfile {
 namespace JSC {
 
 class CodeProfile {

+    WTF_MAKE_FAST_ALLOCATED;

 public:
     CodeProfile(const SourceCode& source, CodeProfile* parent)
         : m_file(source.provider()->url().utf8())
 public:
     CodeProfile(const SourceCode& source, CodeProfile* parent)
         : m_file(source.provider()->url().utf8())

-        , m_lineNo(source.firstLine())
+        , m_lineNumber(source.firstLine())

         , m_parent(parent)
     {
         if (parent)
         , m_parent(parent)
     {
         if (parent)

-            parent->addChild(this);
+            parent->addChild(std::unique_ptr<CodeProfile>(this));

     }
 
     void sample(void* pc, void** framePointer);
     }
 
     void sample(void* pc, void** framePointer);


@@ -51,9 +52,9 @@ public:
         return m_parent;
     }
     
         return m_parent;
     }
     

-    void addChild(CodeProfile* child)
+    void addChild(std::unique_ptr<CodeProfile> child)

     {
     {

-        m_children.append(adoptPtr(child));
+        m_children.append(WTF::move(child));

     }
 
 private:
     }
 
 private:


@@ -79,9 +80,9 @@ private:
     };
 
     CString m_file;
     };
 
     CString m_file;

-    unsigned m_lineNo;
+    unsigned m_lineNumber;

     CodeProfile* m_parent;
     CodeProfile* m_parent;

-    Vector< OwnPtr<CodeProfile> > m_children;
+    Vector<std::unique_ptr<CodeProfile>> m_children;

     TieredMMapArray<CodeRecord> m_samples;
 
     static const char* s_codeTypeNames[NumberOfCodeTypes];
     TieredMMapArray<CodeRecord> m_samples;
 
     static const char* s_codeTypeNames[NumberOfCodeTypes];