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/Profiler.cpp

    r396 r437  
    4242static const char* GlobalCodeExecution = "(program)"; 
    4343static const char* AnonymousFunction = "(anonymous function)"; 
     44static unsigned ProfilesUID = 0; 
    4445 
    4546static CallIdentifier createCallIdentifier(JSObject*); 
    …… 
    7172 
    7273    s_sharedEnabledProfilerReference = this; 
    73     RefPtr<ProfileGenerator> profileGenerator = ProfileGenerator::create(title, globalExec, exec->lexicalGlobalObject()->profileGroup(), client); 
     74    RefPtr<ProfileGenerator> profileGenerator = ProfileGenerator::create(title, globalExec, exec->lexicalGlobalObject()->profileGroup(), client, ++ProfilesUID); 
    7475    m_currentProfiles.append(profileGenerator); 
    7576}