Show
Ignore:
Timestamp:
08/15/08 13:25:16 (5 months ago)
Author:
mbensi
Message:

merge with webkit revision 35774

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • trunk/JavaScriptCore/profiler/ProfileGenerator.cpp

    r396 r437  
    3434static const char* NonJSExecution = "(idle)"; 
    3535 
    36 PassRefPtr<ProfileGenerator> ProfileGenerator::create(const UString& title, ExecState* originatingGlobalExec, unsigned profileGroup, ProfilerClient* client) 
     36PassRefPtr<ProfileGenerator> ProfileGenerator::create(const UString& title, ExecState* originatingGlobalExec, unsigned profileGroup, ProfilerClient* client, unsigned uid) 
    3737{ 
    38     return adoptRef(new ProfileGenerator(title, originatingGlobalExec, profileGroup, client)); 
     38    return adoptRef(new ProfileGenerator(title, originatingGlobalExec, profileGroup, client, uid)); 
    3939} 
    4040 
    41 ProfileGenerator::ProfileGenerator(const UString& title, ExecState* originatingGlobalExec, unsigned profileGroup, ProfilerClient* client) 
     41ProfileGenerator::ProfileGenerator(const UString& title, ExecState* originatingGlobalExec, unsigned profileGroup, ProfilerClient* client, unsigned uid) 
    4242    : m_originatingGlobalExec(originatingGlobalExec) 
    4343    , m_profileGroup(profileGroup) 
    …… 
    4646    , m_stoppedCallDepth(0) 
    4747{ 
    48     m_profile = Profile::create(title); 
     48    m_profile = Profile::create(title, uid); 
    4949    m_currentNode = m_head = m_profile->head(); 
    5050}