Changeset 35184 in webkit for trunk/JavaScriptCore/profiler/Profiler.cpp

Timestamp:

Jul 15, 2008, 10:48:00 AM (17 years ago)

Author:

[email protected]

Message:

JavaScriptCore:

2008-07-15 Kevin McCullough <​[email protected]>

Reviewed by Geoff.

Rename pageGroupIdentifier to profileGroup to keep mention of a
pageGroup out of JavaScriptCore.

• kjs/JSGlobalObject.cpp: (KJS::JSGlobalObject::init):
• kjs/JSGlobalObject.h: (KJS::JSGlobalObject::setProfileGroup): (KJS::JSGlobalObject::profileGroup):
• profiler/ProfileGenerator.cpp: (KJS::ProfileGenerator::create): (KJS::ProfileGenerator::ProfileGenerator):
• profiler/ProfileGenerator.h: (KJS::ProfileGenerator::profileGroup):
• profiler/Profiler.cpp: (KJS::Profiler::startProfiling): (KJS::dispatchFunctionToProfiles): (KJS::Profiler::willExecute): (KJS::Profiler::didExecute):

WebCore:

2008-07-15 Kevin McCullough <​[email protected]>

Reviewed by Geoff.

Rename pageGroupIdentifier to profileGroup to keep mention of a
pageGroup out of JavaScriptCore.

• bindings/js/JSQuarantinedObjectWrapper.cpp: (WebCore::JSQuarantinedObjectWrapper::allowsUnwrappedAccessFrom):
• bindings/js/ScriptController.cpp: (WebCore::ScriptController::clear): (WebCore::ScriptController::initScript):
• history/CachedPage.cpp: (WebCore::CachedPage::restore):

File:

• trunk/JavaScriptCore/profiler/Profiler.cpp (modified) (6 diffs)

trunk/JavaScriptCore/profiler/Profiler.cpp

@@ -71 +71 @@
 
     s_sharedEnabledProfilerReference = this;
-    RefPtr<ProfileGenerator> profileGenerator = ProfileGenerator::create(title, globalExec, exec->lexicalGlobalObject()->pageGroupIdentifier(), client);
+    RefPtr<ProfileGenerator> profileGenerator = ProfileGenerator::create(title, globalExec, exec->lexicalGlobalObject()->profileGroup(), client);
     m_currentProfiles.append(profileGenerator);
 }
@@ -103 +103 @@
 }
 
-static inline void dispatchFunctionToProfiles(const Vector<RefPtr<ProfileGenerator> >& profiles, ProfileGenerator::ProfileFunction function, const CallIdentifier& callIdentifier, unsigned currentPageGroupIdentifier)
+static inline void dispatchFunctionToProfiles(const Vector<RefPtr<ProfileGenerator> >& profiles, ProfileGenerator::ProfileFunction function, const CallIdentifier& callIdentifier, unsigned currentProfileTargetGroup)
 {
     for (size_t i = 0; i < profiles.size(); ++i) {
-        if (profiles[i]->pageGroupIdentifier() == currentPageGroupIdentifier)
+        if (profiles[i]->profileGroup() == currentProfileTargetGroup)
             (profiles[i].get()->*function)(callIdentifier);
     }
@@ -115 +115 @@
     ASSERT(!m_currentProfiles.isEmpty());
 
-    dispatchFunctionToProfiles(m_currentProfiles, &ProfileGenerator::willExecute, createCallIdentifier(calledFunction), exec->lexicalGlobalObject()->pageGroupIdentifier());
+    dispatchFunctionToProfiles(m_currentProfiles, &ProfileGenerator::willExecute, createCallIdentifier(calledFunction), exec->lexicalGlobalObject()->profileGroup());
 }
 
@@ -124 +124 @@
     CallIdentifier callIdentifier = createCallIdentifier(sourceURL, startingLineNumber);
 
-    dispatchFunctionToProfiles(m_currentProfiles, &ProfileGenerator::willExecute, callIdentifier, exec->lexicalGlobalObject()->pageGroupIdentifier());
+    dispatchFunctionToProfiles(m_currentProfiles, &ProfileGenerator::willExecute, callIdentifier, exec->lexicalGlobalObject()->profileGroup());
 }
 
@@ -131 +131 @@
     ASSERT(!m_currentProfiles.isEmpty());
 
-    dispatchFunctionToProfiles(m_currentProfiles, &ProfileGenerator::didExecute, createCallIdentifier(calledFunction), exec->lexicalGlobalObject()->pageGroupIdentifier());
+    dispatchFunctionToProfiles(m_currentProfiles, &ProfileGenerator::didExecute, createCallIdentifier(calledFunction), exec->lexicalGlobalObject()->profileGroup());
 }
 
@@ -138 +138 @@
     ASSERT(!m_currentProfiles.isEmpty());
 
-    dispatchFunctionToProfiles(m_currentProfiles, &ProfileGenerator::didExecute, createCallIdentifier(sourceURL, startingLineNumber), exec->lexicalGlobalObject()->pageGroupIdentifier());
+    dispatchFunctionToProfiles(m_currentProfiles, &ProfileGenerator::didExecute, createCallIdentifier(sourceURL, startingLineNumber), exec->lexicalGlobalObject()->profileGroup());
 }