Changeset 167530 in webkit

Timestamp:

Apr 18, 2014, 11:03:40 PM (11 years ago)

Author:

timothy@apple.com

Message:

Web Inspector: Move InspectorProfilerAgent to JavaScriptCore
​https://bugs.webkit.org/show_bug.cgi?id=131673

Passes existing profiler and inspector tests.

Reviewed by Joseph Pecoraro.

• CMakeLists.txt:
• DerivedSources.make:

Source/JavaScriptCore:

• JavaScriptCore.vcxproj/JavaScriptCore.vcxproj:
• JavaScriptCore.vcxproj/JavaScriptCore.vcxproj.filters:
• JavaScriptCore.xcodeproj/project.pbxproj:
• inspector/JSConsoleClient.cpp:

(Inspector::JSConsoleClient::JSConsoleClient):
(Inspector::JSConsoleClient::profile):
(Inspector::JSConsoleClient::profileEnd):
(Inspector::JSConsoleClient::count): Deleted.

• inspector/JSConsoleClient.h:
• inspector/JSGlobalObjectInspectorController.cpp:

(Inspector::JSGlobalObjectInspectorController::JSGlobalObjectInspectorController):

• inspector/agents/InspectorProfilerAgent.cpp: Added.

(Inspector::InspectorProfilerAgent::InspectorProfilerAgent):
(Inspector::InspectorProfilerAgent::~InspectorProfilerAgent):
(Inspector::InspectorProfilerAgent::addProfile):
(Inspector::InspectorProfilerAgent::createProfileHeader):
(Inspector::InspectorProfilerAgent::enable):
(Inspector::InspectorProfilerAgent::disable):
(Inspector::InspectorProfilerAgent::getUserInitiatedProfileName):
(Inspector::InspectorProfilerAgent::getProfileHeaders):
(Inspector::buildInspectorObject):
(Inspector::InspectorProfilerAgent::buildProfileInspectorObject):
(Inspector::InspectorProfilerAgent::getCPUProfile):
(Inspector::InspectorProfilerAgent::removeProfile):
(Inspector::InspectorProfilerAgent::reset):
(Inspector::InspectorProfilerAgent::didCreateFrontendAndBackend):
(Inspector::InspectorProfilerAgent::willDestroyFrontendAndBackend):
(Inspector::InspectorProfilerAgent::start):
(Inspector::InspectorProfilerAgent::stop):
(Inspector::InspectorProfilerAgent::setRecordingProfile):
(Inspector::InspectorProfilerAgent::startProfiling):
(Inspector::InspectorProfilerAgent::stopProfiling):

• inspector/agents/InspectorProfilerAgent.h: Added.
• inspector/agents/JSGlobalObjectProfilerAgent.cpp: Copied from Source/WebCore/inspector/ScriptProfile.idl.

(Inspector::JSGlobalObjectProfilerAgent::JSGlobalObjectProfilerAgent):
(Inspector::JSGlobalObjectProfilerAgent::profilingGlobalExecState):

• inspector/agents/JSGlobalObjectProfilerAgent.h: Copied from Source/WebCore/inspector/ScriptProfile.idl.
• inspector/protocol/Profiler.json: Renamed from Source/WebCore/inspector/protocol/Profiler.json.
• profiler/Profile.h:
• runtime/ConsoleClient.h:

Source/WebCore:

• ForwardingHeaders/inspector/agents/InspectorProfilerAgent.h: Added.
• WebCore.exp.in:
• WebCore.vcxproj/WebCore.vcxproj:
• WebCore.vcxproj/WebCore.vcxproj.filters:
• WebCore.xcodeproj/project.pbxproj:
• bindings/js/ScriptProfile.cpp: Removed.
• bindings/js/ScriptProfile.h:
• bindings/js/ScriptProfiler.cpp: Removed.
• bindings/js/ScriptProfiler.h: Removed.
• inspector/InspectorAllInOne.cpp:
• inspector/InspectorConsoleInstrumentation.h:

(WebCore::InspectorInstrumentation::profilerEnabled):
(WebCore::InspectorInstrumentation::startProfiling):
(WebCore::InspectorInstrumentation::stopProfiling):

• inspector/InspectorController.cpp:

(WebCore::InspectorController::InspectorController):

• inspector/InspectorController.h:
• inspector/InspectorInstrumentation.cpp:

(WebCore::InspectorInstrumentation::didCommitLoadImpl):
(WebCore::InspectorInstrumentation::startProfilingImpl):
(WebCore::InspectorInstrumentation::stopProfilingImpl):
(WebCore::InspectorInstrumentation::consoleTimeStampImpl): Deleted.

• inspector/InspectorInstrumentation.h:
• inspector/InspectorProfilerAgent.cpp: Removed.
• inspector/InspectorProfilerAgent.h: Removed.
• inspector/InspectorTimelineAgent.cpp:

(WebCore::startProfiling):
(WebCore::stopProfiling):
(WebCore::InspectorTimelineAgent::willCallFunction):
(WebCore::InspectorTimelineAgent::didCallFunction):
(WebCore::InspectorTimelineAgent::willEvaluateScript):
(WebCore::InspectorTimelineAgent::didEvaluateScript):
(WebCore::InspectorTimelineAgent::didDispatchXHRLoadEvent): Deleted.

• inspector/InstrumentingAgents.h:

(WebCore::InstrumentingAgents::inspectorProfilerAgent):
(WebCore::InstrumentingAgents::setInspectorProfilerAgent):

• inspector/PageDebuggerAgent.cpp:

(WebCore::PageDebuggerAgent::sourceMapURLForScript): Deleted.

• inspector/PageDebuggerAgent.h:
• inspector/PageProfilerAgent.cpp: Added.

(WebCore::PageProfilerAgent::PageProfilerAgent):
(WebCore::PageProfilerAgent::profilingGlobalExecState):

• inspector/PageProfilerAgent.h: Added.

(WebCore::PageProfilerAgent::~PageProfilerAgent):

• inspector/ScriptProfile.idl:
• inspector/TimelineRecordFactory.cpp:

(WebCore::TimelineRecordFactory::appendProfile):

• inspector/TimelineRecordFactory.h:
• inspector/WebConsoleAgent.cpp:
• inspector/WebProfilerAgent.cpp: Added.

(WebCore::WebProfilerAgent::WebProfilerAgent):
(WebCore::WebProfilerAgent::enable):
(WebCore::WebProfilerAgent::disable):

• inspector/WebProfilerAgent.h: Added.

(WebCore::WebProfilerAgent::~WebProfilerAgent):

• inspector/WorkerInspectorController.cpp:

(WebCore::WorkerInspectorController::WorkerInspectorController):

• inspector/WorkerProfilerAgent.cpp: Added.

(WebCore::WorkerProfilerAgent::WorkerProfilerAgent):
(WebCore::WorkerProfilerAgent::profilingGlobalExecState):

• inspector/WorkerProfilerAgent.h: Added.

(WebCore::WorkerProfilerAgent::~WorkerProfilerAgent):

• loader/appcache/ApplicationCacheGroup.cpp:
• page/PageConsole.cpp:

(WebCore::PageConsole::profile):
(WebCore::PageConsole::profileEnd):
(WebCore::PageConsole::time): Deleted.
(WebCore::PageConsole::timeEnd): Deleted.
(WebCore::PageConsole::timeStamp): Deleted.

• page/PageConsole.h:
• testing/Internals.cpp:
• testing/Internals.h:
• xml/XMLHttpRequest.cpp:

Location:

trunk/Source

Files:

• JavaScriptCore/CMakeLists.txt (modified) (2 diffs)
• JavaScriptCore/ChangeLog (modified) (1 diff)
• JavaScriptCore/DerivedSources.make (modified) (1 diff)
• JavaScriptCore/JavaScriptCore.vcxproj/JavaScriptCore.vcxproj (modified) (2 diffs)
• JavaScriptCore/JavaScriptCore.vcxproj/JavaScriptCore.vcxproj.filters (modified) (2 diffs)
• JavaScriptCore/JavaScriptCore.xcodeproj/project.pbxproj (modified) (8 diffs)
• JavaScriptCore/inspector/JSConsoleClient.cpp (modified) (3 diffs)
• JavaScriptCore/inspector/JSConsoleClient.h (modified) (2 diffs)
• JavaScriptCore/inspector/JSGlobalObjectInspectorController.cpp (modified) (2 diffs)
• JavaScriptCore/inspector/agents/InspectorProfilerAgent.cpp (added)
• JavaScriptCore/inspector/agents/InspectorProfilerAgent.h (added)
• JavaScriptCore/inspector/agents/JSGlobalObjectProfilerAgent.cpp (copied) (copied from trunk/Source/WebCore/inspector/ScriptProfile.idl ) (2 diffs)
• JavaScriptCore/inspector/agents/JSGlobalObjectProfilerAgent.h (copied) (copied from trunk/Source/WebCore/inspector/ScriptProfile.idl ) (2 diffs)
• JavaScriptCore/inspector/protocol/Profiler.json (moved) (moved from trunk/Source/WebCore/inspector/protocol/Profiler.json )
• JavaScriptCore/profiler/Profile.h (modified) (1 diff)
• JavaScriptCore/runtime/ConsoleClient.h (modified) (1 diff)
• WebCore/CMakeLists.txt (modified) (5 diffs)
• WebCore/ChangeLog (modified) (1 diff)
• WebCore/DerivedSources.make (modified) (1 diff)
• WebCore/ForwardingHeaders/inspector/agents/InspectorProfilerAgent.h (added)
• WebCore/WebCore.exp.in (modified) (1 diff)
• WebCore/WebCore.vcxproj/WebCore.vcxproj (modified) (10 diffs)
• WebCore/WebCore.vcxproj/WebCore.vcxproj.filters (modified) (10 diffs)
• WebCore/WebCore.xcodeproj/project.pbxproj (modified) (21 diffs)
• WebCore/bindings/js/JSBindingsAllInOne.cpp (modified) (1 diff)
• WebCore/bindings/js/ScriptProfile.cpp (deleted)
• WebCore/bindings/js/ScriptProfile.h (modified) (1 diff)
• WebCore/bindings/js/ScriptProfiler.cpp (deleted)
• WebCore/bindings/js/ScriptProfiler.h (deleted)
• WebCore/inspector/InspectorAllInOne.cpp (modified) (3 diffs)
• WebCore/inspector/InspectorConsoleInstrumentation.h (modified) (1 diff)
• WebCore/inspector/InspectorController.cpp (modified) (4 diffs)
• WebCore/inspector/InspectorController.h (modified) (3 diffs)
• WebCore/inspector/InspectorInstrumentation.cpp (modified) (5 diffs)
• WebCore/inspector/InspectorInstrumentation.h (modified) (4 diffs)
• WebCore/inspector/InspectorProfilerAgent.cpp (deleted)
• WebCore/inspector/InspectorProfilerAgent.h (deleted)
• WebCore/inspector/InspectorTimelineAgent.cpp (modified) (6 diffs)
• WebCore/inspector/InstrumentingAgents.h (modified) (4 diffs)
• WebCore/inspector/PageDebuggerAgent.cpp (modified) (1 diff)
• WebCore/inspector/PageDebuggerAgent.h (modified) (1 diff)
• WebCore/inspector/PageProfilerAgent.cpp (copied) (copied from trunk/Source/WebCore/inspector/ScriptProfile.idl ) (2 diffs)
• WebCore/inspector/PageProfilerAgent.h (copied) (copied from trunk/Source/WebCore/inspector/ScriptProfile.idl ) (2 diffs)
• WebCore/inspector/ScriptProfile.idl (modified) (1 diff)
• WebCore/inspector/TimelineRecordFactory.cpp (modified) (2 diffs)
• WebCore/inspector/TimelineRecordFactory.h (modified) (2 diffs)
• WebCore/inspector/WebConsoleAgent.cpp (modified) (1 diff)
• WebCore/inspector/WebProfilerAgent.cpp (copied) (copied from trunk/Source/WebCore/inspector/ScriptProfile.idl ) (2 diffs)
• WebCore/inspector/WebProfilerAgent.h (copied) (copied from trunk/Source/WebCore/inspector/ScriptProfile.idl ) (2 diffs)
• WebCore/inspector/WorkerInspectorController.cpp (modified) (3 diffs)
• WebCore/inspector/WorkerProfilerAgent.cpp (copied) (copied from trunk/Source/WebCore/inspector/ScriptProfile.idl ) (2 diffs)
• WebCore/inspector/WorkerProfilerAgent.h (copied) (copied from trunk/Source/WebCore/inspector/ScriptProfile.idl ) (2 diffs)
• WebCore/loader/appcache/ApplicationCacheGroup.cpp (modified) (1 diff)
• WebCore/page/PageConsole.cpp (modified) (2 diffs)
• WebCore/page/PageConsole.h (modified) (2 diffs)
• WebCore/testing/Internals.cpp (modified) (1 diff)
• WebCore/testing/Internals.h (modified) (3 diffs)
• WebCore/xml/XMLHttpRequest.cpp (modified) (1 diff)
• WebKit/WebKit.vcxproj/WebKitExportGenerator/WebKitExports.def.in (modified) (1 diff)

trunk/Source/JavaScriptCore/CMakeLists.txt

@@ -268 +268 @@
     inspector/agents/InspectorConsoleAgent.cpp
     inspector/agents/InspectorDebuggerAgent.cpp
+    inspector/agents/InspectorProfilerAgent.cpp
     inspector/agents/InspectorRuntimeAgent.cpp
 
@@ -832 +833 @@
     ${JAVASCRIPTCORE_DIR}/inspector/protocol/GenericTypes.json
     ${JAVASCRIPTCORE_DIR}/inspector/protocol/InspectorDomain.json
+    ${JAVASCRIPTCORE_DIR}/inspector/protocol/Profiler.json
     ${JAVASCRIPTCORE_DIR}/inspector/protocol/Runtime.json
 )

trunk/Source/JavaScriptCore/ChangeLog

@@ +1 @@
+2014-04-18  Timothy Hatcher  <timothy@apple.com>
+
+        Web Inspector: Move InspectorProfilerAgent to JavaScriptCore
+        https://bugs.webkit.org/show_bug.cgi?id=131673
+
+        Passes existing profiler and inspector tests.
+
+        Reviewed by Joseph Pecoraro.
+
+        * CMakeLists.txt:
+        * DerivedSources.make:
+        * JavaScriptCore.vcxproj/JavaScriptCore.vcxproj:
+        * JavaScriptCore.vcxproj/JavaScriptCore.vcxproj.filters:
+        * JavaScriptCore.xcodeproj/project.pbxproj:
+        * inspector/JSConsoleClient.cpp:
+        (Inspector::JSConsoleClient::JSConsoleClient):
+        (Inspector::JSConsoleClient::profile):
+        (Inspector::JSConsoleClient::profileEnd):
+        (Inspector::JSConsoleClient::count): Deleted.
+        * inspector/JSConsoleClient.h:
+        * inspector/JSGlobalObjectInspectorController.cpp:
+        (Inspector::JSGlobalObjectInspectorController::JSGlobalObjectInspectorController):
+        * inspector/agents/InspectorProfilerAgent.cpp: Added.
+        (Inspector::InspectorProfilerAgent::InspectorProfilerAgent):
+        (Inspector::InspectorProfilerAgent::~InspectorProfilerAgent):
+        (Inspector::InspectorProfilerAgent::addProfile):
+        (Inspector::InspectorProfilerAgent::createProfileHeader):
+        (Inspector::InspectorProfilerAgent::enable):
+        (Inspector::InspectorProfilerAgent::disable):
+        (Inspector::InspectorProfilerAgent::getUserInitiatedProfileName):
+        (Inspector::InspectorProfilerAgent::getProfileHeaders):
+        (Inspector::buildInspectorObject):
+        (Inspector::InspectorProfilerAgent::buildProfileInspectorObject):
+        (Inspector::InspectorProfilerAgent::getCPUProfile):
+        (Inspector::InspectorProfilerAgent::removeProfile):
+        (Inspector::InspectorProfilerAgent::reset):
+        (Inspector::InspectorProfilerAgent::didCreateFrontendAndBackend):
+        (Inspector::InspectorProfilerAgent::willDestroyFrontendAndBackend):
+        (Inspector::InspectorProfilerAgent::start):
+        (Inspector::InspectorProfilerAgent::stop):
+        (Inspector::InspectorProfilerAgent::setRecordingProfile):
+        (Inspector::InspectorProfilerAgent::startProfiling):
+        (Inspector::InspectorProfilerAgent::stopProfiling):
+        * inspector/agents/InspectorProfilerAgent.h: Added.
+        * inspector/agents/JSGlobalObjectProfilerAgent.cpp: Copied from Source/WebCore/inspector/ScriptProfile.idl.
+        (Inspector::JSGlobalObjectProfilerAgent::JSGlobalObjectProfilerAgent):
+        (Inspector::JSGlobalObjectProfilerAgent::profilingGlobalExecState):
+        * inspector/agents/JSGlobalObjectProfilerAgent.h: Copied from Source/WebCore/inspector/ScriptProfile.idl.
+        * inspector/protocol/Profiler.json: Renamed from Source/WebCore/inspector/protocol/Profiler.json.
+        * profiler/Profile.h:
+        * runtime/ConsoleClient.h:
+
 2014-04-18  Commit Queue  <commit-queue@webkit.org>
 

trunk/Source/JavaScriptCore/DerivedSources.make

@@ -108 +108 @@
     $(JavaScriptCore)/inspector/protocol/GenericTypes.json \
     $(JavaScriptCore)/inspector/protocol/InspectorDomain.json \
+    $(JavaScriptCore)/inspector/protocol/Profiler.json \
     $(JavaScriptCore)/inspector/protocol/Runtime.json \
 #

trunk/Source/JavaScriptCore/JavaScriptCore.vcxproj/JavaScriptCore.vcxproj

@@ -514 +514 @@
     <ClCompile Include="..\inspector\agents\InspectorConsoleAgent.cpp" />
     <ClCompile Include="..\inspector\agents\InspectorDebuggerAgent.cpp" />
+    <ClCompile Include="..\inspector\agents\InspectorProfilerAgent.cpp" />
     <ClCompile Include="..\inspector\agents\InspectorRuntimeAgent.cpp" />
     <ClCompile Include="..\interpreter\AbstractPC.cpp" />
@@ -1130 +1131 @@
     <ClInclude Include="..\inspector\agents\InspectorConsoleAgent.h" />
     <ClInclude Include="..\inspector\agents\InspectorDebuggerAgent.h" />
+    <ClInclude Include="..\inspector\agents\InspectorProfilerAgent.h" />
     <ClInclude Include="..\inspector\agents\InspectorRuntimeAgent.h" />
     <ClInclude Include="..\interpreter\AbstractPC.h" />

trunk/Source/JavaScriptCore/JavaScriptCore.vcxproj/JavaScriptCore.vcxproj.filters

@@ -325 +325 @@
       <Filter>inspector</Filter>
     </ClCompile>
+    <ClCompile Include="..\inspector\agents\InspectorProfilerAgent.cpp">
+      <Filter>inspector</Filter>
+    </ClCompile>
     <ClCompile Include="..\inspector\agents\InspectorRuntimeAgent.cpp">
       <Filter>inspector</Filter>
@@ -1873 +1876 @@
     </ClInclude>
     <ClInclude Include="..\inspector\agents\InspectorDebuggerAgent.h">
+      <Filter>inspector</Filter>
+    </ClInclude>
+    <ClInclude Include="..\inspector\agents\InspectorProfilerAgent.h">
       <Filter>inspector</Filter>
     </ClInclude>

trunk/Source/JavaScriptCore/JavaScriptCore.xcodeproj/project.pbxproj

@@ -783 +783 @@
                 1A28D4A8177B71C80007FA3C /* JSStringRefPrivate.h in Headers */ = {isa = PBXBuildFile; fileRef = 1A28D4A7177B71C80007FA3C /* JSStringRefPrivate.h */; settings = {ATTRIBUTES = (Private, ); }; };
                 1ACF7377171CA6FB00C9BB1E /* Weak.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1ACF7376171CA6FB00C9BB1E /* Weak.cpp */; };
+                1CAA9A1E18F4997F000A369D /* InspectorProfilerAgent.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1CAA9A1C18F4997F000A369D /* InspectorProfilerAgent.cpp */; };
+                1CAA9A1F18F4997F000A369D /* InspectorProfilerAgent.h in Headers */ = {isa = PBXBuildFile; fileRef = 1CAA9A1D18F4997F000A369D /* InspectorProfilerAgent.h */; settings = {ATTRIBUTES = (Private, ); }; };
+                1CAA9A2218F4A220000A369D /* JSGlobalObjectProfilerAgent.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1CAA9A2018F4A220000A369D /* JSGlobalObjectProfilerAgent.cpp */; };
+                1CAA9A2318F4A220000A369D /* JSGlobalObjectProfilerAgent.h in Headers */ = {isa = PBXBuildFile; fileRef = 1CAA9A2118F4A220000A369D /* JSGlobalObjectProfilerAgent.h */; };
                 2600B5A6152BAAA70091EE5F /* JSStringJoiner.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2600B5A4152BAAA70091EE5F /* JSStringJoiner.cpp */; };
                 2600B5A7152BAAA70091EE5F /* JSStringJoiner.h in Headers */ = {isa = PBXBuildFile; fileRef = 2600B5A5152BAAA70091EE5F /* JSStringJoiner.h */; };
@@ -2545 +2549 @@
                 1CAA8B4A0D32C39A0041BCFF /* JavaScript.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = JavaScript.h; sourceTree = "<group>"; };
                 1CAA8B4B0D32C39A0041BCFF /* JavaScriptCore.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = JavaScriptCore.h; sourceTree = "<group>"; };
+                1CAA9A1C18F4997F000A369D /* InspectorProfilerAgent.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = InspectorProfilerAgent.cpp; sourceTree = "<group>"; };
+                1CAA9A1D18F4997F000A369D /* InspectorProfilerAgent.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = InspectorProfilerAgent.h; sourceTree = "<group>"; };
+                1CAA9A2018F4A220000A369D /* JSGlobalObjectProfilerAgent.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = JSGlobalObjectProfilerAgent.cpp; sourceTree = "<group>"; };
+                1CAA9A2118F4A220000A369D /* JSGlobalObjectProfilerAgent.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = JSGlobalObjectProfilerAgent.h; sourceTree = "<group>"; };
                 2600B5A4152BAAA70091EE5F /* JSStringJoiner.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = JSStringJoiner.cpp; sourceTree = "<group>"; };
                 2600B5A5152BAAA70091EE5F /* JSStringJoiner.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = JSStringJoiner.h; sourceTree = "<group>"; };
@@ -5052 +5060 @@
                                 A57D23E31890CEBF0031C7FA /* InspectorDebuggerAgent.cpp */,
                                 A57D23E41890CEBF0031C7FA /* InspectorDebuggerAgent.h */,
+                                1CAA9A1C18F4997F000A369D /* InspectorProfilerAgent.cpp */,
+                                1CAA9A1D18F4997F000A369D /* InspectorProfilerAgent.h */,
                                 A50E4B5D18809DD50068A46D /* InspectorRuntimeAgent.cpp */,
                                 A50E4B5E18809DD50068A46D /* InspectorRuntimeAgent.h */,
@@ -5058 +5068 @@
                                 A57D23E71891B0770031C7FA /* JSGlobalObjectDebuggerAgent.cpp */,
                                 A57D23E81891B0770031C7FA /* JSGlobalObjectDebuggerAgent.h */,
+                                1CAA9A2018F4A220000A369D /* JSGlobalObjectProfilerAgent.cpp */,
+                                1CAA9A2118F4A220000A369D /* JSGlobalObjectProfilerAgent.h */,
                                 A50E4B5F18809DD50068A46D /* JSGlobalObjectRuntimeAgent.cpp */,
                                 A50E4B6018809DD50068A46D /* JSGlobalObjectRuntimeAgent.h */,
@@ -5891 +5903 @@
                                 BC18C4170E16F5CD00B34460 /* JSArray.h in Headers */,
                                 0F2B66E317B6B5AB00A7AE3F /* JSArrayBuffer.h in Headers */,
+                                1CAA9A2318F4A220000A369D /* JSGlobalObjectProfilerAgent.h in Headers */,
                                 0F2B66E517B6B5AB00A7AE3F /* JSArrayBufferConstructor.h in Headers */,
                                 0F2B66E717B6B5AB00A7AE3F /* JSArrayBufferPrototype.h in Headers */,
@@ -5917 +5930 @@
                                 0F7576D318E1FEE9002EF4CD /* AccessorCallJITStubRoutine.h in Headers */,
                                 0F2B66EC17B6B5AB00A7AE3F /* JSDataView.h in Headers */,
+                                1CAA9A1F18F4997F000A369D /* InspectorProfilerAgent.h in Headers */,
                                 0F2B66EE17B6B5AB00A7AE3F /* JSDataViewPrototype.h in Headers */,
                                 978801411471AD920041B016 /* JSDateMath.h in Headers */,
@@ -7010 +7024 @@
                                 0F6B1CC31862C47800845D97 /* FTLRegisterAtOffset.cpp in Sources */,
                                 0FCEFAAB1804C13E00472CE4 /* FTLSaveRestore.cpp in Sources */,
+                                1CAA9A2218F4A220000A369D /* JSGlobalObjectProfilerAgent.cpp in Sources */,
                                 0F25F1B1181635F300522F39 /* FTLSlowPathCall.cpp in Sources */,
                                 0F25F1B3181635F300522F39 /* FTLSlowPathCallKey.cpp in Sources */,
@@ -7229 +7244 @@
                                 0F13912916771C33009CCB07 /* ProfilerBytecodeSequence.cpp in Sources */,
                                 0FF729AF166AD35C000F5BA3 /* ProfilerCompilation.cpp in Sources */,
+                                1CAA9A1E18F4997F000A369D /* InspectorProfilerAgent.cpp in Sources */,
                                 0FF729B0166AD35C000F5BA3 /* ProfilerCompilationKind.cpp in Sources */,
                                 0FF729B1166AD35C000F5BA3 /* ProfilerCompiledBytecode.cpp in Sources */,

trunk/Source/JavaScriptCore/inspector/JSConsoleClient.cpp

@@ -30 +30 @@
 
 #include "InspectorConsoleAgent.h"
+#include "InspectorProfilerAgent.h"
 #include "ScriptArguments.h"
 #include "ScriptCallStack.h"
@@ -66 +67 @@
 }
 
-JSConsoleClient::JSConsoleClient(InspectorConsoleAgent* consoleAgent)
+JSConsoleClient::JSConsoleClient(InspectorConsoleAgent* consoleAgent, InspectorProfilerAgent* profilerAgent)
     : ConsoleClient()
     , m_consoleAgent(consoleAgent)
+    , m_profilerAgent(profilerAgent)
 {
     static std::once_flag initializeLogging;
@@ -93 +95 @@
 }
 
-void JSConsoleClient::profile(ExecState*, const String&)
+void JSConsoleClient::profile(JSC::ExecState* exec, const String& title)
 {
-    // FIXME: JSContext inspection needs a profiler.
-    warnUnimplemented(ASCIILiteral("console.profile"));
+    if (!m_profilerAgent->enabled())
+        return;
+
+    String resolvedTitle = m_profilerAgent->startProfiling(title);
+
+    RefPtr<ScriptCallStack> callStack(createScriptCallStackForConsole(exec, 1));
+    m_consoleAgent->addMessageToConsole(MessageSource::ConsoleAPI, MessageType::Profile, MessageLevel::Debug, resolvedTitle, callStack);
 }
 
-void JSConsoleClient::profileEnd(ExecState*, const String&)
+void JSConsoleClient::profileEnd(JSC::ExecState* exec, const String& title)
 {
-    // FIXME: JSContext inspection needs a profiler.
-    // Already warned in profile(), we do not need to warn again.
+    if (!m_profilerAgent->enabled())
+        return;
+
+    RefPtr<JSC::Profile> profile = m_profilerAgent->stopProfiling(title);
+    if (!profile)
+        return;
+
+    RefPtr<ScriptCallStack> callStack(createScriptCallStackForConsole(exec, 1));
+    String message = makeString(profile->title(), '#', String::number(profile->uid()));
+    m_consoleAgent->addMessageToConsole(MessageSource::ConsoleAPI, MessageType::Profile, MessageLevel::Debug, message, callStack);
 }
 

trunk/Source/JavaScriptCore/inspector/JSConsoleClient.h

@@ -32 +32 @@
 
 class InspectorConsoleAgent;
+class InspectorProfilerAgent;
 
 class JSConsoleClient final : public JSC::ConsoleClient {
 public:
-    explicit JSConsoleClient(InspectorConsoleAgent*);
+    explicit JSConsoleClient(InspectorConsoleAgent*, InspectorProfilerAgent*);
     virtual ~JSConsoleClient() { }
 
@@ -56 +57 @@
 
     InspectorConsoleAgent* m_consoleAgent;
+    InspectorProfilerAgent* m_profilerAgent;
 };
 

trunk/Source/JavaScriptCore/inspector/JSGlobalObjectInspectorController.cpp

@@ -40 +40 @@
 #include "JSGlobalObjectConsoleAgent.h"
 #include "JSGlobalObjectDebuggerAgent.h"
+#include "JSGlobalObjectProfilerAgent.h"
 #include "JSGlobalObjectRuntimeAgent.h"
 #include "ScriptArguments.h"
@@ -61 +62 @@
     auto consoleAgent = std::make_unique<JSGlobalObjectConsoleAgent>(m_injectedScriptManager.get());
     auto debuggerAgent = std::make_unique<JSGlobalObjectDebuggerAgent>(m_injectedScriptManager.get(), m_globalObject, consoleAgent.get());
+    auto profilerAgent = std::make_unique<JSGlobalObjectProfilerAgent>(m_globalObject);
 
     m_consoleAgent = consoleAgent.get();
-    m_consoleClient = std::make_unique<JSConsoleClient>(m_consoleAgent);
+    m_consoleClient = std::make_unique<JSConsoleClient>(m_consoleAgent, profilerAgent.get());
 
     runtimeAgent->setScriptDebugServer(&debuggerAgent->scriptDebugServer());
+    profilerAgent->setScriptDebugServer(&debuggerAgent->scriptDebugServer());
 
     m_agents.append(std::make_unique<InspectorAgent>());

trunk/Source/JavaScriptCore/inspector/agents/JSGlobalObjectProfilerAgent.cpp

@@ -1 +1 @@
 /*
- * Copyright (C) 2010 Apple Inc. All rights reserved.
- * Copyright (C) 2010 Google Inc. All rights reserved.
+ * Copyright (C) 2014 Apple Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -25 +24 @@
  */
 
-[
-    NoInterfaceObject,
-] interface ScriptProfile {
-    readonly attribute DOMString title;
-    readonly attribute unsigned long uid;
-    readonly attribute ScriptProfileNode head;
-    readonly attribute double idleTime;
-};
+#include "config.h"
+#include "JSGlobalObjectProfilerAgent.h"
 
+#if ENABLE(INSPECTOR)
+
+#include "JSGlobalObject.h"
+
+using namespace JSC;
+
+namespace Inspector {
+
+JSGlobalObjectProfilerAgent::JSGlobalObjectProfilerAgent(JSGlobalObject& globalObject)
+    : InspectorProfilerAgent()
+    , m_globalObject(globalObject)
+{
+}
+
+ExecState* JSGlobalObjectProfilerAgent::profilingGlobalExecState() const
+{
+    return m_globalObject.globalExec();
+}
+
+} // namespace Inspector
+
+#endif // ENABLE(INSPECTOR)

trunk/Source/JavaScriptCore/inspector/agents/JSGlobalObjectProfilerAgent.h

@@ -1 +1 @@
 /*
- * Copyright (C) 2010 Apple Inc. All rights reserved.
- * Copyright (C) 2010 Google Inc. All rights reserved.
+ * Copyright (C) 2014 Apple Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -25 +24 @@
  */
 
-[
-    NoInterfaceObject,
-] interface ScriptProfile {
-    readonly attribute DOMString title;
-    readonly attribute unsigned long uid;
-    readonly attribute ScriptProfileNode head;
-    readonly attribute double idleTime;
+#ifndef JSGlobalObjectProfilerAgent_h
+#define JSGlobalObjectProfilerAgent_h
+
+#if ENABLE(INSPECTOR)
+
+#include "InspectorProfilerAgent.h"
+
+namespace JSC {
+class JSGlobalObject;
+}
+
+namespace Inspector {
+
+class JSGlobalObjectProfilerAgent final : public InspectorProfilerAgent {
+public:
+    JSGlobalObjectProfilerAgent(JSC::JSGlobalObject&);
+
+private:
+    virtual JSC::ExecState* profilingGlobalExecState() const override;
+
+    JSC::JSGlobalObject& m_globalObject;
 };
 
+} // namespace Inspector
+
+#endif // ENABLE(INSPECTOR)
+
+#endif // !defined(JSGlobalObjectProfilerAgent_h)

trunk/Source/JavaScriptCore/profiler/Profile.h

@@ -34 +34 @@
 namespace JSC {
 
-    class Profile : public RefCounted<Profile> {
-    public:
-        static PassRefPtr<Profile> create(const String& title, unsigned uid);
-        virtual ~Profile();
+class JS_EXPORT_PRIVATE Profile : public RefCounted<Profile> {
+public:
+    static PassRefPtr<Profile> create(const String& title, unsigned uid);
+    virtual ~Profile();
 
-        const String& title() const { return m_title; }
-        unsigned uid() const { return m_uid; }
+    const String& title() const { return m_title; }
+    unsigned uid() const { return m_uid; }
 
-        ProfileNode* head() const { return m_head.get(); }
-        void setHead(PassRefPtr<ProfileNode> head) { m_head = head; }
+    ProfileNode* head() const { return m_head.get(); }
+    void setHead(PassRefPtr<ProfileNode> head) { m_head = head; }
 
-        double totalTime() const { return m_head->totalTime(); }
+    double totalTime() const { return m_head->totalTime(); }
 
-        double idleTime() const { return m_idleTime; }
-        void setIdleTime(double idleTime) { m_idleTime = idleTime; }
+    double idleTime() const { return m_idleTime; }
+    void setIdleTime(double idleTime) { m_idleTime = idleTime; }
 
-        void forEach(void (ProfileNode::*)());
+    void forEach(void (ProfileNode::*)());
 
 #ifndef NDEBUG
-        void debugPrintData() const;
-        void debugPrintDataSampleStyle() const;
+    void debugPrintData() const;
+    void debugPrintDataSampleStyle() const;
 #endif
 
-    protected:
-        Profile(const String& title, unsigned uid);
+protected:
+    Profile(const String& title, unsigned uid);
 
-    private:
-        void removeProfileStart();
-        void removeProfileEnd();
- 
-        String m_title;
-        RefPtr<ProfileNode> m_head;
-        unsigned int m_uid;
-        double m_idleTime;
-    };
+private:
+    void removeProfileStart();
+    void removeProfileEnd();
+
+    String m_title;
+    RefPtr<ProfileNode> m_head;
+    unsigned m_uid;
+    double m_idleTime;
+};
 
 } // namespace JSC

trunk/Source/JavaScriptCore/runtime/ConsoleClient.h

@@ -28 +28 @@
 
 #include "ConsoleTypes.h"
+#include "Profile.h"
 #include <wtf/Forward.h>
 

trunk/Source/WebCore/CMakeLists.txt

@@ -764 +764 @@
     ${WEBCORE_DIR}/inspector/protocol/Network.json
     ${WEBCORE_DIR}/inspector/protocol/Page.json
-    ${WEBCORE_DIR}/inspector/protocol/Profiler.json
     ${WEBCORE_DIR}/inspector/protocol/Timeline.json
     ${WEBCORE_DIR}/inspector/protocol/Worker.json
@@ -1154 +1153 @@
     bindings/js/ScriptController.cpp
     bindings/js/ScriptGlobalObject.cpp
-    bindings/js/ScriptProfile.cpp
-    bindings/js/ScriptProfiler.cpp
     bindings/js/ScriptState.cpp
     bindings/js/SerializedScriptValue.cpp
@@ -1749 +1746 @@
     inspector/InspectorOverlay.cpp
     inspector/InspectorPageAgent.cpp
-    inspector/InspectorProfilerAgent.cpp
     inspector/InspectorResourceAgent.cpp
     inspector/InspectorStyleSheet.cpp
@@ -1759 +1755 @@
     inspector/PageConsoleAgent.cpp
     inspector/PageDebuggerAgent.cpp
+    inspector/PageProfilerAgent.cpp
     inspector/PageRuntimeAgent.cpp
     inspector/PageScriptDebugServer.cpp
@@ -1766 +1763 @@
     inspector/WebInjectedScriptHost.cpp
     inspector/WebInjectedScriptManager.cpp
+    inspector/WebProfilerAgent.cpp
     inspector/WorkerConsoleAgent.cpp
     inspector/WorkerDebuggerAgent.cpp
     inspector/WorkerInspectorController.cpp
+    inspector/WorkerProfilerAgent.cpp
     inspector/WorkerRuntimeAgent.cpp
 

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2014-04-18  Timothy Hatcher  <timothy@apple.com>
+
+        Web Inspector: Move InspectorProfilerAgent to JavaScriptCore
+        https://bugs.webkit.org/show_bug.cgi?id=131673
+
+        Passes existing profiler and inspector tests.
+
+        Reviewed by Joseph Pecoraro.
+
+        * CMakeLists.txt:
+        * DerivedSources.make:
+        * ForwardingHeaders/inspector/agents/InspectorProfilerAgent.h: Added.
+        * WebCore.exp.in:
+        * WebCore.vcxproj/WebCore.vcxproj:
+        * WebCore.vcxproj/WebCore.vcxproj.filters:
+        * WebCore.xcodeproj/project.pbxproj:
+        * bindings/js/ScriptProfile.cpp: Removed.
+        * bindings/js/ScriptProfile.h:
+        * bindings/js/ScriptProfiler.cpp: Removed.
+        * bindings/js/ScriptProfiler.h: Removed.
+        * inspector/InspectorAllInOne.cpp:
+        * inspector/InspectorConsoleInstrumentation.h:
+        (WebCore::InspectorInstrumentation::profilerEnabled):
+        (WebCore::InspectorInstrumentation::startProfiling):
+        (WebCore::InspectorInstrumentation::stopProfiling):
+        * inspector/InspectorController.cpp:
+        (WebCore::InspectorController::InspectorController):
+        * inspector/InspectorController.h:
+        * inspector/InspectorInstrumentation.cpp:
+        (WebCore::InspectorInstrumentation::didCommitLoadImpl):
+        (WebCore::InspectorInstrumentation::startProfilingImpl):
+        (WebCore::InspectorInstrumentation::stopProfilingImpl):
+        (WebCore::InspectorInstrumentation::consoleTimeStampImpl): Deleted.
+        * inspector/InspectorInstrumentation.h:
+        * inspector/InspectorProfilerAgent.cpp: Removed.
+        * inspector/InspectorProfilerAgent.h: Removed.
+        * inspector/InspectorTimelineAgent.cpp:
+        (WebCore::startProfiling):
+        (WebCore::stopProfiling):
+        (WebCore::InspectorTimelineAgent::willCallFunction):
+        (WebCore::InspectorTimelineAgent::didCallFunction):
+        (WebCore::InspectorTimelineAgent::willEvaluateScript):
+        (WebCore::InspectorTimelineAgent::didEvaluateScript):
+        (WebCore::InspectorTimelineAgent::didDispatchXHRLoadEvent): Deleted.
+        * inspector/InstrumentingAgents.h:
+        (WebCore::InstrumentingAgents::inspectorProfilerAgent):
+        (WebCore::InstrumentingAgents::setInspectorProfilerAgent):
+        * inspector/PageDebuggerAgent.cpp:
+        (WebCore::PageDebuggerAgent::sourceMapURLForScript): Deleted.
+        * inspector/PageDebuggerAgent.h:
+        * inspector/PageProfilerAgent.cpp: Added.
+        (WebCore::PageProfilerAgent::PageProfilerAgent):
+        (WebCore::PageProfilerAgent::profilingGlobalExecState):
+        * inspector/PageProfilerAgent.h: Added.
+        (WebCore::PageProfilerAgent::~PageProfilerAgent):
+        * inspector/ScriptProfile.idl:
+        * inspector/TimelineRecordFactory.cpp:
+        (WebCore::TimelineRecordFactory::appendProfile):
+        * inspector/TimelineRecordFactory.h:
+        * inspector/WebConsoleAgent.cpp:
+        * inspector/WebProfilerAgent.cpp: Added.
+        (WebCore::WebProfilerAgent::WebProfilerAgent):
+        (WebCore::WebProfilerAgent::enable):
+        (WebCore::WebProfilerAgent::disable):
+        * inspector/WebProfilerAgent.h: Added.
+        (WebCore::WebProfilerAgent::~WebProfilerAgent):
+        * inspector/WorkerInspectorController.cpp:
+        (WebCore::WorkerInspectorController::WorkerInspectorController):
+        * inspector/WorkerProfilerAgent.cpp: Added.
+        (WebCore::WorkerProfilerAgent::WorkerProfilerAgent):
+        (WebCore::WorkerProfilerAgent::profilingGlobalExecState):
+        * inspector/WorkerProfilerAgent.h: Added.
+        (WebCore::WorkerProfilerAgent::~WorkerProfilerAgent):
+        * loader/appcache/ApplicationCacheGroup.cpp:
+        * page/PageConsole.cpp:
+        (WebCore::PageConsole::profile):
+        (WebCore::PageConsole::profileEnd):
+        (WebCore::PageConsole::time): Deleted.
+        (WebCore::PageConsole::timeEnd): Deleted.
+        (WebCore::PageConsole::timeStamp): Deleted.
+        * page/PageConsole.h:
+        * testing/Internals.cpp:
+        * testing/Internals.h:
+        * xml/XMLHttpRequest.cpp:
+
 2014-04-18  Simon Fraser  <simon.fraser@apple.com>
 

trunk/Source/WebCore/DerivedSources.make

@@ -1110 +1110 @@
     $(WebCore)/inspector/protocol/Network.json \
     $(WebCore)/inspector/protocol/Page.json \
-    $(WebCore)/inspector/protocol/Profiler.json \
     $(WebCore)/inspector/protocol/Timeline.json \
     $(WebCore)/inspector/protocol/Worker.json \

trunk/Source/WebCore/WebCore.exp.in

@@ -1095 +1095 @@
 __ZN7WebCore4coreEP20NSURLProtectionSpace
 __ZN7WebCore4coreEP28NSURLAuthenticationChallenge
+__ZN7WebCore4toJSEPN3JSC9ExecStateEPNS_17JSDOMGlobalObjectEPNS0_7ProfileE
 __ZN7WebCore4toJSEPN3JSC9ExecStateEPNS_17JSDOMGlobalObjectEPNS_10ClientRectE
 __ZN7WebCore4toJSEPN3JSC9ExecStateEPNS_17JSDOMGlobalObjectEPNS_13DOMStringListE
-__ZN7WebCore4toJSEPN3JSC9ExecStateEPNS_17JSDOMGlobalObjectEPNS_13ScriptProfileE
 __ZN7WebCore4toJSEPN3JSC9ExecStateEPNS_17JSDOMGlobalObjectEPNS_14ClientRectListE
 __ZN7WebCore4toJSEPN3JSC9ExecStateEPNS_17JSDOMGlobalObjectEPNS_19CSSStyleDeclarationE

trunk/Source/WebCore/WebCore.vcxproj/WebCore.vcxproj

@@ -17416 +17416 @@
     </ClCompile>
     <ClCompile Include="..\bindings\js\ScriptGlobalObject.cpp" />
-    <ClCompile Include="..\bindings\js\ScriptProfile.cpp" />
-    <ClCompile Include="..\bindings\js\ScriptProfiler.cpp">
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug_WinCairo|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug_WinCairo|x64'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='DebugSuffix|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='DebugSuffix|x64'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release_WinCairo|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release_WinCairo|x64'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Production|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Production|x64'">true</ExcludedFromBuild>
-    </ClCompile>
     <ClCompile Include="..\bindings\js\ScriptState.cpp">
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
@@ -17853 +17838 @@
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Production|x64'">true</ExcludedFromBuild>
     </ClCompile>
-    <ClCompile Include="..\inspector\InspectorProfilerAgent.cpp">
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release_WinCairo|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release_WinCairo|x64'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Production|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Production|x64'">true</ExcludedFromBuild>
-    </ClCompile>
     <ClCompile Include="..\inspector\InspectorResourceAgent.cpp">
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
@@ -17933 +17910 @@
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Production|x64'">true</ExcludedFromBuild>
     </ClCompile>
+    <ClCompile Include="..\inspector\PageProfilerAgent.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release_WinCairo|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release_WinCairo|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Production|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Production|x64'">true</ExcludedFromBuild>
+    </ClCompile>
     <ClCompile Include="..\inspector\PageRuntimeAgent.cpp">
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
@@ -17973 +17958 @@
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Production|x64'">true</ExcludedFromBuild>
     </ClCompile>
+    <ClCompile Include="..\inspector\WebProfilerAgent.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release_WinCairo|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release_WinCairo|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Production|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Production|x64'">true</ExcludedFromBuild>
+    </ClCompile>
     <ClCompile Include="..\inspector\WorkerConsoleAgent.cpp">
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
@@ -18006 +17999 @@
     </ClCompile>
     <ClCompile Include="..\inspector\WorkerInspectorController.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release_WinCairo|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release_WinCairo|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Production|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Production|x64'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="..\inspector\WorkerProfilerAgent.cpp">
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
@@ -20740 +20741 @@
     <ClInclude Include="..\bindings\js\ScriptProfile.h" />
     <ClInclude Include="..\bindings\js\ScriptProfileNode.h" />
-    <ClInclude Include="..\bindings\js\ScriptProfiler.h" />
     <ClInclude Include="..\bindings\js\ScriptSourceCode.h" />
     <ClInclude Include="..\bindings\js\ScriptState.h" />
@@ -21065 +21065 @@
     <ClInclude Include="..\inspector\InspectorOverlay.h" />
     <ClInclude Include="..\inspector\InspectorPageAgent.h" />
-    <ClInclude Include="..\inspector\InspectorProfilerAgent.h" />
     <ClInclude Include="..\inspector\InspectorResourceAgent.h" />
     <ClInclude Include="..\inspector\InspectorStyleSheet.h" />
@@ -21077 +21076 @@
     <ClInclude Include="..\inspector\PageConsoleAgent.h" />
     <ClInclude Include="..\inspector\PageDebuggerAgent.h" />
+    <ClInclude Include="..\inspector\PageProfilerAgent.h" />
     <ClInclude Include="..\inspector\PageRuntimeAgent.h" />
     <ClInclude Include="..\inspector\PageScriptDebugServer.h" />
@@ -21082 +21082 @@
     <ClInclude Include="..\inspector\WebConsoleAgent.h" />
     <ClInclude Include="..\inspector\WebDebuggerAgent.h" />
+    <ClInclude Include="..\inspector\WebProfilerAgent.h" />
     <ClInclude Include="..\inspector\WebInjectedScriptHost.h" />
     <ClInclude Include="..\inspector\WebInjectedScriptManager.h" />
@@ -21087 +21088 @@
     <ClInclude Include="..\inspector\WorkerDebuggerAgent.h" />
     <ClInclude Include="..\inspector\WorkerInspectorController.h" />
+    <ClInclude Include="..\inspector\WorkerProfilerAgent.h" />
     <ClInclude Include="..\inspector\WorkerRuntimeAgent.h" />
     <ClInclude Include="..\mathml\MathMLElement.h" />

trunk/Source/WebCore/WebCore.vcxproj/WebCore.vcxproj.filters

@@ -4516 +4516 @@
       <Filter>bindings\js</Filter>
     </ClCompile>
-    <ClCompile Include="..\bindings\js\ScriptProfile.cpp">
-      <Filter>bindings\js</Filter>
-    </ClCompile>
-    <ClCompile Include="..\bindings\js\ScriptProfiler.cpp">
-      <Filter>bindings\js</Filter>
-    </ClCompile>
     <ClCompile Include="..\bindings\js\ScriptState.cpp">
       <Filter>bindings\js</Filter>
@@ -4801 +4795 @@
       <Filter>inspector</Filter>
     </ClCompile>
-    <ClCompile Include="..\inspector\InspectorProfilerAgent.cpp">
-      <Filter>inspector</Filter>
-    </ClCompile>
     <ClCompile Include="..\inspector\InspectorResourceAgent.cpp">
       <Filter>inspector</Filter>
@@ -4831 +4822 @@
       <Filter>inspector</Filter>
     </ClCompile>
+    <ClCompile Include="..\inspector\PageProfilerAgent.cpp">
+      <Filter>inspector</Filter>
+    </ClCompile>
     <ClCompile Include="..\inspector\PageRuntimeAgent.cpp">
       <Filter>inspector</Filter>
@@ -4846 +4840 @@
       <Filter>inspector</Filter>
     </ClCompile>
+    <ClCompile Include="..\inspector\WebProfilerAgent.cpp">
+      <Filter>inspector</Filter>
+    </ClCompile>
     <ClCompile Include="..\inspector\WebInjectedScriptHost.cpp">
       <Filter>inspector</Filter>
@@ -4859 +4856 @@
     </ClCompile>
     <ClCompile Include="..\inspector\WorkerInspectorController.cpp">
+      <Filter>inspector</Filter>
+    </ClCompile>
+    <ClCompile Include="..\inspector\WorkerProfilerAgent.cpp">
       <Filter>inspector</Filter>
     </ClCompile>
@@ -11432 +11432 @@
       <Filter>bindings\js</Filter>
     </ClInclude>
-    <ClInclude Include="..\bindings\js\ScriptProfiler.h">
-      <Filter>bindings\js</Filter>
-    </ClInclude>
     <ClInclude Include="..\bindings\js\ScriptSourceCode.h">
       <Filter>bindings\js</Filter>
@@ -12419 +12416 @@
       <Filter>inspector</Filter>
     </ClInclude>
-    <ClInclude Include="..\inspector\InspectorProfilerAgent.h">
-      <Filter>inspector</Filter>
-    </ClInclude>
     <ClInclude Include="..\inspector\InspectorResourceAgent.h">
       <Filter>inspector</Filter>
@@ -12455 +12449 @@
       <Filter>inspector</Filter>
     </ClInclude>
+    <ClInclude Include="..\inspector\PageProfilerAgent.h">
+      <Filter>inspector</Filter>
+    </ClInclude>
     <ClInclude Include="..\inspector\PageRuntimeAgent.h">
       <Filter>inspector</Filter>
@@ -12470 +12467 @@
       <Filter>inspector</Filter>
     </ClInclude>
+    <ClInclude Include="..\inspector\WebProfilerAgent.h">
+      <Filter>inspector</Filter>
+    </ClInclude>
     <ClInclude Include="..\inspector\WebInjectedScriptHost.h">
       <Filter>inspector</Filter>
@@ -12483 +12483 @@
     </ClInclude>
     <ClInclude Include="..\inspector\WorkerInspectorController.h">
+      <Filter>inspector</Filter>
+    </ClInclude>
+    <ClInclude Include="..\inspector\WorkerProfilerAgent.h">
       <Filter>inspector</Filter>
     </ClInclude>

trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj

@@ -932 +932 @@
                 1CB4214C0AF2B2CA0085AD91 /* DOMHTMLElementInternal.h in Copy Generated Headers */ = {isa = PBXBuildFile; fileRef = 85E711580AC5D5340053270F /* DOMHTMLElementInternal.h */; };
                 1CB4214D0AF2B2CA0085AD91 /* DOMRangeInternal.h in Copy Generated Headers */ = {isa = PBXBuildFile; fileRef = 8538F05A0AD722F1006A81D1 /* DOMRangeInternal.h */; };
+                1CC6B06C18F8526B0007ECCD /* WebProfilerAgent.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1CC6B06A18F8526B0007ECCD /* WebProfilerAgent.cpp */; };
+                1CC6B06D18F8526B0007ECCD /* WebProfilerAgent.h in Headers */ = {isa = PBXBuildFile; fileRef = 1CC6B06B18F8526B0007ECCD /* WebProfilerAgent.h */; };
+                1CC6B07018F8687A0007ECCD /* PageProfilerAgent.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1CC6B06E18F8687A0007ECCD /* PageProfilerAgent.cpp */; };
+                1CC6B07118F8687A0007ECCD /* PageProfilerAgent.h in Headers */ = {isa = PBXBuildFile; fileRef = 1CC6B06F18F8687A0007ECCD /* PageProfilerAgent.h */; };
+                1CC6B07418F893A20007ECCD /* WorkerProfilerAgent.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1CC6B07218F893A20007ECCD /* WorkerProfilerAgent.cpp */; };
+                1CC6B07518F893A20007ECCD /* WorkerProfilerAgent.h in Headers */ = {isa = PBXBuildFile; fileRef = 1CC6B07318F893A20007ECCD /* WorkerProfilerAgent.h */; };
                 1CCA732210ADD44A00FD440D /* DOMHTMLInputElementPrivate.h in Copy Generated Headers */ = {isa = PBXBuildFile; fileRef = 1CCA732110ADD43E00FD440D /* DOMHTMLInputElementPrivate.h */; };
                 1CE83AC30ADAFFD7009354F6 /* DeleteButtonController.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1C4C8EFF0AD85D87009475CE /* DeleteButtonController.cpp */; };
@@ -3584 +3590 @@
                 9BF9A8801648DD2F001C6B23 /* JSHTMLFormControlsCollection.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 9BF9A87E1648DD2F001C6B23 /* JSHTMLFormControlsCollection.cpp */; };
                 9BF9A8811648DD2F001C6B23 /* JSHTMLFormControlsCollection.h in Headers */ = {isa = PBXBuildFile; fileRef = 9BF9A87F1648DD2F001C6B23 /* JSHTMLFormControlsCollection.h */; };
-                9F0D6B2E121BFEBA006C0288 /* InspectorProfilerAgent.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 9F0D6B2C121BFEBA006C0288 /* InspectorProfilerAgent.cpp */; };
-                9F0D6B2F121BFEBA006C0288 /* InspectorProfilerAgent.h in Headers */ = {isa = PBXBuildFile; fileRef = 9F0D6B2D121BFEBA006C0288 /* InspectorProfilerAgent.h */; };
                 9F72304F11184B4100AD0126 /* ScriptProfile.h in Headers */ = {isa = PBXBuildFile; fileRef = 9F72304C11184B4100AD0126 /* ScriptProfile.h */; settings = {ATTRIBUTES = (Private, ); }; };
-                9F72305011184B4100AD0126 /* ScriptProfiler.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 9F72304D11184B4100AD0126 /* ScriptProfiler.cpp */; };
-                9F72305111184B4100AD0126 /* ScriptProfiler.h in Headers */ = {isa = PBXBuildFile; fileRef = 9F72304E11184B4100AD0126 /* ScriptProfiler.h */; settings = {ATTRIBUTES = (Private, ); }; };
                 9FA37EE41172FC8000C4CD55 /* ScriptProfileNode.h in Headers */ = {isa = PBXBuildFile; fileRef = 9FA37EE31172FC8000C4CD55 /* ScriptProfileNode.h */; settings = {ATTRIBUTES = (Private, ); }; };
                 9FA37EFA1172FDA600C4CD55 /* JSScriptProfile.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 9FA37EF61172FD9300C4CD55 /* JSScriptProfile.cpp */; };
@@ -6126 +6128 @@
                 F12171F616A8CF0B000053CA /* WebVTTElement.h in Headers */ = {isa = PBXBuildFile; fileRef = F12171F416A8BC63000053CA /* WebVTTElement.h */; };
                 F293B27E56C112F373FFF27E /* DNSResolveQueue.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 7C60128060078BB70E367A95 /* DNSResolveQueue.cpp */; };
-                F33F0282120947F200E5743A /* ScriptProfile.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F33F0281120947F200E5743A /* ScriptProfile.cpp */; };
                 F344C7141125B82C00F26EEE /* InspectorFrontendClient.h in Headers */ = {isa = PBXBuildFile; fileRef = F344C7121125B82C00F26EEE /* InspectorFrontendClient.h */; settings = {ATTRIBUTES = (Private, ); }; };
                 F344C75311294D9D00F26EEE /* InspectorFrontendClientLocal.h in Headers */ = {isa = PBXBuildFile; fileRef = F344C75211294D9D00F26EEE /* InspectorFrontendClientLocal.h */; settings = {ATTRIBUTES = (Private, ); }; };
@@ -7798 +7799 @@
                 1CAF347F0A6C405200ABE06E /* WebScriptObject.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = WebScriptObject.mm; sourceTree = "<group>"; };
                 1CAF34800A6C405200ABE06E /* WebScriptObjectPrivate.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WebScriptObjectPrivate.h; sourceTree = "<group>"; };
+                1CC6B06A18F8526B0007ECCD /* WebProfilerAgent.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = WebProfilerAgent.cpp; sourceTree = "<group>"; };
+                1CC6B06B18F8526B0007ECCD /* WebProfilerAgent.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WebProfilerAgent.h; sourceTree = "<group>"; };
+                1CC6B06E18F8687A0007ECCD /* PageProfilerAgent.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = PageProfilerAgent.cpp; sourceTree = "<group>"; };
+                1CC6B06F18F8687A0007ECCD /* PageProfilerAgent.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PageProfilerAgent.h; sourceTree = "<group>"; };
+                1CC6B07218F893A20007ECCD /* WorkerProfilerAgent.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = WorkerProfilerAgent.cpp; sourceTree = "<group>"; };
+                1CC6B07318F893A20007ECCD /* WorkerProfilerAgent.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WorkerProfilerAgent.h; sourceTree = "<group>"; };
                 1CCA732110ADD43E00FD440D /* DOMHTMLInputElementPrivate.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = DOMHTMLInputElementPrivate.h; sourceTree = "<group>"; };
                 1CD0B6200AABDB5000D0A3FF /* PublicDOMInterfaces.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PublicDOMInterfaces.h; sourceTree = "<group>"; };
@@ -10639 +10646 @@
                 9BF9A87E1648DD2F001C6B23 /* JSHTMLFormControlsCollection.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = JSHTMLFormControlsCollection.cpp; sourceTree = "<group>"; };
                 9BF9A87F1648DD2F001C6B23 /* JSHTMLFormControlsCollection.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = JSHTMLFormControlsCollection.h; sourceTree = "<group>"; };
-                9F0D6B2C121BFEBA006C0288 /* InspectorProfilerAgent.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = InspectorProfilerAgent.cpp; sourceTree = "<group>"; };
-                9F0D6B2D121BFEBA006C0288 /* InspectorProfilerAgent.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = InspectorProfilerAgent.h; sourceTree = "<group>"; };
                 9F72304C11184B4100AD0126 /* ScriptProfile.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ScriptProfile.h; sourceTree = "<group>"; };
-                9F72304D11184B4100AD0126 /* ScriptProfiler.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = ScriptProfiler.cpp; sourceTree = "<group>"; };
-                9F72304E11184B4100AD0126 /* ScriptProfiler.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ScriptProfiler.h; sourceTree = "<group>"; };
                 9FA37EE31172FC8000C4CD55 /* ScriptProfileNode.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ScriptProfileNode.h; sourceTree = "<group>"; };
                 9FA37EEF1172FD4100C4CD55 /* ScriptProfile.idl */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = ScriptProfile.idl; sourceTree = "<group>"; };
@@ -13536 +13539 @@
                 F12171F316A8BC63000053CA /* WebVTTElement.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = WebVTTElement.cpp; sourceTree = "<group>"; };
                 F12171F416A8BC63000053CA /* WebVTTElement.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WebVTTElement.h; sourceTree = "<group>"; };
-                F33F0281120947F200E5743A /* ScriptProfile.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = ScriptProfile.cpp; sourceTree = "<group>"; };
                 F344C7121125B82C00F26EEE /* InspectorFrontendClient.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = InspectorFrontendClient.h; sourceTree = "<group>"; };
                 F344C75211294D9D00F26EEE /* InspectorFrontendClientLocal.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = InspectorFrontendClientLocal.h; sourceTree = "<group>"; };
@@ -15024 +15026 @@
                                 4F6FDD621341DEDD001F8EE3 /* InspectorPageAgent.cpp */,
                                 4F6FDD631341DEDD001F8EE3 /* InspectorPageAgent.h */,
-                                9F0D6B2C121BFEBA006C0288 /* InspectorProfilerAgent.cpp */,
-                                9F0D6B2D121BFEBA006C0288 /* InspectorProfilerAgent.h */,
                                 99CC0B6418BE9F15006CEBCC /* InspectorReplayAgent.cpp */,
                                 99CC0B6518BE9F15006CEBCC /* InspectorReplayAgent.h */,
@@ -15048 +15048 @@
                                 F34742DA134362F000531BC2 /* PageDebuggerAgent.cpp */,
                                 F34742DB134362F000531BC2 /* PageDebuggerAgent.h */,
+                                1CC6B06E18F8687A0007ECCD /* PageProfilerAgent.cpp */,
+                                1CC6B06F18F8687A0007ECCD /* PageProfilerAgent.h */,
                                 F382088C147D35F90010BC06 /* PageRuntimeAgent.cpp */,
                                 F382088D147D35F90010BC06 /* PageRuntimeAgent.h */,
@@ -15064 +15066 @@
                                 A584FE2D1864CB8400843B10 /* WebInjectedScriptManager.cpp */,
                                 A584FE2E1864CB8400843B10 /* WebInjectedScriptManager.h */,
+                                1CC6B06A18F8526B0007ECCD /* WebProfilerAgent.cpp */,
+                                1CC6B06B18F8526B0007ECCD /* WebProfilerAgent.h */,
                                 F382088E147D35F90010BC06 /* WorkerConsoleAgent.cpp */,
                                 F382088F147D35F90010BC06 /* WorkerConsoleAgent.h */,
@@ -15070 +15074 @@
                                 F36E07A21358A8BE00AACBC9 /* WorkerInspectorController.cpp */,
                                 F36E07A31358A8BE00AACBC9 /* WorkerInspectorController.h */,
+                                1CC6B07218F893A20007ECCD /* WorkerProfilerAgent.cpp */,
+                                1CC6B07318F893A20007ECCD /* WorkerProfilerAgent.h */,
                                 F3820890147D35F90010BC06 /* WorkerRuntimeAgent.cpp */,
                                 F3820891147D35F90010BC06 /* WorkerRuntimeAgent.h */,
@@ -20456 +20462 @@
                                 41F066E30F64BCF600A07EAC /* ScriptGlobalObject.cpp */,
                                 41F066E20F64BCF600A07EAC /* ScriptGlobalObject.h */,
-                                F33F0281120947F200E5743A /* ScriptProfile.cpp */,
                                 9F72304C11184B4100AD0126 /* ScriptProfile.h */,
                                 9FA37EE31172FC8000C4CD55 /* ScriptProfileNode.h */,
-                                9F72304D11184B4100AD0126 /* ScriptProfiler.cpp */,
-                                9F72304E11184B4100AD0126 /* ScriptProfiler.h */,
                                 934CC1090EDB223900A658F2 /* ScriptSourceCode.h */,
                                 4127D5360F8AAB1D00E424F5 /* ScriptState.cpp */,
@@ -23865 +23868 @@
                                 26C17A3E1491D2D400D12BA2 /* FileSystemIOS.h in Headers */,
                                 976D6C8E122B8A3D001FD1F7 /* FileThread.h in Headers */,
+                                1CC6B06D18F8526B0007ECCD /* WebProfilerAgent.h in Headers */,
                                 976D6C8F122B8A3D001FD1F7 /* FileThreadTask.h in Headers */,
                                 BC5EB69F0E81DAEB00B25965 /* FillLayer.h in Headers */,
@@ -24240 +24244 @@
                                 0F03C0751884805500A5F8CA /* InspectorOverlay.h in Headers */,
                                 4F6FDD651341DEDD001F8EE3 /* InspectorPageAgent.h in Headers */,
-                                9F0D6B2F121BFEBA006C0288 /* InspectorProfilerAgent.h in Headers */,
                                 99CC0B6718BE9F15006CEBCC /* InspectorReplayAgent.h in Headers */,
                                 82AB1776125C826700C5069D /* InspectorResourceAgent.h in Headers */,
@@ -25451 +25454 @@
                                 9F72304F11184B4100AD0126 /* ScriptProfile.h in Headers */,
                                 9FA37EE41172FC8000C4CD55 /* ScriptProfileNode.h in Headers */,
-                                9F72305111184B4100AD0126 /* ScriptProfiler.h in Headers */,
                                 8A413AE01207BBA50082016E /* ScriptRunner.h in Headers */,
                                 934CC10A0EDB223900A658F2 /* ScriptSourceCode.h in Headers */,
@@ -25624 +25626 @@
                                 C5102D940FD9AA2D00FAFF04 /* StorageSyncManager.h in Headers */,
                                 511F231A0DC160DA004F0032 /* StorageThread.h in Headers */,
+                                1CC6B07118F8687A0007ECCD /* PageProfilerAgent.h in Headers */,
                                 3AB02D2A12D4F91600FBB694 /* StorageTracker.h in Headers */,
                                 3AC3680012EF7A09006A3D6F /* StorageTrackerClient.h in Headers */,
@@ -25977 +25980 @@
                                 CDA07FC218E0A22B004699FA /* SystemSleepListenerMac.h in Headers */,
                                 93F198F608245E59001E9ABC /* TextResourceDecoder.h in Headers */,
+                                1CC6B07518F893A20007ECCD /* WorkerProfilerAgent.h in Headers */,
                                 A824B4650E2EF2EA0081A7B7 /* TextRun.h in Headers */,
                                 448B1B7A0F3A2F9B0047A9E2 /* TextSizeAdjustment.h in Headers */,
@@ -27252 +27256 @@
                                 F55B3DBB1251F12D003EF269 /* EmailInputType.cpp in Sources */,
                                 F52AD5E41534245F0059FBE6 /* EmptyClients.cpp in Sources */,
+                                1CC6B07018F8687A0007ECCD /* PageProfilerAgent.cpp in Sources */,
                                 A8EA7EC10A1945D000A8EF5F /* EntityReference.cpp in Sources */,
                                 FD31609212B026F700C1A359 /* EqualPowerPanner.cpp in Sources */,
@@ -27638 +27643 @@
                                 7C522D4B15B477E8009B7C95 /* InspectorOverlay.cpp in Sources */,
                                 4F6FDD641341DEDD001F8EE3 /* InspectorPageAgent.cpp in Sources */,
-                                9F0D6B2E121BFEBA006C0288 /* InspectorProfilerAgent.cpp in Sources */,
                                 99CC0B6618BE9F15006CEBCC /* InspectorReplayAgent.cpp in Sources */,
                                 82AB1775125C826700C5069D /* InspectorResourceAgent.cpp in Sources */,
@@ -28212 +28216 @@
                                 B2FA3DE00AB75A6F000E5AC4 /* JSSVGPatternElement.cpp in Sources */,
                                 8542A7960AE5C94200DF58DF /* JSSVGPoint.cpp in Sources */,
+                                1CC6B06C18F8526B0007ECCD /* WebProfilerAgent.cpp in Sources */,
                                 B2FA3DE20AB75A6F000E5AC4 /* JSSVGPointList.cpp in Sources */,
                                 B2FA3DE50AB75A6F000E5AC4 /* JSSVGPolygonElement.cpp in Sources */,
@@ -28564 +28569 @@
                                 447958051643B4B2001E0A7F /* ParsedContentType.cpp in Sources */,
                                 F55B3DC91251F12D003EF269 /* PasswordInputType.cpp in Sources */,
+                                1CC6B07418F893A20007ECCD /* WorkerProfilerAgent.cpp in Sources */,
                                 E453901E0EAFCACA003695C8 /* PasteboardIOS.mm in Sources */,
                                 4B2709830AF2E5E00065127F /* PasteboardMac.mm in Sources */,
@@ -28835 +28841 @@
                                 41F066E50F64BCF600A07EAC /* ScriptGlobalObject.cpp in Sources */,
                                 FD31603512B0267600C1A359 /* ScriptProcessorNode.cpp in Sources */,
-                                F33F0282120947F200E5743A /* ScriptProfile.cpp in Sources */,
-                                9F72305011184B4100AD0126 /* ScriptProfiler.cpp in Sources */,
                                 8A413AE11207BBA50082016E /* ScriptRunner.cpp in Sources */,
                                 4127D5370F8AAB1D00E424F5 /* ScriptState.cpp in Sources */,

trunk/Source/WebCore/bindings/js/JSBindingsAllInOne.cpp

@@ -144 +144 @@
 #include "ScriptCachedFrameData.cpp"
 #include "ScriptController.cpp"
-#include "ScriptProfiler.cpp"
 #include "ScriptState.cpp"
 #include "SerializedScriptValue.cpp"

trunk/Source/WebCore/bindings/js/ScriptProfile.h

@@ -28 +28 @@
 #define ScriptProfile_h
 
-#include "ScriptProfileNode.h"
-#include <wtf/Forward.h>
-#include <wtf/PassRefPtr.h>
-#include <wtf/RefCounted.h>
-#include <wtf/RefPtr.h>
-
-#if ENABLE(INSPECTOR)
-#include "InspectorWebTypeBuilders.h"
-#endif
-
-namespace JSC {
-class Profile;
-}
+#include <profiler/Profile.h>
 
 namespace WebCore {
 
-class ScriptProfile : public RefCounted<ScriptProfile> {
-public:
-    static PassRefPtr<ScriptProfile> create(PassRefPtr<JSC::Profile> profile);
-    virtual ~ScriptProfile();
-
-    String title() const;
-    unsigned int uid() const;
-    ScriptProfileNode* head() const;
-    double idleTime() const;
-
-#if ENABLE(INSPECTOR)
-    PassRefPtr<Inspector::TypeBuilder::Profiler::CPUProfile> buildInspectorObject() const;
-#endif
-
-private:
-    ScriptProfile(PassRefPtr<JSC::Profile> profile);
-
-    RefPtr<JSC::Profile> m_profile;
-};
+typedef JSC::Profile ScriptProfile;
 
 } // namespace WebCore

trunk/Source/WebCore/inspector/InspectorAllInOne.cpp

@@ -49 +49 @@
 #include "InspectorOverlay.cpp"
 #include "InspectorPageAgent.cpp"
-#include "InspectorProfilerAgent.cpp"
 #include "InspectorResourceAgent.cpp"
 #include "InspectorStyleSheet.cpp"
@@ -59 +58 @@
 #include "PageConsoleAgent.cpp"
 #include "PageDebuggerAgent.cpp"
+#include "PageProfilerAgent.cpp"
 #include "PageRuntimeAgent.cpp"
 #include "PageScriptDebugServer.cpp"
@@ -66 +66 @@
 #include "WebInjectedScriptHost.cpp"
 #include "WebInjectedScriptManager.cpp"
+#include "WebProfilerAgent.cpp"
 #include "WorkerConsoleAgent.cpp"
 #include "WorkerDebuggerAgent.cpp"
 #include "WorkerInspectorController.cpp"
+#include "WorkerProfilerAgent.cpp"
 #include "WorkerRuntimeAgent.cpp"

trunk/Source/WebCore/inspector/InspectorConsoleInstrumentation.h

@@ -174 +174 @@
 }
 
-inline void InspectorInstrumentation::addStartProfilingMessageToConsole(Page* page, const String& title, unsigned lineNumber, unsigned columnNumber, const String& sourceURL)
-{
-#if ENABLE(INSPECTOR)
-    if (InstrumentingAgents* instrumentingAgents = instrumentingAgentsForPage(page))
-        addStartProfilingMessageToConsoleImpl(instrumentingAgents, title, lineNumber, columnNumber, sourceURL);
-#else
-    UNUSED_PARAM(page);
-    UNUSED_PARAM(title);
-    UNUSED_PARAM(lineNumber);
-    UNUSED_PARAM(columnNumber);
-    UNUSED_PARAM(sourceURL);
-#endif
-}
-
-inline void InspectorInstrumentation::addProfile(Page* page, PassRefPtr<ScriptProfile> profile, PassRefPtr<Inspector::ScriptCallStack> callStack)
-{
-#if ENABLE(INSPECTOR)
-    if (InstrumentingAgents* instrumentingAgents = instrumentingAgentsForPage(page))
-        addProfileImpl(instrumentingAgents, profile, callStack);
-#else
-    UNUSED_PARAM(page);
-    UNUSED_PARAM(profile);
-    UNUSED_PARAM(callStack);
-#endif
-}
-
-inline bool InspectorInstrumentation::profilerEnabled(Page* page)
-{
-#if ENABLE(INSPECTOR)
-    if (InstrumentingAgents* instrumentingAgents = instrumentingAgentsForPage(page))
-        return profilerEnabledImpl(instrumentingAgents);
-#else
-    UNUSED_PARAM(page);
-#endif
-    return false;
-}
-
-inline String InspectorInstrumentation::getCurrentUserInitiatedProfileName(Page* page, bool incrementProfileNumber)
-{
-#if ENABLE(INSPECTOR)
-    if (InstrumentingAgents* instrumentingAgents = instrumentingAgentsForPage(page))
-        return InspectorInstrumentation::getCurrentUserInitiatedProfileNameImpl(instrumentingAgents, incrementProfileNumber);
-#else
-    UNUSED_PARAM(page);
-    UNUSED_PARAM(incrementProfileNumber);
-#endif
-    return "";
+inline void InspectorInstrumentation::startProfiling(Page* page, JSC::ExecState* exec, const String &title)
+{
+#if ENABLE(INSPECTOR)
+    if (InstrumentingAgents* instrumentingAgents = instrumentingAgentsForPage(page))
+        startProfilingImpl(instrumentingAgents, exec, title);
+#else
+    UNUSED_PARAM(page);
+    UNUSED_PARAM(title);
+#endif
+}
+
+inline PassRefPtr<JSC::Profile> InspectorInstrumentation::stopProfiling(Page* page, JSC::ExecState* exec, const String &title)
+{
+#if ENABLE(INSPECTOR)
+    if (InstrumentingAgents* instrumentingAgents = instrumentingAgentsForPage(page))
+        return stopProfilingImpl(instrumentingAgents, exec, title);
+#else
+    UNUSED_PARAM(page);
+    UNUSED_PARAM(title);
+#endif
+    return nullptr;
 }
 

trunk/Source/WebCore/inspector/InspectorController.cpp

@@ -51 +51 @@
 #include "InspectorOverlay.h"
 #include "InspectorPageAgent.h"
-#include "InspectorProfilerAgent.h"
 #include "InspectorReplayAgent.h"
 #include "InspectorResourceAgent.h"
@@ -66 +65 @@
 #include "PageConsoleAgent.h"
 #include "PageDebuggerAgent.h"
+#include "PageProfilerAgent.h"
 #include "PageRuntimeAgent.h"
 #include "PageScriptDebugServer.h"
@@ -155 +155 @@
     m_agents.append(std::move(domDebuggerAgentPtr));
 
-    auto profilerAgentPtr = InspectorProfilerAgent::create(m_instrumentingAgents.get(), consoleAgent, &page, m_injectedScriptManager.get());
+    auto profilerAgentPtr = std::make_unique<PageProfilerAgent>(m_instrumentingAgents.get(), &page);
     m_profilerAgent = profilerAgentPtr.get();
     m_agents.append(std::move(profilerAgentPtr));
@@ -176 +176 @@
 
     runtimeAgent->setScriptDebugServer(&m_debuggerAgent->scriptDebugServer());
+    timelineAgent->setPageScriptDebugServer(&m_debuggerAgent->scriptDebugServer());
     m_profilerAgent->setScriptDebugServer(&m_debuggerAgent->scriptDebugServer());
-    timelineAgent->setPageScriptDebugServer(&m_debuggerAgent->scriptDebugServer());
 }
 

trunk/Source/WebCore/inspector/InspectorController.h

@@ -47 +47 @@
 class InspectorBackendDispatcher;
 class InspectorFrontendChannel;
+class InspectorProfilerAgent;
 class InspectorObject;
 }
@@ -61 +62 @@
 class InspectorOverlay;
 class InspectorPageAgent;
-class InspectorProfilerAgent;
 class InspectorResourceAgent;
 class InstrumentingAgents;
@@ -145 +145 @@
     PageDebuggerAgent* m_debuggerAgent;
     InspectorDOMDebuggerAgent* m_domDebuggerAgent;
-    InspectorProfilerAgent* m_profilerAgent;
+    Inspector::InspectorProfilerAgent* m_profilerAgent;
 
     RefPtr<Inspector::InspectorBackendDispatcher> m_inspectorBackendDispatcher;

trunk/Source/WebCore/inspector/InspectorInstrumentation.cpp

@@ -51 +51 @@
 #include "InspectorLayerTreeAgent.h"
 #include "InspectorPageAgent.h"
-#include "InspectorProfilerAgent.h"
 #include "InspectorResourceAgent.h"
 #include "InspectorTimelineAgent.h"
@@ -62 +61 @@
 #include "RenderView.h"
 #include "ScriptController.h"
-#include "ScriptProfile.h"
 #include "StyleResolver.h"
 #include "StyleRule.h"
@@ -73 +71 @@
 #include <inspector/ScriptCallStack.h>
 #include <inspector/agents/InspectorDebuggerAgent.h>
+#include <inspector/agents/InspectorProfilerAgent.h>
+#include <profiler/Profile.h>
 #include <runtime/ConsoleTypes.h>
 #include <wtf/StdLibExtras.h>
@@ -774 +774 @@
         if (InspectorResourceAgent* resourceAgent = instrumentingAgents->inspectorResourceAgent())
             resourceAgent->mainFrameNavigated(loader);
+
         if (InspectorProfilerAgent* profilerAgent = instrumentingAgents->inspectorProfilerAgent())
-            profilerAgent->resetState();
+            profilerAgent->reset();
+
         if (InspectorCSSAgent* cssAgent = instrumentingAgents->inspectorCSSAgent())
             cssAgent->reset();
+
 #if ENABLE(SQL_DATABASE)
         if (InspectorDatabaseAgent* databaseAgent = instrumentingAgents->inspectorDatabaseAgent())
             databaseAgent->clearResources();
 #endif
+
         if (InspectorDOMAgent* domAgent = instrumentingAgents->inspectorDOMAgent())
             domAgent->setDocument(page->mainFrame().document());
+
         if (InspectorLayerTreeAgent* layerTreeAgent = instrumentingAgents->inspectorLayerTreeAgent())
             layerTreeAgent->reset();
     }
+
     if (InspectorDOMAgent* domAgent = instrumentingAgents->inspectorDOMAgent())
         domAgent->didCommitLoad(loader->frame()->document());
+
     if (InspectorPageAgent* pageAgent = instrumentingAgents->inspectorPageAgent())
         pageAgent->frameNavigated(loader);
+
 #if ENABLE(WEB_REPLAY)
     if (InspectorReplayAgent* replayAgent = instrumentingAgents->inspectorReplayAgent())
@@ -942 +950 @@
 }
 
-void InspectorInstrumentation::addStartProfilingMessageToConsoleImpl(InstrumentingAgents* instrumentingAgents, const String& title, unsigned lineNumber, unsigned columnNumber, const String& sourceURL)
+void InspectorInstrumentation::startProfilingImpl(InstrumentingAgents* instrumentingAgents, JSC::ExecState* exec, const String& title)
 {
     if (InspectorProfilerAgent* profilerAgent = instrumentingAgents->inspectorProfilerAgent())
-        profilerAgent->addStartProfilingMessageToConsole(title, lineNumber, columnNumber, sourceURL);
-}
-
-void InspectorInstrumentation::addProfileImpl(InstrumentingAgents* instrumentingAgents, RefPtr<ScriptProfile> profile, PassRefPtr<ScriptCallStack> callStack)
-{
-    if (InspectorProfilerAgent* profilerAgent = instrumentingAgents->inspectorProfilerAgent()) {
-        const ScriptCallFrame& lastCaller = callStack->at(0);
-        profilerAgent->addProfile(profile, lastCaller.lineNumber(), lastCaller.columnNumber(), lastCaller.sourceURL());
-    }
-}
-
-String InspectorInstrumentation::getCurrentUserInitiatedProfileNameImpl(InstrumentingAgents* instrumentingAgents, bool incrementProfileNumber)
+        profilerAgent->startProfiling(title, exec);
+}
+
+PassRefPtr<JSC::Profile> InspectorInstrumentation::stopProfilingImpl(InstrumentingAgents* instrumentingAgents, JSC::ExecState* exec, const String& title)
 {
     if (InspectorProfilerAgent* profilerAgent = instrumentingAgents->inspectorProfilerAgent())
-        return profilerAgent->getCurrentUserInitiatedProfileName(incrementProfileNumber);
-    return "";
-}
-
-bool InspectorInstrumentation::profilerEnabledImpl(InstrumentingAgents* instrumentingAgents)
-{
-    if (InspectorProfilerAgent* profilerAgent = instrumentingAgents->inspectorProfilerAgent())
-        return profilerAgent->enabled();
-    return false;
+        return profilerAgent->stopProfiling(title, exec);
+    return nullptr;
 }
 

trunk/Source/WebCore/inspector/InspectorInstrumentation.h

@@ -62 +62 @@
 }
 
+namespace JSC {
+class Profile;
+}
+
 namespace WebCore {
 
@@ -90 +94 @@
 class ResourceResponse;
 class ScriptExecutionContext;
-class ScriptProfile;
 class SecurityOrigin;
 class ShadowRoot;
@@ -231 +234 @@
     static void didFireAnimationFrame(const InspectorInstrumentationCookie&);
 
-    static void addStartProfilingMessageToConsole(Page*, const String& title, unsigned lineNumber, unsigned columnNumber, const String& sourceURL);
-    static void addProfile(Page*, PassRefPtr<ScriptProfile>, PassRefPtr<Inspector::ScriptCallStack>);
-    static String getCurrentUserInitiatedProfileName(Page*, bool incrementProfileNumber);
-    static bool profilerEnabled(Page*);
+    static void startProfiling(Page*, JSC::ExecState*, const String& title);
+    static PassRefPtr<JSC::Profile> stopProfiling(Page*, JSC::ExecState*, const String& title);
 
 #if ENABLE(SQL_DATABASE)
@@ -430 +431 @@
     static void didFireAnimationFrameImpl(const InspectorInstrumentationCookie&);
 
-    static void addStartProfilingMessageToConsoleImpl(InstrumentingAgents*, const String& title, unsigned lineNumber, unsigned columnNumber, const String& sourceURL);
-    static void addProfileImpl(InstrumentingAgents*, RefPtr<ScriptProfile>, PassRefPtr<Inspector::ScriptCallStack>);
-    static String getCurrentUserInitiatedProfileNameImpl(InstrumentingAgents*, bool incrementProfileNumber);
-    static bool profilerEnabledImpl(InstrumentingAgents*);
+    static void startProfilingImpl(InstrumentingAgents*, JSC::ExecState*, const String& title);
+    static PassRefPtr<JSC::Profile> stopProfilingImpl(InstrumentingAgents*, JSC::ExecState*, const String& title);
 
 #if ENABLE(SQL_DATABASE)

trunk/Source/WebCore/inspector/InspectorTimelineAgent.cpp

@@ -51 +51 @@
 #include "ResourceRequest.h"
 #include "ResourceResponse.h"
-#include "ScriptProfiler.h"
 #include "ScriptState.h"
 #include "TimelineRecordFactory.h"
 #include <inspector/IdentifiersFactory.h>
 #include <inspector/ScriptBreakpoint.h>
+#include <profiler/LegacyProfiler.h>
 #include <wtf/CurrentTime.h>
 
@@ -130 +130 @@
 }
 
+static inline void startProfiling(Frame* frame, const String& title)
+{
+    JSC::LegacyProfiler::profiler()->startProfiling(toJSDOMWindow(frame, debuggerWorld())->globalExec(), title);
+}
+
+static inline PassRefPtr<JSC::Profile> stopProfiling(Frame* frame, const String& title)
+{
+    return JSC::LegacyProfiler::profiler()->stopProfiling(toJSDOMWindow(frame, debuggerWorld())->globalExec(), title);
+}
+
 void InspectorTimelineAgent::willCallFunction(const String& scriptName, int scriptLine, Frame* frame)
 {
@@ -136 +146 @@
     if (frame && !m_recordingProfile) {
         m_recordingProfile = true;
-        ScriptProfiler::start(toJSDOMWindow(frame, debuggerWorld())->globalExec(), ASCIILiteral("Timeline FunctionCall"));
+        startProfiling(frame, ASCIILiteral("Timeline FunctionCall"));
     }
 }
@@ -149 +159 @@
         ASSERT(entry.type == TimelineRecordType::FunctionCall);
 
-        RefPtr<ScriptProfile> profile = ScriptProfiler::stop(toJSDOMWindow(frame, debuggerWorld())->globalExec(), ASCIILiteral("Timeline FunctionCall"));
+        RefPtr<JSC::Profile> profile = stopProfiling(frame, ASCIILiteral("Timeline FunctionCall"));
         if (profile)
             TimelineRecordFactory::appendProfile(entry.data.get(), profile.release());
@@ -307 +317 @@
     if (frame && !m_recordingProfile) {
         m_recordingProfile = true;
-        ScriptProfiler::start(toJSDOMWindow(frame, debuggerWorld())->globalExec(), ASCIILiteral("Timeline EvaluateScript"));
+        startProfiling(frame, ASCIILiteral("Timeline EvaluateScript"));
     }
 }
@@ -320 +330 @@
         ASSERT(entry.type == TimelineRecordType::EvaluateScript);
 
-        RefPtr<ScriptProfile> profile = ScriptProfiler::stop(toJSDOMWindow(frame, debuggerWorld())->globalExec(), ASCIILiteral("Timeline EvaluateScript"));
+        RefPtr<JSC::Profile> profile = stopProfiling(frame, ASCIILiteral("Timeline EvaluateScript"));
         if (profile)
             TimelineRecordFactory::appendProfile(entry.data.get(), profile.release());

trunk/Source/WebCore/inspector/InstrumentingAgents.h

@@ -42 +42 @@
 class InspectorAgent;
 class InspectorDebuggerAgent;
+class InspectorProfilerAgent;
 }
 
@@ -54 +55 @@
 class InspectorLayerTreeAgent;
 class InspectorPageAgent;
-class InspectorProfilerAgent;
 class InspectorResourceAgent;
 class InspectorReplayAgent;
@@ -131 +131 @@
     void setInspectorDOMDebuggerAgent(InspectorDOMDebuggerAgent* agent) { m_inspectorDOMDebuggerAgent = agent; }
 
-    InspectorProfilerAgent* inspectorProfilerAgent() const { return m_inspectorProfilerAgent; }
-    void setInspectorProfilerAgent(InspectorProfilerAgent* agent) { m_inspectorProfilerAgent = agent; }
+    Inspector::InspectorProfilerAgent* inspectorProfilerAgent() const { return m_inspectorProfilerAgent; }
+    void setInspectorProfilerAgent(Inspector::InspectorProfilerAgent* agent) { m_inspectorProfilerAgent = agent; }
 
     InspectorWorkerAgent* inspectorWorkerAgent() const { return m_inspectorWorkerAgent; }
@@ -166 +166 @@
     PageDebuggerAgent* m_pageDebuggerAgent;
     InspectorDOMDebuggerAgent* m_inspectorDOMDebuggerAgent;
-    InspectorProfilerAgent* m_inspectorProfilerAgent;
+    Inspector::InspectorProfilerAgent* m_inspectorProfilerAgent;
     InspectorWorkerAgent* m_inspectorWorkerAgent;
 };

trunk/Source/WebCore/inspector/PageDebuggerAgent.cpp

@@ -57 +57 @@
     , m_scriptDebugServer(*pageAgent->page())
 {
-}
-
-void PageDebuggerAgent::enable()
-{
-    WebDebuggerAgent::enable();
-    m_instrumentingAgents->setPageDebuggerAgent(this);
-}
-
-void PageDebuggerAgent::disable(bool isBeingDestroyed)
-{
-    WebDebuggerAgent::disable(isBeingDestroyed);
-    m_instrumentingAgents->setPageDebuggerAgent(nullptr);
 }
 

trunk/Source/WebCore/inspector/PageDebuggerAgent.h

@@ -57 +57 @@
 
 protected:
-    virtual void enable() override;
-    virtual void disable(bool isBeingDestroyed) override;
-
     virtual String sourceMapURLForScript(const Script&) override;
 

trunk/Source/WebCore/inspector/PageProfilerAgent.cpp

@@ -1 +1 @@
 /*
- * Copyright (C) 2010 Apple Inc. All rights reserved.
- * Copyright (C) 2010 Google Inc. All rights reserved.
+ * Copyright (C) 2014 Apple Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -25 +24 @@
  */
 
-[
-    NoInterfaceObject,
-] interface ScriptProfile {
-    readonly attribute DOMString title;
-    readonly attribute unsigned long uid;
-    readonly attribute ScriptProfileNode head;
-    readonly attribute double idleTime;
-};
+#include "config.h"
+#include "PageProfilerAgent.h"
 
+#if ENABLE(INSPECTOR)
+
+#include "JSDOMWindow.h"
+#include "MainFrame.h"
+#include "Page.h"
+
+using namespace Inspector;
+
+namespace WebCore {
+
+PageProfilerAgent::PageProfilerAgent(InstrumentingAgents* instrumentingAgents, Page* page)
+    : WebProfilerAgent(instrumentingAgents)
+    , m_inspectedPage(page)
+{
+}
+
+JSC::ExecState* PageProfilerAgent::profilingGlobalExecState() const
+{
+    return toJSDOMWindow(&m_inspectedPage->mainFrame(), debuggerWorld())->globalExec();
+}
+
+} // namespace WebCore
+
+#endif // ENABLE(INSPECTOR)

trunk/Source/WebCore/inspector/PageProfilerAgent.h

@@ -1 +1 @@
 /*
- * Copyright (C) 2010 Apple Inc. All rights reserved.
- * Copyright (C) 2010 Google Inc. All rights reserved.
+ * Copyright (C) 2014 Apple Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -25 +24 @@
  */
 
-[
-    NoInterfaceObject,
-] interface ScriptProfile {
-    readonly attribute DOMString title;
-    readonly attribute unsigned long uid;
-    readonly attribute ScriptProfileNode head;
-    readonly attribute double idleTime;
+#ifndef PageProfilerAgent_h
+#define PageProfilerAgent_h
+
+#if ENABLE(INSPECTOR)
+
+#include "WebProfilerAgent.h"
+
+namespace WebCore {
+
+class Page;
+
+class PageProfilerAgent final : public WebProfilerAgent {
+    WTF_MAKE_NONCOPYABLE(PageProfilerAgent);
+    WTF_MAKE_FAST_ALLOCATED;
+public:
+    PageProfilerAgent(InstrumentingAgents*, Page*);
+    virtual ~PageProfilerAgent() { }
+
+private:
+    virtual JSC::ExecState* profilingGlobalExecState() const override;
+
+    Page* m_inspectedPage;
 };
 
+} // namespace WebCore
+
+#endif // ENABLE(INSPECTOR)
+
+#endif // !defined(PageProfilerAgent_h)

trunk/Source/WebCore/inspector/ScriptProfile.idl

@@ -27 +27 @@
 [
     NoInterfaceObject,
+    SkipVTableValidation
 ] interface ScriptProfile {
     readonly attribute DOMString title;

trunk/Source/WebCore/inspector/TimelineRecordFactory.cpp

@@ -43 +43 @@
 #include "ResourceRequest.h"
 #include "ResourceResponse.h"
-#include "ScriptProfile.h"
 #include <inspector/InspectorValues.h>
 #include <inspector/ScriptBreakpoint.h>
 #include <inspector/ScriptCallStack.h>
 #include <inspector/ScriptCallStackFactory.h>
+#include <inspector/agents/InspectorProfilerAgent.h>
 #include <wtf/CurrentTime.h>
 
@@ -264 +264 @@
 }
 
-void TimelineRecordFactory::appendProfile(InspectorObject* data, PassRefPtr<ScriptProfile> profile)
-{
-    data->setValue(ASCIILiteral("profile"), profile->buildInspectorObject());
+void TimelineRecordFactory::appendProfile(InspectorObject* data, PassRefPtr<JSC::Profile> profile)
+{
+    data->setValue(ASCIILiteral("profile"), InspectorProfilerAgent::buildProfileInspectorObject(profile.get()));
 }
 

trunk/Source/WebCore/inspector/TimelineRecordFactory.h

@@ -37 +37 @@
 #include <wtf/Forward.h>
 #include <wtf/text/WTFString.h>
+
+namespace JSC {
+class Profile;
+}
 
 namespace Inspector {
@@ -101 +105 @@
         static void appendLayoutRoot(Inspector::InspectorObject* data, const FloatQuad&);
 
-        static void appendProfile(Inspector::InspectorObject*, PassRefPtr<ScriptProfile>);
+        static void appendProfile(Inspector::InspectorObject*, PassRefPtr<JSC::Profile>);
 
 #if ENABLE(WEB_SOCKETS)

trunk/Source/WebCore/inspector/WebConsoleAgent.cpp

@@ -34 +34 @@
 #include "ResourceError.h"
 #include "ResourceResponse.h"
-#include "ScriptProfiler.h"
 #include "ScriptState.h"
 #include "WebInjectedScriptManager.h"

trunk/Source/WebCore/inspector/WebProfilerAgent.cpp

@@ -1 +1 @@
 /*
- * Copyright (C) 2010 Apple Inc. All rights reserved.
- * Copyright (C) 2010 Google Inc. All rights reserved.
+ * Copyright (C) 2014 Apple Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -25 +24 @@
  */
 
-[
-    NoInterfaceObject,
-] interface ScriptProfile {
-    readonly attribute DOMString title;
-    readonly attribute unsigned long uid;
-    readonly attribute ScriptProfileNode head;
-    readonly attribute double idleTime;
-};
+#include "config.h"
+#include "WebProfilerAgent.h"
 
+#if ENABLE(INSPECTOR)
+
+#include "InstrumentingAgents.h"
+
+using namespace Inspector;
+
+namespace WebCore {
+
+WebProfilerAgent::WebProfilerAgent(InstrumentingAgents* instrumentingAgents)
+    : InspectorProfilerAgent()
+    , m_instrumentingAgents(instrumentingAgents)
+{
+}
+
+void WebProfilerAgent::enable(ShouldRecompile shouldRecompile)
+{
+    InspectorProfilerAgent::enable(shouldRecompile);
+    m_instrumentingAgents->setInspectorProfilerAgent(this);
+}
+
+void WebProfilerAgent::disable(ShouldRecompile shouldRecompile)
+{
+    InspectorProfilerAgent::enable(shouldRecompile);
+    m_instrumentingAgents->setInspectorProfilerAgent(nullptr);
+}
+
+} // namespace WebCore
+
+#endif // ENABLE(INSPECTOR)

trunk/Source/WebCore/inspector/WebProfilerAgent.h

@@ -1 +1 @@
 /*
- * Copyright (C) 2010 Apple Inc. All rights reserved.
- * Copyright (C) 2010 Google Inc. All rights reserved.
+ * Copyright (C) 2014 Apple Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -25 +24 @@
  */
 
-[
-    NoInterfaceObject,
-] interface ScriptProfile {
-    readonly attribute DOMString title;
-    readonly attribute unsigned long uid;
-    readonly attribute ScriptProfileNode head;
-    readonly attribute double idleTime;
+#ifndef WebProfilerAgent_h
+#define WebProfilerAgent_h
+
+#if ENABLE(INSPECTOR)
+
+#include <inspector/agents/InspectorProfilerAgent.h>
+
+namespace WebCore {
+
+class InstrumentingAgents;
+
+class WebProfilerAgent : public Inspector::InspectorProfilerAgent {
+    WTF_MAKE_NONCOPYABLE(WebProfilerAgent);
+    WTF_MAKE_FAST_ALLOCATED;
+public:
+    WebProfilerAgent(InstrumentingAgents*);
+    virtual ~WebProfilerAgent() { }
+
+    virtual void enable(ShouldRecompile) override final;
+    virtual void disable(ShouldRecompile) override final;
+
+protected:
+    InstrumentingAgents* m_instrumentingAgents;
 };
 
+} // namespace WebCore
+
+#endif // ENABLE(INSPECTOR)
+
+#endif // !defined(WebProfilerAgent_h)

trunk/Source/WebCore/inspector/WorkerInspectorController.cpp

@@ -39 +39 @@
 #include "InspectorForwarding.h"
 #include "InspectorInstrumentation.h"
-#include "InspectorProfilerAgent.h"
 #include "InspectorTimelineAgent.h"
 #include "InspectorWebBackendDispatchers.h"
@@ -50 +49 @@
 #include "WorkerDebuggerAgent.h"
 #include "WorkerGlobalScope.h"
+#include "WorkerProfilerAgent.h"
 #include "WorkerReportingProxy.h"
 #include "WorkerRuntimeAgent.h"
@@ -96 +96 @@
     m_agents.append(std::move(debuggerAgent));
 
-    m_agents.append(InspectorProfilerAgent::create(m_instrumentingAgents.get(), consoleAgent.get(), &workerGlobalScope, m_injectedScriptManager.get()));
+    auto profilerAgent = std::make_unique<WorkerProfilerAgent>(m_instrumentingAgents.get(), &workerGlobalScope);
+    profilerAgent->setScriptDebugServer(&debuggerAgent->scriptDebugServer());
+    m_agents.append(std::move(profilerAgent));
+
     m_agents.append(std::make_unique<InspectorTimelineAgent>(m_instrumentingAgents.get(), nullptr, InspectorTimelineAgent::WorkerInspector, nullptr));
     m_agents.append(std::move(consoleAgent));

trunk/Source/WebCore/inspector/WorkerProfilerAgent.cpp

@@ -1 +1 @@
 /*
- * Copyright (C) 2010 Apple Inc. All rights reserved.
- * Copyright (C) 2010 Google Inc. All rights reserved.
+ * Copyright (C) 2014 Apple Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -25 +24 @@
  */
 
-[
-    NoInterfaceObject,
-] interface ScriptProfile {
-    readonly attribute DOMString title;
-    readonly attribute unsigned long uid;
-    readonly attribute ScriptProfileNode head;
-    readonly attribute double idleTime;
-};
+#include "config.h"
+#include "WorkerProfilerAgent.h"
 
+#if ENABLE(INSPECTOR)
+
+#include "JSDOMWindow.h"
+#include "MainFrame.h"
+#include "Page.h"
+#include "ScriptState.h"
+
+using namespace Inspector;
+
+namespace WebCore {
+
+WorkerProfilerAgent::WorkerProfilerAgent(InstrumentingAgents* instrumentingAgents, WorkerGlobalScope* workerGlobalScope)
+    : WebProfilerAgent(instrumentingAgents)
+    , m_workerGlobalScope(workerGlobalScope)
+{
+}
+
+JSC::ExecState* WorkerProfilerAgent::profilingGlobalExecState() const
+{
+    return execStateFromWorkerGlobalScope(m_workerGlobalScope);
+}
+
+} // namespace WebCore
+
+#endif // ENABLE(INSPECTOR)

trunk/Source/WebCore/inspector/WorkerProfilerAgent.h

@@ -1 +1 @@
 /*
- * Copyright (C) 2010 Apple Inc. All rights reserved.
- * Copyright (C) 2010 Google Inc. All rights reserved.
+ * Copyright (C) 2014 Apple Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -25 +24 @@
  */
 
-[
-    NoInterfaceObject,
-] interface ScriptProfile {
-    readonly attribute DOMString title;
-    readonly attribute unsigned long uid;
-    readonly attribute ScriptProfileNode head;
-    readonly attribute double idleTime;
+#ifndef WorkerProfilerAgent_h
+#define WorkerProfilerAgent_h
+
+#if ENABLE(INSPECTOR)
+
+#include "WebProfilerAgent.h"
+
+namespace WebCore {
+
+class WorkerGlobalScope;
+
+class WorkerProfilerAgent final : public WebProfilerAgent {
+    WTF_MAKE_NONCOPYABLE(WorkerProfilerAgent);
+    WTF_MAKE_FAST_ALLOCATED;
+public:
+    WorkerProfilerAgent(InstrumentingAgents*, WorkerGlobalScope*);
+    virtual ~WorkerProfilerAgent() { }
+
+private:
+    virtual JSC::ExecState* profilingGlobalExecState() const override;
+
+    WorkerGlobalScope* m_workerGlobalScope;
 };
 
+} // namespace WebCore
+
+#endif // ENABLE(INSPECTOR)
+
+#endif // !defined(WorkerProfilerAgent_h)

trunk/Source/WebCore/loader/appcache/ApplicationCacheGroup.cpp

@@ -43 +43 @@
 #include "ResourceBuffer.h"
 #include "ResourceHandle.h"
-#include "ScriptProfile.h"
 #include "SecurityOrigin.h"
 #include "Settings.h"

trunk/Source/WebCore/page/PageConsole.cpp

@@ -39 +39 @@
 #include "MainFrame.h"
 #include "Page.h"
-#include "ScriptProfile.h"
-#include "ScriptProfiler.h"
 #include "ScriptableDocumentParser.h"
 #include "Settings.h"
@@ -168 +166 @@
 void PageConsole::profile(JSC::ExecState* exec, const String& title)
 {
-    // FIXME: log a console message when profiling is disabled.
-    if (!InspectorInstrumentation::profilerEnabled(&m_page))
-        return;
-
-    // If no title is given, build the next user initiated profile title.
-    String resolvedTitle = title;
-    if (title.isNull())
-        resolvedTitle = InspectorInstrumentation::getCurrentUserInitiatedProfileName(&m_page, true);
-
-    ScriptProfiler::start(exec, resolvedTitle);
-
-    RefPtr<ScriptCallStack> callStack(createScriptCallStackForConsole(exec, 1));
-    const ScriptCallFrame& lastCaller = callStack->at(0);
-    InspectorInstrumentation::addStartProfilingMessageToConsole(&m_page, resolvedTitle, lastCaller.lineNumber(), lastCaller.columnNumber(), lastCaller.sourceURL());
+    InspectorInstrumentation::startProfiling(&m_page, exec, title);
 }
 
 void PageConsole::profileEnd(JSC::ExecState* exec, const String& title)
 {
-    if (!InspectorInstrumentation::profilerEnabled(&m_page))
-        return;
-
-    RefPtr<ScriptProfile> profile = ScriptProfiler::stop(exec, title);
-    if (!profile)
-        return;
-
-    m_profiles.append(profile);
-    RefPtr<ScriptCallStack> callStack(createScriptCallStackForConsole(exec, 1));
-    InspectorInstrumentation::addProfile(&m_page, profile, callStack);
+    RefPtr<JSC::Profile> profile = InspectorInstrumentation::stopProfiling(&m_page, exec, title);
+    if (profile)
+        m_profiles.append(profile.release());
 }
 

trunk/Source/WebCore/page/PageConsole.h

@@ -33 +33 @@
 #include <runtime/ConsoleClient.h>
 #include <wtf/Forward.h>
-#include <wtf/PassOwnPtr.h>
 
 namespace JSC {
 class ExecState;
+class Profile;
 }
 
@@ -43 +43 @@
 class Document;
 class Page;
-class ScriptProfile;
-typedef Vector<RefPtr<ScriptProfile>> ProfilesArray;
+
+typedef Vector<RefPtr<JSC::Profile>> ProfilesArray;
 
 class PageConsole final : public JSC::ConsoleClient {

trunk/Source/WebCore/testing/Internals.cpp

@@ -75 +75 @@
 #include "MemoryInfo.h"
 #include "Page.h"
-#include "PageConsole.h"
 #include "PrintContext.h"
 #include "PseudoElement.h"

trunk/Source/WebCore/testing/Internals.h

@@ -32 +32 @@
 #include "ExceptionCodePlaceholder.h"
 #include "NodeList.h"
+#include "PageConsole.h"
 #include <bindings/ScriptValue.h>
 #include <runtime/ArrayBuffer.h>
@@ -57 +58 @@
 class Range;
 class ScriptExecutionContext;
-class ScriptProfile;
 class SerializedScriptValue;
 class TimeRanges;
@@ -63 +63 @@
 
 typedef int ExceptionCode;
-typedef Vector<RefPtr<ScriptProfile>> ProfilesArray;
 
 class Internals : public RefCounted<Internals>

trunk/Source/WebCore/xml/XMLHttpRequest.cpp

@@ -45 +45 @@
 #include "ResourceRequest.h"
 #include "ScriptController.h"
-#include "ScriptProfile.h"
 #include "Settings.h"
 #include "SharedBuffer.h"

trunk/Source/WebKit/WebKit.vcxproj/WebKitExportGenerator/WebKitExports.def.in

@@ -356 +356 @@
         symbolWithPointer(?pageSizeAndMarginsInPixels@PrintContext@WebCore@@SA?AVString@WTF@@PAVFrame@2@HHHHHHH@Z, ?pageSizeAndMarginsInPixels@PrintContext@WebCore@@SA?AVString@WTF@@PEAVFrame@2@HHHHHHH@Z)
         symbolWithPointer(?close@DOMWindow@WebCore@@QAEXPAVScriptExecutionContext@2@@Z, ?close@DOMWindow@WebCore@@QEAAXPEAVScriptExecutionContext@2@@Z)
-        symbolWithPointer(?toJS@WebCore@@YA?AVJSValue@JSC@@PAVExecState@3@PAVJSDOMGlobalObject@1@PAVScriptProfile@1@@Z, ?toJS@WebCore@@YA?AVJSValue@JSC@@PEAVExecState@3@PEAVJSDOMGlobalObject@1@PEAVScriptProfile@1@@Z)
+        symbolWithPointer(?toJS@WebCore@@YA?AVJSValue@JSC@@PAVExecState@3@PAVJSDOMGlobalObject@1@PAVProfile@3@@Z, ?toJS@WebCore@@YA?AVJSValue@JSC@@PEAVExecState@3@PEAVJSDOMGlobalObject@1@PEAVProfile@3@@Z)
         symbolWithPointer(?document@DOMWindow@WebCore@@QBEPAVDocument@2@XZ, ?document@DOMWindow@WebCore@@QEBAPEAVDocument@2@XZ)
         symbolWithPointer(?open@DOMWindow@WebCore@@QAE?AV?$PassRefPtr@VDOMWindow@WebCore@@@WTF@@ABVString@4@ABVAtomicString@4@0AAV12@2@Z, ?open@DOMWindow@WebCore@@QEAA?AV?$PassRefPtr@VDOMWindow@WebCore@@@WTF@@AEBVString@4@AEBVAtomicString@4@0AEAV12@2@Z)