Changeset 173198 in webkit

Timestamp:

Sep 2, 2014 8:17:47 PM (10 years ago)

Author:

Brian Burg

Message:

Web Inspector: remove ProfilerAgent and legacy profiler files in the frontend
​https://bugs.webkit.org/show_bug.cgi?id=136462

Reviewed by Timothy Hatcher.

Source/JavaScriptCore:

It's not used by the frontend anymore.

• CMakeLists.txt:
• DerivedSources.make:
• JavaScriptCore.vcxproj/JavaScriptCore.vcxproj:
• JavaScriptCore.vcxproj/JavaScriptCore.vcxproj.filters:
• JavaScriptCore.xcodeproj/project.pbxproj:

• inspector/JSConsoleClient.cpp:

(Inspector::JSConsoleClient::JSConsoleClient): Stub out console.profile/profileEnd
methods since they didn't work for JSContexts anyway.
(Inspector::JSConsoleClient::profile):
(Inspector::JSConsoleClient::profileEnd):

• inspector/JSConsoleClient.h:

• inspector/JSGlobalObjectInspectorController.cpp:

(Inspector::JSGlobalObjectInspectorController::JSGlobalObjectInspectorController):

• inspector/agents/InspectorProfilerAgent.cpp: Removed.
• inspector/agents/InspectorProfilerAgent.h: Removed.
• inspector/agents/JSGlobalObjectProfilerAgent.cpp: Removed.
• inspector/agents/JSGlobalObjectProfilerAgent.h: Removed.
• inspector/protocol/Profiler.json: Removed.

Source/WebCore:

It's not used by the frontend anymore.

No new tests, no behavior changed.

• CMakeLists.txt:
• ForwardingHeaders/inspector/agents/InspectorProfilerAgent.h: Removed.
• WebCore.order:
• WebCore.vcxproj/WebCore.vcxproj:
• WebCore.vcxproj/WebCore.vcxproj.filters:
• WebCore.xcodeproj/project.pbxproj:
• inspector/InspectorAllInOne.cpp:
• inspector/InspectorController.cpp:

(WebCore::InspectorController::InspectorController):

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

(WebCore::InspectorInstrumentation::didCommitLoadImpl):

• inspector/InstrumentingAgents.cpp:

(WebCore::InstrumentingAgents::InstrumentingAgents):
(WebCore::InstrumentingAgents::reset):

• inspector/InstrumentingAgents.h:

(WebCore::InstrumentingAgents::inspectorProfilerAgent): Deleted.
(WebCore::InstrumentingAgents::setInspectorProfilerAgent): Deleted.

• inspector/PageProfilerAgent.cpp: Removed.
• inspector/PageProfilerAgent.h: Removed.
• inspector/TimelineRecordFactory.cpp: Moved these builders to their only callsite.

(WebCore::buildInspectorObject):
(WebCore::buildProfileInspectorObject):
(WebCore::TimelineRecordFactory::appendProfile):

• inspector/WebProfilerAgent.cpp: Removed.
• inspector/WebProfilerAgent.h: Removed.
• inspector/WorkerInspectorController.cpp:

(WebCore::WorkerInspectorController::WorkerInspectorController):

• inspector/WorkerProfilerAgent.cpp: Removed.
• inspector/WorkerProfilerAgent.h: Removed.
• inspector/protocol/Timeline.json:

Source/WebInspectorUI:

The legacy profiler manager didn't do anything, and its views and models
have been superseded by new views and models based on the Timeline classes.

• .eslintrc:
• UserInterface/Base/Main.js:

(WebInspector.loaded):
(WebInspector.openURL): Remove profile URL handling code.

• UserInterface/Controllers/LegacyProfileManager.js: Removed.
• UserInterface/Main.html:
• UserInterface/Protocol/ConsoleObserver.js:

(WebInspector.ConsoleObserver.prototype.messageAdded):

• UserInterface/Protocol/InspectorFrontendAPI.js:

(InspectorFrontendAPI.isProfilingJavaScript): Deleted.
(InspectorFrontendAPI.startProfilingJavaScript): Deleted.
(InspectorFrontendAPI.stopProfilingJavaScript): Deleted.

• UserInterface/Protocol/LegacyProfilerObserver.js: Removed.
• UserInterface/Views/LegacyBottomUpProfileDataGridTree.js: Removed.
• UserInterface/Views/LegacyJavaScriptProfileObject.js: Removed.
• UserInterface/Views/LegacyJavaScriptProfileType.js: Removed.
• UserInterface/Views/LegacyJavaScriptProfileView.css: Removed.
• UserInterface/Views/LegacyJavaScriptProfileView.js: Removed.
• UserInterface/Views/LegacyProfileDataGridTree.js: Removed.
• UserInterface/Views/LegacyProfileObject.js: Removed.
• UserInterface/Views/LegacyProfileType.js: Removed.
• UserInterface/Views/LegacyProfileView.css: Removed.
• UserInterface/Views/LegacyProfileView.js: Removed.
• UserInterface/Views/LegacyTopDownProfileDataGridTree.js: Removed.

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 (deleted)
• JavaScriptCore/inspector/agents/InspectorProfilerAgent.h (deleted)
• JavaScriptCore/inspector/agents/JSGlobalObjectProfilerAgent.cpp (deleted)
• JavaScriptCore/inspector/agents/JSGlobalObjectProfilerAgent.h (deleted)
• JavaScriptCore/inspector/protocol/Profiler.json (deleted)
• WebCore/CMakeLists.txt (modified) (2 diffs)
• WebCore/ChangeLog (modified) (1 diff)
• WebCore/ForwardingHeaders/inspector/agents/InspectorProfilerAgent.h (deleted)
• WebCore/WebCore.order (modified) (6 diffs)
• WebCore/WebCore.vcxproj/WebCore.vcxproj (modified) (6 diffs)
• WebCore/WebCore.vcxproj/WebCore.vcxproj.filters (modified) (6 diffs)
• WebCore/WebCore.xcodeproj/project.pbxproj (modified) (11 diffs)
• WebCore/inspector/InspectorAllInOne.cpp (modified) (2 diffs)
• WebCore/inspector/InspectorController.cpp (modified) (3 diffs)
• WebCore/inspector/InspectorController.h (modified) (2 diffs)
• WebCore/inspector/InspectorInstrumentation.cpp (modified) (2 diffs)
• WebCore/inspector/InstrumentingAgents.cpp (modified) (2 diffs)
• WebCore/inspector/InstrumentingAgents.h (modified) (3 diffs)
• WebCore/inspector/PageProfilerAgent.cpp (deleted)
• WebCore/inspector/PageProfilerAgent.h (deleted)
• WebCore/inspector/TimelineRecordFactory.cpp (modified) (3 diffs)
• WebCore/inspector/WebProfilerAgent.cpp (deleted)
• WebCore/inspector/WebProfilerAgent.h (deleted)
• WebCore/inspector/WorkerInspectorController.cpp (modified) (2 diffs)
• WebCore/inspector/WorkerProfilerAgent.cpp (deleted)
• WebCore/inspector/WorkerProfilerAgent.h (deleted)
• WebCore/inspector/protocol/Timeline.json (modified) (1 diff)
• WebInspectorUI/.eslintrc (modified) (1 diff)
• WebInspectorUI/ChangeLog (modified) (1 diff)
• WebInspectorUI/UserInterface/Base/Main.js (modified) (3 diffs)
• WebInspectorUI/UserInterface/Controllers/LegacyProfileManager.js (deleted)
• WebInspectorUI/UserInterface/Main.html (modified) (5 diffs)
• WebInspectorUI/UserInterface/Protocol/ConsoleObserver.js (modified) (1 diff)
• WebInspectorUI/UserInterface/Protocol/InspectorFrontendAPI.js (modified) (1 diff)
• WebInspectorUI/UserInterface/Protocol/LegacyProfilerObserver.js (deleted)
• WebInspectorUI/UserInterface/Views/LegacyBottomUpProfileDataGridTree.js (deleted)
• WebInspectorUI/UserInterface/Views/LegacyJavaScriptProfileObject.js (deleted)
• WebInspectorUI/UserInterface/Views/LegacyJavaScriptProfileType.js (deleted)
• WebInspectorUI/UserInterface/Views/LegacyJavaScriptProfileView.css (deleted)
• WebInspectorUI/UserInterface/Views/LegacyJavaScriptProfileView.js (deleted)
• WebInspectorUI/UserInterface/Views/LegacyProfileDataGridTree.js (deleted)
• WebInspectorUI/UserInterface/Views/LegacyProfileObject.js (deleted)
• WebInspectorUI/UserInterface/Views/LegacyProfileType.js (deleted)
• WebInspectorUI/UserInterface/Views/LegacyProfileView.css (deleted)
• WebInspectorUI/UserInterface/Views/LegacyProfileView.js (deleted)
• WebInspectorUI/UserInterface/Views/LegacyTopDownProfileDataGridTree.js (deleted)

trunk/Source/JavaScriptCore/CMakeLists.txt

@@ -301 +301 @@
     inspector/agents/InspectorConsoleAgent.cpp
     inspector/agents/InspectorDebuggerAgent.cpp
-    inspector/agents/InspectorProfilerAgent.cpp
     inspector/agents/InspectorRuntimeAgent.cpp
     inspector/agents/JSGlobalObjectConsoleAgent.cpp
     inspector/agents/JSGlobalObjectDebuggerAgent.cpp
-    inspector/agents/JSGlobalObjectProfilerAgent.cpp
     inspector/agents/JSGlobalObjectRuntimeAgent.cpp
 
@@ -957 +955 @@
     ${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-09-02  Brian J. Burg  <burg@cs.washington.edu>
+
+        Web Inspector: remove ProfilerAgent and legacy profiler files in the frontend
+        https://bugs.webkit.org/show_bug.cgi?id=136462
+
+        Reviewed by Timothy Hatcher.
+
+        It's not used by the frontend anymore.
+
+        * CMakeLists.txt:
+        * DerivedSources.make:
+        * JavaScriptCore.vcxproj/JavaScriptCore.vcxproj:
+        * JavaScriptCore.vcxproj/JavaScriptCore.vcxproj.filters:
+        * JavaScriptCore.xcodeproj/project.pbxproj:
+
+        * inspector/JSConsoleClient.cpp:
+        (Inspector::JSConsoleClient::JSConsoleClient): Stub out console.profile/profileEnd
+        methods since they didn't work for JSContexts anyway.
+        (Inspector::JSConsoleClient::profile):
+        (Inspector::JSConsoleClient::profileEnd):
+        * inspector/JSConsoleClient.h:
+
+        * inspector/JSGlobalObjectInspectorController.cpp:
+        (Inspector::JSGlobalObjectInspectorController::JSGlobalObjectInspectorController):
+        * inspector/agents/InspectorProfilerAgent.cpp: Removed.
+        * inspector/agents/InspectorProfilerAgent.h: Removed.
+        * inspector/agents/JSGlobalObjectProfilerAgent.cpp: Removed.
+        * inspector/agents/JSGlobalObjectProfilerAgent.h: Removed.
+        * inspector/protocol/Profiler.json: Removed.
+
 2014-09-02  Andreas Kling  <akling@apple.com>
 

trunk/Source/JavaScriptCore/DerivedSources.make

@@ -118 +118 @@
     $(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

@@ -575 +575 @@
     <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" />
@@ -1279 +1278 @@
     <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

@@ -343 +343 @@
       <Filter>inspector</Filter>
     </ClCompile>
-    <ClCompile Include="..\inspector\agents\InspectorProfilerAgent.cpp">
-      <Filter>inspector</Filter>
-    </ClCompile>
     <ClCompile Include="..\inspector\agents\InspectorRuntimeAgent.cpp">
       <Filter>inspector</Filter>
@@ -2191 +2188 @@
     </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

@@ -834 +834 @@
                 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 */; };
@@ -2720 +2716 @@
                 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>"; };
@@ -5321 +5313 @@
                                 A57D23E31890CEBF0031C7FA /* InspectorDebuggerAgent.cpp */,
                                 A57D23E41890CEBF0031C7FA /* InspectorDebuggerAgent.h */,
-                                1CAA9A1C18F4997F000A369D /* InspectorProfilerAgent.cpp */,
-                                1CAA9A1D18F4997F000A369D /* InspectorProfilerAgent.h */,
                                 A50E4B5D18809DD50068A46D /* InspectorRuntimeAgent.cpp */,
                                 A50E4B5E18809DD50068A46D /* InspectorRuntimeAgent.h */,
@@ -5329 +5319 @@
                                 A57D23E71891B0770031C7FA /* JSGlobalObjectDebuggerAgent.cpp */,
                                 A57D23E81891B0770031C7FA /* JSGlobalObjectDebuggerAgent.h */,
-                                1CAA9A2018F4A220000A369D /* JSGlobalObjectProfilerAgent.cpp */,
-                                1CAA9A2118F4A220000A369D /* JSGlobalObjectProfilerAgent.h */,
                                 A50E4B5F18809DD50068A46D /* JSGlobalObjectRuntimeAgent.cpp */,
                                 A50E4B6018809DD50068A46D /* JSGlobalObjectRuntimeAgent.h */,
@@ -6210 +6198 @@
                                 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 */,
@@ -6238 +6225 @@
                                 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 */,
@@ -7399 +7385 @@
                                 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 */,
@@ -7623 +7608 @@
                                 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"
@@ -67 +66 @@
 }
 
-JSConsoleClient::JSConsoleClient(InspectorConsoleAgent* consoleAgent, InspectorProfilerAgent* profilerAgent)
+JSConsoleClient::JSConsoleClient(InspectorConsoleAgent* consoleAgent)
     : ConsoleClient()
     , m_consoleAgent(consoleAgent)
-    , m_profilerAgent(profilerAgent)
 {
     static std::once_flag initializeLogging;
@@ -95 +93 @@
 }
 
-void JSConsoleClient::profile(JSC::ExecState* exec, const String& title)
+void JSConsoleClient::profile(JSC::ExecState*, const String&)
 {
-    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);
+    // FIXME: support |console.profile| for JSContexts. <https://webkit.org/b/136466>
 }
 
-void JSConsoleClient::profileEnd(JSC::ExecState* exec, const String& title)
+void JSConsoleClient::profileEnd(JSC::ExecState*, const String&)
 {
-    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);
+    // FIXME: support |console.profile| for JSContexts. <https://webkit.org/b/136466>
 }
 

trunk/Source/JavaScriptCore/inspector/JSConsoleClient.h

@@ -32 +32 @@
 
 class InspectorConsoleAgent;
-class InspectorProfilerAgent;
 
 class JSConsoleClient final : public JSC::ConsoleClient {
     WTF_MAKE_FAST_ALLOCATED;
 public:
-    explicit JSConsoleClient(InspectorConsoleAgent*, InspectorProfilerAgent*);
+    explicit JSConsoleClient(InspectorConsoleAgent*);
     virtual ~JSConsoleClient() { }
 
@@ -58 +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"
@@ -62 +61 @@
     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, profilerAgent.get());
+    m_consoleClient = std::make_unique<JSConsoleClient>(m_consoleAgent);
 
     runtimeAgent->setScriptDebugServer(&debuggerAgent->scriptDebugServer());
-    profilerAgent->setScriptDebugServer(&debuggerAgent->scriptDebugServer());
 
     m_agents.append(std::make_unique<InspectorAgent>());

trunk/Source/WebCore/CMakeLists.txt

@@ -1807 +1807 @@
     inspector/PageConsoleAgent.cpp
     inspector/PageDebuggerAgent.cpp
-    inspector/PageProfilerAgent.cpp
     inspector/PageRuntimeAgent.cpp
     inspector/PageScriptDebugServer.cpp
@@ -1815 +1814 @@
     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-09-02  Brian J. Burg  <burg@cs.washington.edu>
+
+        Web Inspector: remove ProfilerAgent and legacy profiler files in the frontend
+        https://bugs.webkit.org/show_bug.cgi?id=136462
+
+        Reviewed by Timothy Hatcher.
+
+        It's not used by the frontend anymore.
+
+        No new tests, no behavior changed.
+
+        * CMakeLists.txt:
+        * ForwardingHeaders/inspector/agents/InspectorProfilerAgent.h: Removed.
+        * WebCore.order:
+        * WebCore.vcxproj/WebCore.vcxproj:
+        * WebCore.vcxproj/WebCore.vcxproj.filters:
+        * WebCore.xcodeproj/project.pbxproj:
+        * inspector/InspectorAllInOne.cpp:
+        * inspector/InspectorController.cpp:
+        (WebCore::InspectorController::InspectorController):
+        * inspector/InspectorController.h:
+        * inspector/InspectorInstrumentation.cpp:
+        (WebCore::InspectorInstrumentation::didCommitLoadImpl):
+        * inspector/InstrumentingAgents.cpp:
+        (WebCore::InstrumentingAgents::InstrumentingAgents):
+        (WebCore::InstrumentingAgents::reset):
+        * inspector/InstrumentingAgents.h:
+        (WebCore::InstrumentingAgents::inspectorProfilerAgent): Deleted.
+        (WebCore::InstrumentingAgents::setInspectorProfilerAgent): Deleted.
+        * inspector/PageProfilerAgent.cpp: Removed.
+        * inspector/PageProfilerAgent.h: Removed.
+        * inspector/TimelineRecordFactory.cpp: Moved these builders to their only callsite.
+        (WebCore::buildInspectorObject):
+        (WebCore::buildProfileInspectorObject):
+        (WebCore::TimelineRecordFactory::appendProfile):
+        * inspector/WebProfilerAgent.cpp: Removed.
+        * inspector/WebProfilerAgent.h: Removed.
+        * inspector/WorkerInspectorController.cpp:
+        (WebCore::WorkerInspectorController::WorkerInspectorController):
+        * inspector/WorkerProfilerAgent.cpp: Removed.
+        * inspector/WorkerProfilerAgent.h: Removed.
+        * inspector/protocol/Timeline.json:
+
 2014-09-02  Jer Noble  <jer.noble@apple.com>
 

trunk/Source/WebCore/WebCore.order

@@ -731 +731 @@
 __ZN7WebCore23InspectorCompositeState21inspectorStateUpdatedEv
 __ZN7WebCore25InspectorDOMDebuggerAgent6createEPNS_19InstrumentingAgentsEPNS_23InspectorCompositeStateEPNS_17InspectorDOMAgentEPNS_22InspectorDebuggerAgentEPNS_14InspectorAgentE
-__ZN7WebCore22InspectorProfilerAgent6createEPNS_19InstrumentingAgentsEPNS_21InspectorConsoleAgentEPNS_4PageEPNS_23InspectorCompositeStateEPNS_21InjectedScriptManagerE
-__ZN7WebCore22InspectorProfilerAgentC2EPNS_19InstrumentingAgentsEPNS_21InspectorConsoleAgentEPNS_23InspectorCompositeStateEPNS_21InjectedScriptManagerE
-__ZN7WebCore26InspectorHeapProfilerAgent6createEPNS_19InstrumentingAgentsEPNS_23InspectorCompositeStateEPNS_21InjectedScriptManagerE
 __ZN7WebCore20InspectorWorkerAgent6createEPNS_19InstrumentingAgentsEPNS_23InspectorCompositeStateE
 __ZN7WebCore20InspectorCanvasAgentC1EPNS_19InstrumentingAgentsEPNS_23InspectorCompositeStateEPNS_18InspectorPageAgentEPNS_21InjectedScriptManagerE
@@ -6500 +6497 @@
 __ZN7WebCore22InspectorDebuggerAgentD2Ev
 __ZN7WebCore25InspectorDOMDebuggerAgentD0Ev
-__ZN7WebCore17PageProfilerAgentD0Ev
-__ZN7WebCore22InspectorProfilerAgentD2Ev
-__ZN7WebCore26InspectorHeapProfilerAgentD0Ev
-__ZN7WebCore26InspectorHeapProfilerAgentD2Ev
 __ZN7WebCore20InspectorWorkerAgentD0Ev
 __ZN7WebCore20InspectorWorkerAgentD2Ev
@@ -20998 +20991 @@
 __ZTVN7WebCore12_GLOBAL__N_114CounterVisitorE
 __ZTVN7WebCore18InspectorPageAgentE
-__ZTVN7WebCore22InspectorProfilerAgentE
 __ZTVN7WebCore22InspectorResourceAgentE
 __ZTVN7WebCore21InspectorRuntimeAgentE
@@ -24384 +24376 @@
 __ZTVN3WTF21MemoryInstrumentation7WrapperIN7WebCore23InspectorFrontendClientEEE
 __ZTVN3WTF21MemoryInstrumentation7WrapperIN7WebCore26InspectorBackendDispatcherEEE
-__ZTVN3WTF21MemoryInstrumentation7WrapperIN7WebCore22InspectorProfilerAgentEEE
 __ZTVN3WTF21MemoryInstrumentation7WrapperIN7WebCore22InspectorDebuggerAgentEEE
 __ZTVN3WTF21MemoryInstrumentation7WrapperIN7WebCore18InspectorPageAgentEEE
@@ -24455 +24446 @@
 __ZTVN3WTF21MemoryInstrumentation7WrapperIN7WebCore21InspectorConsoleAgentEEE
 __ZTVN7WebCore8Protocol5ArrayINS0_8Profiler13ProfileHeaderEEE
-__ZTVN7WebCore18InspectorBaseAgentINS_22InspectorProfilerAgentEEE
-__ZTVN7WebCore19WorkerProfilerAgentE
-__ZTVN7WebCore17PageProfilerAgentE
 __ZTVN7WebCore18InspectorBaseAgentINS_22InspectorResourceAgentEEE
 __ZTVN3WTF21MemoryInstrumentation7WrapperIN7WebCore8Protocol7Network9InitiatorEEE
@@ -26461 +26449 @@
 __ZN7WebCore18WebCoreMemoryTypes24InspectorDOMStorageAgentE
 __ZN7WebCore18WebCoreMemoryTypes16InspectorOverlayE
-__ZN7WebCore18WebCoreMemoryTypes22InspectorProfilerAgentE
 __ZN7WebCore18WebCoreMemoryTypes22InspectorDebuggerAgentE
 __ZN7WebCore18WebCoreMemoryTypes22InspectorResourceAgentE

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

@@ -18110 +18110 @@
       <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>
@@ -18158 +18150 @@
       <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>
@@ -18199 +18183 @@
     </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>
@@ -21304 +21280 @@
     <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" />
@@ -21310 +21285 @@
     <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" />
@@ -21316 +21290 @@
     <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

@@ -4837 +4837 @@
       <Filter>inspector</Filter>
     </ClCompile>
-    <ClCompile Include="..\inspector\PageProfilerAgent.cpp">
-      <Filter>inspector</Filter>
-    </ClCompile>
     <ClCompile Include="..\inspector\PageRuntimeAgent.cpp">
       <Filter>inspector</Filter>
@@ -4855 +4852 @@
       <Filter>inspector</Filter>
     </ClCompile>
-    <ClCompile Include="..\inspector\WebProfilerAgent.cpp">
-      <Filter>inspector</Filter>
-    </ClCompile>
     <ClCompile Include="..\inspector\WebInjectedScriptHost.cpp">
       <Filter>inspector</Filter>
@@ -4871 +4865 @@
     </ClCompile>
     <ClCompile Include="..\inspector\WorkerInspectorController.cpp">
-      <Filter>inspector</Filter>
-    </ClCompile>
-    <ClCompile Include="..\inspector\WorkerProfilerAgent.cpp">
       <Filter>inspector</Filter>
     </ClCompile>
@@ -12568 +12559 @@
       <Filter>inspector</Filter>
     </ClInclude>
-    <ClInclude Include="..\inspector\PageProfilerAgent.h">
-      <Filter>inspector</Filter>
-    </ClInclude>
     <ClInclude Include="..\inspector\PageRuntimeAgent.h">
       <Filter>inspector</Filter>
@@ -12586 +12574 @@
       <Filter>inspector</Filter>
     </ClInclude>
-    <ClInclude Include="..\inspector\WebProfilerAgent.h">
-      <Filter>inspector</Filter>
-    </ClInclude>
     <ClInclude Include="..\inspector\WebInjectedScriptHost.h">
       <Filter>inspector</Filter>
@@ -12602 +12587 @@
     </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

@@ -952 +952 @@
                 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 */; };
@@ -7906 +7900 @@
                 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>"; };
@@ -15242 +15230 @@
                                 F34742DA134362F000531BC2 /* PageDebuggerAgent.cpp */,
                                 F34742DB134362F000531BC2 /* PageDebuggerAgent.h */,
-                                1CC6B06E18F8687A0007ECCD /* PageProfilerAgent.cpp */,
-                                1CC6B06F18F8687A0007ECCD /* PageProfilerAgent.h */,
                                 F382088C147D35F90010BC06 /* PageRuntimeAgent.cpp */,
                                 F382088D147D35F90010BC06 /* PageRuntimeAgent.h */,
@@ -15260 +15246 @@
                                 A584FE2D1864CB8400843B10 /* WebInjectedScriptManager.cpp */,
                                 A584FE2E1864CB8400843B10 /* WebInjectedScriptManager.h */,
-                                1CC6B06A18F8526B0007ECCD /* WebProfilerAgent.cpp */,
-                                1CC6B06B18F8526B0007ECCD /* WebProfilerAgent.h */,
                                 F382088E147D35F90010BC06 /* WorkerConsoleAgent.cpp */,
                                 F382088F147D35F90010BC06 /* WorkerConsoleAgent.h */,
@@ -15268 +15252 @@
                                 F36E07A21358A8BE00AACBC9 /* WorkerInspectorController.cpp */,
                                 F36E07A31358A8BE00AACBC9 /* WorkerInspectorController.h */,
-                                1CC6B07218F893A20007ECCD /* WorkerProfilerAgent.cpp */,
-                                1CC6B07318F893A20007ECCD /* WorkerProfilerAgent.h */,
                                 F3820890147D35F90010BC06 /* WorkerRuntimeAgent.cpp */,
                                 F3820891147D35F90010BC06 /* WorkerRuntimeAgent.h */,
@@ -24200 +24182 @@
                                 26C17A3E1491D2D400D12BA2 /* FileSystemIOS.h in Headers */,
                                 976D6C8E122B8A3D001FD1F7 /* FileThread.h in Headers */,
-                                1CC6B06D18F8526B0007ECCD /* WebProfilerAgent.h in Headers */,
                                 BC5EB69F0E81DAEB00B25965 /* FillLayer.h in Headers */,
                                 845E72F80FD261EE00A87D79 /* Filter.h in Headers */,
@@ -25955 +25936 @@
                                 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 */,
@@ -26318 +26298 @@
                                 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 */,
@@ -27613 +27592 @@
                                 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 */,
@@ -28593 +28571 @@
                                 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 */,
@@ -28949 +28926 @@
                                 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 */,

trunk/Source/WebCore/inspector/InspectorAllInOne.cpp

@@ -58 +58 @@
 #include "PageConsoleAgent.cpp"
 #include "PageDebuggerAgent.cpp"
-#include "PageProfilerAgent.cpp"
 #include "PageRuntimeAgent.cpp"
 #include "PageScriptDebugServer.cpp"
@@ -66 +65 @@
 #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/InspectorController.cpp

@@ -65 +65 @@
 #include "PageConsoleAgent.h"
 #include "PageDebuggerAgent.h"
-#include "PageProfilerAgent.h"
 #include "PageRuntimeAgent.h"
 #include "PageScriptDebugServer.h"
@@ -155 +154 @@
     m_agents.append(WTF::move(domDebuggerAgentPtr));
 
-    auto profilerAgentPtr = std::make_unique<PageProfilerAgent>(m_instrumentingAgents.get(), &page);
-    m_profilerAgent = profilerAgentPtr.get();
-    m_agents.append(WTF::move(profilerAgentPtr));
-
     m_agents.append(std::make_unique<InspectorApplicationCacheAgent>(m_instrumentingAgents.get(), pageAgent));
     m_agents.append(std::make_unique<InspectorWorkerAgent>(m_instrumentingAgents.get()));
@@ -177 +172 @@
     runtimeAgent->setScriptDebugServer(&m_debuggerAgent->scriptDebugServer());
     m_timelineAgent->setPageScriptDebugServer(&m_debuggerAgent->scriptDebugServer());
-    m_profilerAgent->setScriptDebugServer(&m_debuggerAgent->scriptDebugServer());
 }
 

trunk/Source/WebCore/inspector/InspectorController.h

@@ -48 +48 @@
 class InspectorBackendDispatcher;
 class InspectorFrontendChannel;
-class InspectorProfilerAgent;
 class InspectorObject;
 }
@@ -145 +144 @@
     PageDebuggerAgent* m_debuggerAgent;
     InspectorDOMDebuggerAgent* m_domDebuggerAgent;
-    Inspector::InspectorProfilerAgent* m_profilerAgent;
     InspectorTimelineAgent* m_timelineAgent;
 

trunk/Source/WebCore/inspector/InspectorInstrumentation.cpp

@@ -71 +71 @@
 #include <inspector/ScriptCallStack.h>
 #include <inspector/agents/InspectorDebuggerAgent.h>
-#include <inspector/agents/InspectorProfilerAgent.h>
 #include <profiler/Profile.h>
 #include <runtime/ConsoleTypes.h>
@@ -769 +768 @@
         if (InspectorResourceAgent* resourceAgent = instrumentingAgents->inspectorResourceAgent())
             resourceAgent->mainFrameNavigated(loader);
-
-        if (InspectorProfilerAgent* profilerAgent = instrumentingAgents->inspectorProfilerAgent())
-            profilerAgent->reset();
 
         if (InspectorCSSAgent* cssAgent = instrumentingAgents->inspectorCSSAgent())

trunk/Source/WebCore/inspector/InstrumentingAgents.cpp

@@ -69 +69 @@
     , m_pageDebuggerAgent(nullptr)
     , m_inspectorDOMDebuggerAgent(nullptr)
-    , m_inspectorProfilerAgent(nullptr)
     , m_inspectorWorkerAgent(nullptr)
 {
@@ -98 +97 @@
     m_pageDebuggerAgent = nullptr;
     m_inspectorDOMDebuggerAgent = nullptr;
-    m_inspectorProfilerAgent = nullptr;
     m_inspectorWorkerAgent = nullptr;
 }

trunk/Source/WebCore/inspector/InstrumentingAgents.h

@@ -42 +42 @@
 class InspectorAgent;
 class InspectorDebuggerAgent;
-class InspectorProfilerAgent;
 }
 
@@ -134 +133 @@
     void setInspectorDOMDebuggerAgent(InspectorDOMDebuggerAgent* agent) { m_inspectorDOMDebuggerAgent = agent; }
 
-    Inspector::InspectorProfilerAgent* inspectorProfilerAgent() const { return m_inspectorProfilerAgent; }
-    void setInspectorProfilerAgent(Inspector::InspectorProfilerAgent* agent) { m_inspectorProfilerAgent = agent; }
-
     InspectorWorkerAgent* inspectorWorkerAgent() const { return m_inspectorWorkerAgent; }
     void setInspectorWorkerAgent(InspectorWorkerAgent* agent) { m_inspectorWorkerAgent = agent; }
@@ -170 +166 @@
     PageDebuggerAgent* m_pageDebuggerAgent;
     InspectorDOMDebuggerAgent* m_inspectorDOMDebuggerAgent;
-    Inspector::InspectorProfilerAgent* m_inspectorProfilerAgent;
     InspectorWorkerAgent* m_inspectorWorkerAgent;
 };

trunk/Source/WebCore/inspector/TimelineRecordFactory.cpp

@@ -38 +38 @@
 #include "Event.h"
 #include "FloatQuad.h"
+#include "InspectorWebProtocolTypes.h"
 #include "IntRect.h"
 #include "JSMainThreadExecState.h"
@@ -43 +44 @@
 #include "ResourceRequest.h"
 #include "ResourceResponse.h"
-#include <inspector/InspectorValues.h>
 #include <inspector/ScriptBreakpoint.h>
 #include <inspector/ScriptCallStack.h>
 #include <inspector/ScriptCallStackFactory.h>
-#include <inspector/agents/InspectorProfilerAgent.h>
 #include <profiler/Profile.h>
 #include <wtf/CurrentTime.h>
@@ -272 +271 @@
 }
 
+static PassRefPtr<Protocol::Timeline::CPUProfileNodeCall> buildInspectorObject(const JSC::ProfileNode::Call& call)
+{
+    RefPtr<Protocol::Timeline::CPUProfileNodeCall> result = Protocol::Timeline::CPUProfileNodeCall::create()
+        .setStartTime(call.startTime())
+        .setTotalTime(call.totalTime());
+    return result.release();
+}
+
+static PassRefPtr<Protocol::Timeline::CPUProfileNode> buildInspectorObject(const JSC::ProfileNode* node)
+{
+    RefPtr<Protocol::Array<Protocol::Timeline::CPUProfileNodeCall>> calls = Protocol::Array<Protocol::Timeline::CPUProfileNodeCall>::create();
+    for (const JSC::ProfileNode::Call& call : node->calls())
+        calls->addItem(buildInspectorObject(call));
+
+    RefPtr<Protocol::Timeline::CPUProfileNode> result = Protocol::Timeline::CPUProfileNode::create()
+        .setId(node->id())
+        .setCalls(calls.release());
+
+    if (!node->functionName().isEmpty())
+        result->setFunctionName(node->functionName());
+
+    if (!node->url().isEmpty()) {
+        result->setUrl(node->url());
+        result->setLineNumber(node->lineNumber());
+        result->setColumnNumber(node->columnNumber());
+    }
+
+    if (!node->children().isEmpty()) {
+        RefPtr<Protocol::Array<Protocol::Timeline::CPUProfileNode>> children = Protocol::Array<Protocol::Timeline::CPUProfileNode>::create();
+        for (RefPtr<JSC::ProfileNode> profileNode : node->children())
+            children->addItem(buildInspectorObject(profileNode.get()));
+        result->setChildren(children);
+    }
+
+    return result.release();
+}
+
+static PassRefPtr<Protocol::Timeline::CPUProfile> buildProfileInspectorObject(const JSC::Profile* profile)
+{
+    RefPtr<Protocol::Array<Protocol::Timeline::CPUProfileNode>> rootNodes = Protocol::Array<Protocol::Timeline::CPUProfileNode>::create();
+    for (RefPtr<JSC::ProfileNode> profileNode : profile->head()->children())
+        rootNodes->addItem(buildInspectorObject(profileNode.get()));
+
+    RefPtr<Protocol::Timeline::CPUProfile> result = Protocol::Timeline::CPUProfile::create()
+        .setRootNodes(rootNodes);
+
+    if (profile->idleTime())
+        result->setIdleTime(profile->idleTime());
+
+    return result.release();
+}
+
 void TimelineRecordFactory::appendProfile(InspectorObject* data, PassRefPtr<JSC::Profile> profile)
 {
-    data->setValue(ASCIILiteral("profile"), InspectorProfilerAgent::buildProfileInspectorObject(profile.get()));
+    data->setValue(ASCIILiteral("profile"), buildProfileInspectorObject(profile.get()));
 }
 

trunk/Source/WebCore/inspector/WorkerInspectorController.cpp

@@ -49 +49 @@
 #include "WorkerDebuggerAgent.h"
 #include "WorkerGlobalScope.h"
-#include "WorkerProfilerAgent.h"
 #include "WorkerReportingProxy.h"
 #include "WorkerRuntimeAgent.h"
@@ -95 +94 @@
     m_runtimeAgent->setScriptDebugServer(&debuggerAgent->scriptDebugServer());
     m_agents.append(WTF::move(debuggerAgent));
-
-    auto profilerAgent = std::make_unique<WorkerProfilerAgent>(m_instrumentingAgents.get(), &workerGlobalScope);
-    profilerAgent->setScriptDebugServer(&debuggerAgent->scriptDebugServer());
-    m_agents.append(WTF::move(profilerAgent));
 
     m_agents.append(std::make_unique<InspectorTimelineAgent>(m_instrumentingAgents.get(), nullptr, InspectorTimelineAgent::WorkerInspector, nullptr));

trunk/Source/WebCore/inspector/protocol/Timeline.json

@@ -18 +18 @@
             ],
             "description": "Timeline record contains information about the recorded activity."
+        },
+        {
+            "id": "CPUProfileNodeCall",
+            "type": "object",
+            "description": "CPU Profile call info. Holds time information for a specific call that happened on a node.",
+            "properties": [
+                { "name": "startTime", "type": "number", "description": "Start time for the call." },
+                { "name": "totalTime", "type": "number", "description": "Total execution time for the call." }
+            ]
+        },
+        {
+            "id": "CPUProfileNode",
+            "type": "object",
+            "description": "CPU Profile node. Holds callsite information, execution statistics and child nodes.",
+            "properties": [
+                { "name": "id", "type": "integer", "description": "Unique identifier for this call site." },
+                { "name": "calls", "type": "array", "items": { "$ref": "CPUProfileNodeCall" }, "description": "Calls making up this node." },
+                { "name": "functionName", "type": "string", "optional": true, "description": "Function name." },
+                { "name": "url", "type": "string", "optional": true, "description": "URL." },
+                { "name": "lineNumber", "type": "integer", "optional": true, "description": "Line number." },
+                { "name": "columnNumber", "type": "integer", "optional": true, "description": "Column number." },
+                { "name": "children", "type": "array", "items": { "$ref": "CPUProfileNode" }, "optional": true, "description": "Child nodes." }
+            ]
+        },
+        {
+            "id": "CPUProfile",
+            "type": "object",
+            "description": "Profile.",
+            "properties": [
+                { "name": "rootNodes", "type": "array", "items": { "$ref": "CPUProfileNode" }, "description": "Top level nodes in the stack." },
+                { "name": "idleTime", "type": "number", "optional": true }
+            ]
         }
     ],

trunk/Source/WebInspectorUI/.eslintrc

@@ -50 +50 @@
         "NetworkAgent": true,
         "PageAgent": true,
-        "ProfilerAgent": true,
         "ReplayAgent": true,
         "RuntimeAgent": true,

trunk/Source/WebInspectorUI/ChangeLog

@@ +1 @@
+2014-09-02  Brian J. Burg  <burg@cs.washington.edu>
+
+        Web Inspector: remove ProfilerAgent and legacy profiler files in the frontend
+        https://bugs.webkit.org/show_bug.cgi?id=136462
+
+        Reviewed by Timothy Hatcher.
+
+        The legacy profiler manager didn't do anything, and its views and models
+        have been superseded by new views and models based on the Timeline classes.
+
+        * .eslintrc:
+        * UserInterface/Base/Main.js:
+        (WebInspector.loaded):
+        (WebInspector.openURL): Remove profile URL handling code.
+        * UserInterface/Controllers/LegacyProfileManager.js: Removed.
+        * UserInterface/Main.html:
+        * UserInterface/Protocol/ConsoleObserver.js:
+        (WebInspector.ConsoleObserver.prototype.messageAdded):
+        * UserInterface/Protocol/InspectorFrontendAPI.js:
+        (InspectorFrontendAPI.isProfilingJavaScript): Deleted.
+        (InspectorFrontendAPI.startProfilingJavaScript): Deleted.
+        (InspectorFrontendAPI.stopProfilingJavaScript): Deleted.
+        * UserInterface/Protocol/LegacyProfilerObserver.js: Removed.
+        * UserInterface/Views/LegacyBottomUpProfileDataGridTree.js: Removed.
+        * UserInterface/Views/LegacyJavaScriptProfileObject.js: Removed.
+        * UserInterface/Views/LegacyJavaScriptProfileType.js: Removed.
+        * UserInterface/Views/LegacyJavaScriptProfileView.css: Removed.
+        * UserInterface/Views/LegacyJavaScriptProfileView.js: Removed.
+        * UserInterface/Views/LegacyProfileDataGridTree.js: Removed.
+        * UserInterface/Views/LegacyProfileObject.js: Removed.
+        * UserInterface/Views/LegacyProfileType.js: Removed.
+        * UserInterface/Views/LegacyProfileView.css: Removed.
+        * UserInterface/Views/LegacyProfileView.js: Removed.
+        * UserInterface/Views/LegacyTopDownProfileDataGridTree.js: Removed.
+
 2014-08-29  Saam Barati  <saambarati1@gmail.com>
 

trunk/Source/WebInspectorUI/UserInterface/Base/Main.js

@@ -77 +77 @@
     if (InspectorBackend.registerTimelineDispatcher)
         InspectorBackend.registerTimelineDispatcher(new WebInspector.TimelineObserver);
-    if (InspectorBackend.registerProfilerDispatcher)
-        InspectorBackend.registerProfilerDispatcher(new WebInspector.LegacyProfilerObserver);
     if (InspectorBackend.registerCSSDispatcher)
         InspectorBackend.registerCSSDispatcher(new WebInspector.CSSObserver);
@@ -112 +110 @@
     this.applicationCacheManager = new WebInspector.ApplicationCacheManager;
     this.timelineManager = new WebInspector.TimelineManager;
-    this.legacyProfileManager = new WebInspector.LegacyProfileManager;
     this.debuggerManager = new WebInspector.DebuggerManager;
     this.sourceMapManager = new WebInspector.SourceMapManager;
@@ -500 +497 @@
     if (alwaysOpenExternally) {
         InspectorFrontendHost.openInNewTab(url);
-        return;
-    }
-
-    var parsedURL = parseURL(url);
-    if (parsedURL.scheme === WebInspector.LegacyProfileType.ProfileScheme) {
-        var profileType = parsedURL.host.toUpperCase();
-        var profileTitle = parsedURL.path;
-
-        // The path of of the profile URL starts with a slash, remove it, so
-        // we can get the actual title.
-        console.assert(profileTitle[0] === "/");
-        profileTitle = profileTitle.substring(1);
-
-        this.timelineSidebarPanel.showProfile(profileType, profileTitle);
         return;
     }

trunk/Source/WebInspectorUI/UserInterface/Main.html

@@ -91 +91 @@
     <link rel="stylesheet" href="Views/LayoutTimelineOverviewGraph.css">
     <link rel="stylesheet" href="Views/LayoutTimelineView.css">
-    <link rel="stylesheet" href="Views/LegacyJavaScriptProfileView.css">
-    <link rel="stylesheet" href="Views/LegacyProfileView.css">
     <link rel="stylesheet" href="Views/LogContentView.css">
     <link rel="stylesheet" href="Views/LogIcon.css">
@@ -190 +188 @@
     <script src="Protocol/InspectorObserver.js"></script>
     <script src="Protocol/LayerTreeObserver.js"></script>
-    <script src="Protocol/LegacyProfilerObserver.js"></script>
     <script src="Protocol/LoadInspectorBackendCommands.js"></script>
     <script src="Protocol/MessageDispatcher.js"></script>
@@ -282 +279 @@
     <script src="Views/DetailsSectionRow.js"></script>
     <script src="Views/HierarchicalPathComponent.js"></script>
-    <script src="Views/LegacyProfileDataGridTree.js"></script>
-    <script src="Views/LegacyProfileObject.js"></script>
-    <script src="Views/LegacyProfileType.js"></script>
-    <script src="Views/LegacyProfileView.js"></script>
     <script src="Views/NavigationItem.js"></script>
     <script src="Views/Section.js"></script>
@@ -402 +395 @@
     <script src="Views/LayoutTimelineOverviewGraph.js"></script>
     <script src="Views/LayoutTimelineView.js"></script>
-    <script src="Views/LegacyBottomUpProfileDataGridTree.js"></script>
-    <script src="Views/LegacyJavaScriptProfileObject.js"></script>
-    <script src="Views/LegacyJavaScriptProfileType.js"></script>
-    <script src="Views/LegacyJavaScriptProfileView.js"></script>
-    <script src="Views/LegacyTopDownProfileDataGridTree.js"></script>
     <script src="Views/LogContentView.js"></script>
     <script src="Views/LogTreeElement.js"></script>
@@ -488 +476 @@
     <script src="Controllers/JavaScriptRuntimeCompletionProvider.js"></script>
     <script src="Controllers/LayerTreeManager.js"></script>
-    <script src="Controllers/LegacyProfileManager.js"></script>
     <script src="Controllers/LogManager.js"></script>
     <script src="Controllers/ProbeManager.js"></script>

trunk/Source/WebInspectorUI/UserInterface/Protocol/ConsoleObserver.js

@@ -39 +39 @@
             WebInspector.issueManager.issueWasAdded(message.source, message.level, message.text, message.url, message.line, message.column || 0, message.parameters);
 
-        if (message.url === "[native code]") {
-            if (message.type === "profile")
-                WebInspector.legacyProfileManager.profileWasStartedFromConsole(message.text);
-            else if (message.type === "profileEnd")
-                WebInspector.legacyProfileManager.profileWasEndedFromConsole();
-        }
-
         if (message.source === "console-api" && message.type === "clear")
             return;

trunk/Source/WebInspectorUI/UserInterface/Protocol/InspectorFrontendAPI.js

@@ -67 +67 @@
             WebInspector.timelineManager.stopCapturing();
         }
-    },
-
-    isProfilingJavaScript: function()
-    {
-        return WebInspector.legacyProfileManager.isProfilingJavaScript();
-    },
-
-    startProfilingJavaScript: function()
-    {
-        WebInspector.legacyProfileManager.startProfilingJavaScript();
-    },
-
-    stopProfilingJavaScript: function()
-    {
-        WebInspector.timelineSidebarPanel.show();
-        WebInspector.legacyProfileManager.stopProfilingJavaScript();
     },