<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[201237] trunk</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://trac.webkit.org/projects/webkit/changeset/201237">201237</a></dd>
<dt>Author</dt> <dd>commit-queue@webkit.org</dd>
<dt>Date</dt> <dd>2016-05-20 19:00:42 -0700 (Fri, 20 May 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>Remove LegacyProfiler
https://bugs.webkit.org/show_bug.cgi?id=153565
Patch by Joseph Pecoraro <pecoraro@apple.com> on 2016-05-20
Reviewed by Saam Barati.
.:
* ManualTests/inspector/profiler-test-call.html: Removed.
* ManualTests/inspector/profiler-test-many-calls-in-the-same-scope.html: Removed.
Source/JavaScriptCore:
* inspector/protocol/Timeline.json:
* jsc.cpp:
* runtime/JSGlobalObject.cpp:
(JSC::JSGlobalObject::hasLegacyProfiler):
* runtime/JSGlobalObject.h:
(JSC::JSGlobalObject::supportsLegacyProfiling): Deleted.
Source/WebCore:
JavaScriptCore now provides a sampling profiler and it is enabled
by all ports. Web Inspector switched months ago to using the
sampling profiler and displaying its data. Remove the legacy
profiler, as it is no longer being used by anything other then
console.profile and tests. We will update console.profile's
behavior soon to have new behavior and use the sampling data.
* CMakeLists.txt:
* DerivedSources.cpp:
* DerivedSources.make:
* ForwardingHeaders/profiler/LegacyProfiler.h: Removed.
* WebCore.xcodeproj/project.pbxproj:
* bindings/js/JSCustomXPathNSResolver.cpp:
* bindings/js/JSDOMWindowBase.cpp:
(WebCore::JSDOMWindowBase::supportsLegacyProfiling): Deleted.
(WebCore::JSDOMWindowBase::supportsRichSourceInfo): Deleted.
* bindings/js/JSDOMWindowBase.h:
* bindings/js/JSWorkerGlobalScopeBase.cpp:
(WebCore::JSWorkerGlobalScopeBase::supportsLegacyProfiling): Deleted.
* bindings/js/JSWorkerGlobalScopeBase.h:
* bindings/js/ScriptCachedFrameData.cpp:
* bindings/js/ScriptController.cpp:
(WebCore::ScriptController::clearWindowShell): Deleted.
* bindings/js/ScriptProfile.h: Removed.
* bindings/js/ScriptProfileNode.h: Removed.
* bindings/scripts/CodeGeneratorJS.pm:
(AddClassForwardIfNeeded): Deleted.
* bindings/scripts/test/JS/JSTestObj.cpp:
(WebCore::jsTestObjPrototypeFunctionMethodWithSequenceArg): Deleted.
(WebCore::jsTestObjPrototypeFunctionMethodReturningSequence): Deleted.
* bindings/scripts/test/TestObj.idl:
* css/CSSParser.cpp:
* dom/Document.cpp:
* inspector/InspectorConsoleInstrumentation.h:
(WebCore::InspectorInstrumentation::stopProfiling):
* inspector/InspectorController.cpp:
(WebCore::InspectorController::InspectorController):
(WebCore::InspectorController::legacyProfilerEnabled): Deleted.
(WebCore::InspectorController::setLegacyProfilerEnabled): Deleted.
* inspector/InspectorController.h:
* inspector/InspectorInstrumentation.cpp:
(WebCore::InspectorInstrumentation::stopProfilingImpl):
* inspector/InspectorInstrumentation.h:
* inspector/InspectorTimelineAgent.cpp:
(WebCore::InspectorTimelineAgent::startFromConsole):
(WebCore::InspectorTimelineAgent::stopFromConsole):
* inspector/InspectorTimelineAgent.h:
* inspector/PageDebuggerAgent.cpp:
* inspector/PageRuntimeAgent.cpp:
* inspector/ScriptProfile.idl: Removed.
* inspector/ScriptProfileNode.idl: Removed.
* inspector/TimelineRecordFactory.cpp:
(WebCore::buildAggregateCallInfoInspectorObject): Deleted.
(WebCore::buildInspectorObject): Deleted.
(WebCore::buildProfileInspectorObject): Deleted.
(WebCore::TimelineRecordFactory::appendProfile): Deleted.
* inspector/TimelineRecordFactory.h:
* page/DOMWindow.cpp:
* page/Page.cpp:
* page/PageConsoleClient.cpp:
(WebCore::PageConsoleClient::profileEnd):
(WebCore::PageConsoleClient::clearProfiles): Deleted.
* page/PageConsoleClient.h:
* testing/Internals.cpp:
(WebCore::Internals::resetToConsistentState): Deleted.
(WebCore::Internals::consoleProfiles): Deleted.
(WebCore::Internals::setLegacyJavaScriptProfilingEnabled): Deleted.
* testing/Internals.h:
* testing/Internals.idl:
Source/WebKit/win:
* Interfaces/IWebInspector.idl:
* WebCoreStatistics.cpp:
* WebInspector.cpp:
(WebInspector::isJavaScriptProfilingEnabled): Deleted.
(WebInspector::setJavaScriptProfilingEnabled): Deleted.
* WebInspector.h:
* WebView.cpp:
LayoutTests:
* fast/profiler/anonymous-event-handler-expected.txt: Removed.
* fast/profiler/anonymous-event-handler.html: Removed.
* fast/profiler/anonymous-function-called-from-different-contexts-expected.txt: Removed.
* fast/profiler/anonymous-function-called-from-different-contexts.html: Removed.
* fast/profiler/anonymous-function-calls-built-in-functions-expected.txt: Removed.
* fast/profiler/anonymous-function-calls-built-in-functions.html: Removed.
* fast/profiler/anonymous-function-calls-eval-expected.txt: Removed.
* fast/profiler/anonymous-function-calls-eval.html: Removed.
* fast/profiler/anonymous-functions-with-display-names-expected.txt: Removed.
* fast/profiler/anonymous-functions-with-display-names.html: Removed.
* fast/profiler/apply-expected.txt: Removed.
* fast/profiler/apply.html: Removed.
* fast/profiler/built-in-function-calls-anonymous-expected.txt: Removed.
* fast/profiler/built-in-function-calls-anonymous.html: Removed.
* fast/profiler/built-in-function-calls-user-defined-function-expected.txt: Removed.
* fast/profiler/built-in-function-calls-user-defined-function.html: Removed.
* fast/profiler/call-expected.txt: Removed.
* fast/profiler/call-register-leak-expected.txt: Removed.
* fast/profiler/call-register-leak.html: Removed.
* fast/profiler/call.html: Removed.
* fast/profiler/calling-the-function-that-started-the-profiler-from-another-scope-expected.txt: Removed.
* fast/profiler/calling-the-function-that-started-the-profiler-from-another-scope.html: Removed.
* fast/profiler/compare-multiple-profiles-expected.txt: Removed.
* fast/profiler/compare-multiple-profiles.html: Removed.
* fast/profiler/constructor-expected.txt: Removed.
* fast/profiler/constructor.html: Removed.
* fast/profiler/dead-time-expected.txt: Removed.
* fast/profiler/dead-time.html: Removed.
* fast/profiler/document-dot-write-expected.txt: Removed.
* fast/profiler/document-dot-write.html: Removed.
* fast/profiler/event-handler-expected.txt: Removed.
* fast/profiler/event-handler.html: Removed.
* fast/profiler/execution-context-and-eval-on-same-line-expected.txt: Removed.
* fast/profiler/execution-context-and-eval-on-same-line.html: Removed.
* fast/profiler/inline-event-handler-expected.txt: Removed.
* fast/profiler/inline-event-handler.html: Removed.
* fast/profiler/many-calls-in-the-same-scope-expected.txt: Removed.
* fast/profiler/many-calls-in-the-same-scope.html: Removed.
* fast/profiler/multiple-and-different-scoped-anonymous-function-calls-expected.txt: Removed.
* fast/profiler/multiple-and-different-scoped-anonymous-function-calls.html: Removed.
* fast/profiler/multiple-and-different-scoped-function-calls-expected.txt: Removed.
* fast/profiler/multiple-and-different-scoped-function-calls.html: Removed.
* fast/profiler/multiple-anonymous-functions-called-from-the-same-function-expected.txt: Removed.
* fast/profiler/multiple-anonymous-functions-called-from-the-same-function.html: Removed.
* fast/profiler/multiple-frames-expected.txt: Removed.
* fast/profiler/multiple-frames.html: Removed.
* fast/profiler/named-functions-with-display-names-expected.txt: Removed.
* fast/profiler/named-functions-with-display-names.html: Removed.
* fast/profiler/nested-anonymous-functon-expected.txt: Removed.
* fast/profiler/nested-anonymous-functon.html: Removed.
* fast/profiler/nested-start-and-stop-profiler-expected.txt: Removed.
* fast/profiler/nested-start-and-stop-profiler.html: Removed.
* fast/profiler/no-execution-context-expected.txt: Removed.
* fast/profiler/no-execution-context.html: Removed.
* fast/profiler/one-execution-context-expected.txt: Removed.
* fast/profiler/one-execution-context.html: Removed.
* fast/profiler/profile-calls-in-included-file-expected.txt: Removed.
* fast/profiler/profile-calls-in-included-file.html: Removed.
* fast/profiler/profile-with-no-title-expected.txt: Removed.
* fast/profiler/profile-with-no-title.html: Removed.
* fast/profiler/profiling-from-a-nested-location-but-stop-profiling-outside-the-nesting-expected.txt: Removed.
* fast/profiler/profiling-from-a-nested-location-but-stop-profiling-outside-the-nesting.html: Removed.
* fast/profiler/profiling-from-a-nested-location-expected.txt: Removed.
* fast/profiler/profiling-from-a-nested-location.html: Removed.
* fast/profiler/resources/other-frame.html: Removed.
* fast/profiler/resources/other-window.html: Removed.
* fast/profiler/resources/profiler-test-JS-resources.js: Removed.
* fast/profiler/simple-event-call-expected.txt: Removed.
* fast/profiler/simple-event-call.html: Removed.
* fast/profiler/simple-no-level-change-expected.txt: Removed.
* fast/profiler/simple-no-level-change.html: Removed.
* fast/profiler/start-and-stop-profiler-multiple-times-expected.txt: Removed.
* fast/profiler/start-and-stop-profiler-multiple-times.html: Removed.
* fast/profiler/start-and-stop-profiling-in-the-same-function-expected.txt: Removed.
* fast/profiler/start-and-stop-profiling-in-the-same-function.html: Removed.
* fast/profiler/start-but-dont-stop-profiling-expected.txt: Removed.
* fast/profiler/start-but-dont-stop-profiling.html: Removed.
* fast/profiler/stop-profiling-after-setTimeout-expected.txt: Removed.
* fast/profiler/stop-profiling-after-setTimeout.html: Removed.
* fast/profiler/stop-then-function-call-expected.txt: Removed.
* fast/profiler/stop-then-function-call.html: Removed.
* fast/profiler/throw-exception-from-eval-expected.txt: Removed.
* fast/profiler/throw-exception-from-eval.html-disabled: Removed.
* fast/profiler/two-execution-contexts-expected.txt: Removed.
* fast/profiler/two-execution-contexts.html: Removed.
* fast/profiler/user-defined-function-calls-built-in-functions-expected.txt: Removed.
* fast/profiler/user-defined-function-calls-built-in-functions.html: Removed.
* fast/profiler/window-dot-eval-expected.txt: Removed.
* fast/profiler/window-dot-eval.html: Removed.
* platform/efl/TestExpectations:
* platform/gtk/TestExpectations:
* platform/ios-simulator/TestExpectations:</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkChangeLog">trunk/ChangeLog</a></li>
<li><a href="#trunkLayoutTestsChangeLog">trunk/LayoutTests/ChangeLog</a></li>
<li><a href="#trunkLayoutTestsplatformeflTestExpectations">trunk/LayoutTests/platform/efl/TestExpectations</a></li>
<li><a href="#trunkLayoutTestsplatformgtkTestExpectations">trunk/LayoutTests/platform/gtk/TestExpectations</a></li>
<li><a href="#trunkLayoutTestsplatformiossimulatorTestExpectations">trunk/LayoutTests/platform/ios-simulator/TestExpectations</a></li>
<li><a href="#trunkSourceJavaScriptCoreChangeLog">trunk/Source/JavaScriptCore/ChangeLog</a></li>
<li><a href="#trunkSourceJavaScriptCoreinspectorprotocolTimelinejson">trunk/Source/JavaScriptCore/inspector/protocol/Timeline.json</a></li>
<li><a href="#trunkSourceJavaScriptCorejsccpp">trunk/Source/JavaScriptCore/jsc.cpp</a></li>
<li><a href="#trunkSourceJavaScriptCoreruntimeJSGlobalObjectcpp">trunk/Source/JavaScriptCore/runtime/JSGlobalObject.cpp</a></li>
<li><a href="#trunkSourceJavaScriptCoreruntimeJSGlobalObjecth">trunk/Source/JavaScriptCore/runtime/JSGlobalObject.h</a></li>
<li><a href="#trunkSourceWebCoreCMakeListstxt">trunk/Source/WebCore/CMakeLists.txt</a></li>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreDerivedSourcescpp">trunk/Source/WebCore/DerivedSources.cpp</a></li>
<li><a href="#trunkSourceWebCoreDerivedSourcesmake">trunk/Source/WebCore/DerivedSources.make</a></li>
<li><a href="#trunkSourceWebCoreWebCorexcodeprojprojectpbxproj">trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj</a></li>
<li><a href="#trunkSourceWebCorebindingsjsJSCustomXPathNSResolvercpp">trunk/Source/WebCore/bindings/js/JSCustomXPathNSResolver.cpp</a></li>
<li><a href="#trunkSourceWebCorebindingsjsJSDOMWindowBasecpp">trunk/Source/WebCore/bindings/js/JSDOMWindowBase.cpp</a></li>
<li><a href="#trunkSourceWebCorebindingsjsJSDOMWindowBaseh">trunk/Source/WebCore/bindings/js/JSDOMWindowBase.h</a></li>
<li><a href="#trunkSourceWebCorebindingsjsJSWorkerGlobalScopeBasecpp">trunk/Source/WebCore/bindings/js/JSWorkerGlobalScopeBase.cpp</a></li>
<li><a href="#trunkSourceWebCorebindingsjsJSWorkerGlobalScopeBaseh">trunk/Source/WebCore/bindings/js/JSWorkerGlobalScopeBase.h</a></li>
<li><a href="#trunkSourceWebCorebindingsjsScriptCachedFrameDatacpp">trunk/Source/WebCore/bindings/js/ScriptCachedFrameData.cpp</a></li>
<li><a href="#trunkSourceWebCorebindingsjsScriptControllercpp">trunk/Source/WebCore/bindings/js/ScriptController.cpp</a></li>
<li><a href="#trunkSourceWebCorebindingsscriptsCodeGeneratorJSpm">trunk/Source/WebCore/bindings/scripts/CodeGeneratorJS.pm</a></li>
<li><a href="#trunkSourceWebCorebindingsscriptstestJSJSTestObjcpp">trunk/Source/WebCore/bindings/scripts/test/JS/JSTestObj.cpp</a></li>
<li><a href="#trunkSourceWebCorebindingsscriptstestTestObjidl">trunk/Source/WebCore/bindings/scripts/test/TestObj.idl</a></li>
<li><a href="#trunkSourceWebCorecssCSSParsercpp">trunk/Source/WebCore/css/CSSParser.cpp</a></li>
<li><a href="#trunkSourceWebCoredomDocumentcpp">trunk/Source/WebCore/dom/Document.cpp</a></li>
<li><a href="#trunkSourceWebCoreinspectorInspectorConsoleInstrumentationh">trunk/Source/WebCore/inspector/InspectorConsoleInstrumentation.h</a></li>
<li><a href="#trunkSourceWebCoreinspectorInspectorControllercpp">trunk/Source/WebCore/inspector/InspectorController.cpp</a></li>
<li><a href="#trunkSourceWebCoreinspectorInspectorControllerh">trunk/Source/WebCore/inspector/InspectorController.h</a></li>
<li><a href="#trunkSourceWebCoreinspectorInspectorInstrumentationcpp">trunk/Source/WebCore/inspector/InspectorInstrumentation.cpp</a></li>
<li><a href="#trunkSourceWebCoreinspectorInspectorInstrumentationh">trunk/Source/WebCore/inspector/InspectorInstrumentation.h</a></li>
<li><a href="#trunkSourceWebCoreinspectorInspectorTimelineAgentcpp">trunk/Source/WebCore/inspector/InspectorTimelineAgent.cpp</a></li>
<li><a href="#trunkSourceWebCoreinspectorInspectorTimelineAgenth">trunk/Source/WebCore/inspector/InspectorTimelineAgent.h</a></li>
<li><a href="#trunkSourceWebCoreinspectorPageDebuggerAgentcpp">trunk/Source/WebCore/inspector/PageDebuggerAgent.cpp</a></li>
<li><a href="#trunkSourceWebCoreinspectorPageRuntimeAgentcpp">trunk/Source/WebCore/inspector/PageRuntimeAgent.cpp</a></li>
<li><a href="#trunkSourceWebCoreinspectorTimelineRecordFactorycpp">trunk/Source/WebCore/inspector/TimelineRecordFactory.cpp</a></li>
<li><a href="#trunkSourceWebCoreinspectorTimelineRecordFactoryh">trunk/Source/WebCore/inspector/TimelineRecordFactory.h</a></li>
<li><a href="#trunkSourceWebCorepageDOMWindowcpp">trunk/Source/WebCore/page/DOMWindow.cpp</a></li>
<li><a href="#trunkSourceWebCorepagePagecpp">trunk/Source/WebCore/page/Page.cpp</a></li>
<li><a href="#trunkSourceWebCorepagePageConsoleClientcpp">trunk/Source/WebCore/page/PageConsoleClient.cpp</a></li>
<li><a href="#trunkSourceWebCorepagePageConsoleClienth">trunk/Source/WebCore/page/PageConsoleClient.h</a></li>
<li><a href="#trunkSourceWebCoretestingInternalscpp">trunk/Source/WebCore/testing/Internals.cpp</a></li>
<li><a href="#trunkSourceWebCoretestingInternalsh">trunk/Source/WebCore/testing/Internals.h</a></li>
<li><a href="#trunkSourceWebCoretestingInternalsidl">trunk/Source/WebCore/testing/Internals.idl</a></li>
<li><a href="#trunkSourceWebKitwinChangeLog">trunk/Source/WebKit/win/ChangeLog</a></li>
<li><a href="#trunkSourceWebKitwinInterfacesIWebInspectoridl">trunk/Source/WebKit/win/Interfaces/IWebInspector.idl</a></li>
<li><a href="#trunkSourceWebKitwinWebCoreStatisticscpp">trunk/Source/WebKit/win/WebCoreStatistics.cpp</a></li>
<li><a href="#trunkSourceWebKitwinWebInspectorcpp">trunk/Source/WebKit/win/WebInspector.cpp</a></li>
<li><a href="#trunkSourceWebKitwinWebInspectorh">trunk/Source/WebKit/win/WebInspector.h</a></li>
<li><a href="#trunkSourceWebKitwinWebViewcpp">trunk/Source/WebKit/win/WebView.cpp</a></li>
</ul>
<h3>Removed Paths</h3>
<ul>
<li>trunk/LayoutTests/fast/profiler/</li>
<li><a href="#trunkManualTestsinspectorprofilertestcallhtml">trunk/ManualTests/inspector/profiler-test-call.html</a></li>
<li><a href="#trunkManualTestsinspectorprofilertestmanycallsinthesamescopehtml">trunk/ManualTests/inspector/profiler-test-many-calls-in-the-same-scope.html</a></li>
<li><a href="#trunkSourceWebCoreForwardingHeadersprofilerLegacyProfilerh">trunk/Source/WebCore/ForwardingHeaders/profiler/LegacyProfiler.h</a></li>
<li><a href="#trunkSourceWebCorebindingsjsScriptProfileh">trunk/Source/WebCore/bindings/js/ScriptProfile.h</a></li>
<li><a href="#trunkSourceWebCorebindingsjsScriptProfileNodeh">trunk/Source/WebCore/bindings/js/ScriptProfileNode.h</a></li>
<li><a href="#trunkSourceWebCoreinspectorScriptProfileidl">trunk/Source/WebCore/inspector/ScriptProfile.idl</a></li>
<li><a href="#trunkSourceWebCoreinspectorScriptProfileNodeidl">trunk/Source/WebCore/inspector/ScriptProfileNode.idl</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/ChangeLog (201236 => 201237)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/ChangeLog 2016-05-21 01:17:42 UTC (rev 201236)
+++ trunk/ChangeLog 2016-05-21 02:00:42 UTC (rev 201237)
</span><span class="lines">@@ -1,3 +1,13 @@
</span><ins>+2016-05-20 Joseph Pecoraro <pecoraro@apple.com>
+
+ Remove LegacyProfiler
+ https://bugs.webkit.org/show_bug.cgi?id=153565
+
+ Reviewed by Saam Barati.
+
+ * ManualTests/inspector/profiler-test-call.html: Removed.
+ * ManualTests/inspector/profiler-test-many-calls-in-the-same-scope.html: Removed.
+
</ins><span class="cx"> 2016-05-18 Gwang Yoon Hwang <yoon@igalia.com>
</span><span class="cx">
</span><span class="cx"> [GStreamer] Use FakeSink to get a decoded texture from a pipeline
</span></span></pre></div>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (201236 => 201237)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog 2016-05-21 01:17:42 UTC (rev 201236)
+++ trunk/LayoutTests/ChangeLog 2016-05-21 02:00:42 UTC (rev 201237)
</span><span class="lines">@@ -1,3 +1,103 @@
</span><ins>+2016-05-20 Joseph Pecoraro <pecoraro@apple.com>
+
+ Remove LegacyProfiler
+ https://bugs.webkit.org/show_bug.cgi?id=153565
+
+ Reviewed by Saam Barati.
+
+ * fast/profiler/anonymous-event-handler-expected.txt: Removed.
+ * fast/profiler/anonymous-event-handler.html: Removed.
+ * fast/profiler/anonymous-function-called-from-different-contexts-expected.txt: Removed.
+ * fast/profiler/anonymous-function-called-from-different-contexts.html: Removed.
+ * fast/profiler/anonymous-function-calls-built-in-functions-expected.txt: Removed.
+ * fast/profiler/anonymous-function-calls-built-in-functions.html: Removed.
+ * fast/profiler/anonymous-function-calls-eval-expected.txt: Removed.
+ * fast/profiler/anonymous-function-calls-eval.html: Removed.
+ * fast/profiler/anonymous-functions-with-display-names-expected.txt: Removed.
+ * fast/profiler/anonymous-functions-with-display-names.html: Removed.
+ * fast/profiler/apply-expected.txt: Removed.
+ * fast/profiler/apply.html: Removed.
+ * fast/profiler/built-in-function-calls-anonymous-expected.txt: Removed.
+ * fast/profiler/built-in-function-calls-anonymous.html: Removed.
+ * fast/profiler/built-in-function-calls-user-defined-function-expected.txt: Removed.
+ * fast/profiler/built-in-function-calls-user-defined-function.html: Removed.
+ * fast/profiler/call-expected.txt: Removed.
+ * fast/profiler/call-register-leak-expected.txt: Removed.
+ * fast/profiler/call-register-leak.html: Removed.
+ * fast/profiler/call.html: Removed.
+ * fast/profiler/calling-the-function-that-started-the-profiler-from-another-scope-expected.txt: Removed.
+ * fast/profiler/calling-the-function-that-started-the-profiler-from-another-scope.html: Removed.
+ * fast/profiler/compare-multiple-profiles-expected.txt: Removed.
+ * fast/profiler/compare-multiple-profiles.html: Removed.
+ * fast/profiler/constructor-expected.txt: Removed.
+ * fast/profiler/constructor.html: Removed.
+ * fast/profiler/dead-time-expected.txt: Removed.
+ * fast/profiler/dead-time.html: Removed.
+ * fast/profiler/document-dot-write-expected.txt: Removed.
+ * fast/profiler/document-dot-write.html: Removed.
+ * fast/profiler/event-handler-expected.txt: Removed.
+ * fast/profiler/event-handler.html: Removed.
+ * fast/profiler/execution-context-and-eval-on-same-line-expected.txt: Removed.
+ * fast/profiler/execution-context-and-eval-on-same-line.html: Removed.
+ * fast/profiler/inline-event-handler-expected.txt: Removed.
+ * fast/profiler/inline-event-handler.html: Removed.
+ * fast/profiler/many-calls-in-the-same-scope-expected.txt: Removed.
+ * fast/profiler/many-calls-in-the-same-scope.html: Removed.
+ * fast/profiler/multiple-and-different-scoped-anonymous-function-calls-expected.txt: Removed.
+ * fast/profiler/multiple-and-different-scoped-anonymous-function-calls.html: Removed.
+ * fast/profiler/multiple-and-different-scoped-function-calls-expected.txt: Removed.
+ * fast/profiler/multiple-and-different-scoped-function-calls.html: Removed.
+ * fast/profiler/multiple-anonymous-functions-called-from-the-same-function-expected.txt: Removed.
+ * fast/profiler/multiple-anonymous-functions-called-from-the-same-function.html: Removed.
+ * fast/profiler/multiple-frames-expected.txt: Removed.
+ * fast/profiler/multiple-frames.html: Removed.
+ * fast/profiler/named-functions-with-display-names-expected.txt: Removed.
+ * fast/profiler/named-functions-with-display-names.html: Removed.
+ * fast/profiler/nested-anonymous-functon-expected.txt: Removed.
+ * fast/profiler/nested-anonymous-functon.html: Removed.
+ * fast/profiler/nested-start-and-stop-profiler-expected.txt: Removed.
+ * fast/profiler/nested-start-and-stop-profiler.html: Removed.
+ * fast/profiler/no-execution-context-expected.txt: Removed.
+ * fast/profiler/no-execution-context.html: Removed.
+ * fast/profiler/one-execution-context-expected.txt: Removed.
+ * fast/profiler/one-execution-context.html: Removed.
+ * fast/profiler/profile-calls-in-included-file-expected.txt: Removed.
+ * fast/profiler/profile-calls-in-included-file.html: Removed.
+ * fast/profiler/profile-with-no-title-expected.txt: Removed.
+ * fast/profiler/profile-with-no-title.html: Removed.
+ * fast/profiler/profiling-from-a-nested-location-but-stop-profiling-outside-the-nesting-expected.txt: Removed.
+ * fast/profiler/profiling-from-a-nested-location-but-stop-profiling-outside-the-nesting.html: Removed.
+ * fast/profiler/profiling-from-a-nested-location-expected.txt: Removed.
+ * fast/profiler/profiling-from-a-nested-location.html: Removed.
+ * fast/profiler/resources/other-frame.html: Removed.
+ * fast/profiler/resources/other-window.html: Removed.
+ * fast/profiler/resources/profiler-test-JS-resources.js: Removed.
+ * fast/profiler/simple-event-call-expected.txt: Removed.
+ * fast/profiler/simple-event-call.html: Removed.
+ * fast/profiler/simple-no-level-change-expected.txt: Removed.
+ * fast/profiler/simple-no-level-change.html: Removed.
+ * fast/profiler/start-and-stop-profiler-multiple-times-expected.txt: Removed.
+ * fast/profiler/start-and-stop-profiler-multiple-times.html: Removed.
+ * fast/profiler/start-and-stop-profiling-in-the-same-function-expected.txt: Removed.
+ * fast/profiler/start-and-stop-profiling-in-the-same-function.html: Removed.
+ * fast/profiler/start-but-dont-stop-profiling-expected.txt: Removed.
+ * fast/profiler/start-but-dont-stop-profiling.html: Removed.
+ * fast/profiler/stop-profiling-after-setTimeout-expected.txt: Removed.
+ * fast/profiler/stop-profiling-after-setTimeout.html: Removed.
+ * fast/profiler/stop-then-function-call-expected.txt: Removed.
+ * fast/profiler/stop-then-function-call.html: Removed.
+ * fast/profiler/throw-exception-from-eval-expected.txt: Removed.
+ * fast/profiler/throw-exception-from-eval.html-disabled: Removed.
+ * fast/profiler/two-execution-contexts-expected.txt: Removed.
+ * fast/profiler/two-execution-contexts.html: Removed.
+ * fast/profiler/user-defined-function-calls-built-in-functions-expected.txt: Removed.
+ * fast/profiler/user-defined-function-calls-built-in-functions.html: Removed.
+ * fast/profiler/window-dot-eval-expected.txt: Removed.
+ * fast/profiler/window-dot-eval.html: Removed.
+ * platform/efl/TestExpectations:
+ * platform/gtk/TestExpectations:
+ * platform/ios-simulator/TestExpectations:
+
</ins><span class="cx"> 2016-05-20 Zalan Bujtas <zalan@apple.com>
</span><span class="cx">
</span><span class="cx"> `width: 1%` on nested table cell causes its table to hog horizontal space
</span></span></pre></div>
<a id="trunkLayoutTestsplatformeflTestExpectations"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/platform/efl/TestExpectations (201236 => 201237)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/platform/efl/TestExpectations 2016-05-21 01:17:42 UTC (rev 201236)
+++ trunk/LayoutTests/platform/efl/TestExpectations 2016-05-21 02:00:42 UTC (rev 201237)
</span><span class="lines">@@ -1021,9 +1021,6 @@
</span><span class="cx"> webkit.org/b/142156 css3/shapes/spec-examples/shape-outside-012.html [ Failure Pass ]
</span><span class="cx"> webkit.org/b/142156 css3/shapes/spec-examples/shape-outside-019.html [ Failure Pass ]
</span><span class="cx">
</span><del>-webkit.org/b/142157 fast/profiler/dead-time.html [ Failure Pass ]
-webkit.org/b/142157 fast/profiler/stop-profiling-after-setTimeout.html [ Failure Pass ]
-
</del><span class="cx"> webkit.org/b/95551 fast/forms/datalist/update-range-with-datalist.html [ ImageOnlyFailure Pass ]
</span><span class="cx">
</span><span class="cx"> webkit.org/b/129820 svg/clip-path/mask-nested-clip-path-006.svg [ Pass ImageOnlyFailure ]
</span></span></pre></div>
<a id="trunkLayoutTestsplatformgtkTestExpectations"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/platform/gtk/TestExpectations (201236 => 201237)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/platform/gtk/TestExpectations 2016-05-21 01:17:42 UTC (rev 201236)
+++ trunk/LayoutTests/platform/gtk/TestExpectations 2016-05-21 02:00:42 UTC (rev 201237)
</span><span class="lines">@@ -1203,9 +1203,6 @@
</span><span class="cx"> webkit.org/b/136066 animations/missing-values-first-keyframe.html [ Crash Pass ]
</span><span class="cx"> webkit.org/b/136066 animations/state-at-end-event.html [ Crash Pass ]
</span><span class="cx">
</span><del>-webkit.org/b/136067 fast/profiler/dead-time.html [ Failure Pass ]
-webkit.org/b/136067 fast/profiler/stop-profiling-after-setTimeout.html [ Failure Pass ]
-
</del><span class="cx"> webkit.org/b/136070 fast/forms/label/label-becomes-visible-while-clicking-on-label.html [ Failure Pass ]
</span><span class="cx">
</span><span class="cx"> webkit.org/b/136580 media/context-menu-actions.html [ Timeout Pass ]
</span></span></pre></div>
<a id="trunkLayoutTestsplatformiossimulatorTestExpectations"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/platform/ios-simulator/TestExpectations (201236 => 201237)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/platform/ios-simulator/TestExpectations 2016-05-21 01:17:42 UTC (rev 201236)
+++ trunk/LayoutTests/platform/ios-simulator/TestExpectations 2016-05-21 02:00:42 UTC (rev 201237)
</span><span class="lines">@@ -1896,7 +1896,6 @@
</span><span class="cx"> fast/preloader/document-write-2.html [ Failure ]
</span><span class="cx"> fast/preloader/document-write.html [ Failure ]
</span><span class="cx"> fast/preloader/image-srcset.html [ Failure ]
</span><del>-fast/profiler/profiling-from-a-nested-location-but-stop-profiling-outside-the-nesting.html [ Failure ]
</del><span class="cx"> fast/regions/absolute-in-relative-overflow.html [ ImageOnlyFailure ]
</span><span class="cx"> fast/regions/absolute-pos-elem-in-region.html [ ImageOnlyFailure ]
</span><span class="cx"> fast/regions/animation-element-in-region-flowed-to-other-thread.html [ ImageOnlyFailure ]
</span></span></pre></div>
<a id="trunkManualTestsinspectorprofilertestcallhtml"></a>
<div class="delfile"><h4>Deleted: trunk/ManualTests/inspector/profiler-test-call.html (201236 => 201237)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/ManualTests/inspector/profiler-test-call.html 2016-05-21 01:17:42 UTC (rev 201236)
+++ trunk/ManualTests/inspector/profiler-test-call.html 2016-05-21 02:00:42 UTC (rev 201237)
</span><span class="lines">@@ -1,35 +0,0 @@
</span><del>-<html>
-<head>
-<script src="resources/profiler-test-JS-resources.js"></script>
-<script>
-console.profile("Using the call() method");
-function startTest()
-{
- var myObject = new fakeObject(1, 2);
- endTest();
-}
-
-function fakeObject (x, y)
-{
- this.x = x;
- fakeInteriorFunction.call(this, y);
-}
-
-function fakeInteriorFunction(y)
-{
- this.y = y;
-}
-
-</script>
-</head>
-
-<body onload="startTest()">
-This page's JavaScript has a call to call() in it.
-<br>
-<br>
-To use this test, load it in the browser then load the WebInspector and look at
-the profile. In the profile there should be a call to fakeObject() with call() as
-its child and a fakeInteriorFunction() as call()'s child.
-<div id="output"></div>
-</body>
-</html>
</del></span></pre></div>
<a id="trunkManualTestsinspectorprofilertestmanycallsinthesamescopehtml"></a>
<div class="delfile"><h4>Deleted: trunk/ManualTests/inspector/profiler-test-many-calls-in-the-same-scope.html (201236 => 201237)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/ManualTests/inspector/profiler-test-many-calls-in-the-same-scope.html 2016-05-21 01:17:42 UTC (rev 201236)
+++ trunk/ManualTests/inspector/profiler-test-many-calls-in-the-same-scope.html 2016-05-21 02:00:42 UTC (rev 201237)
</span><span class="lines">@@ -1,42 +0,0 @@
</span><del>-<html>
-<head>
-<script src="resources/profiler-test-JS-resources.js"></script>
-<script>
-console.profile("Many Calls In The Same Scope");
-function startTest()
-{
- insertNewText();
- insertGivenText("This was a triumph.");
- arrayOperatorFunction(7);
- intermediaryFunction();
- anonymousFunction();
- end()
- endT();
- endT();
- endTest();
-}
-
-function end()
-{
- var x = 0;
-}
-
-function endT()
-{
- var y = 1;
-}
-
-</script>
-</head>
-
-<body onload="startTest()">
-This page's JavaScript has many function calls in the same scope.
-<br>
-<br>
-To use this test, load it in the browser then load the WebInspector and look at
-the profile. In the profile many functions should be the children of startTest.
-Use the sorting capabilites to make sure the similarly named functions are sorted
-correctly.
-<div id="output"></div>
-</body>
-</html>
</del><span class="cx">\ No newline at end of file
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/ChangeLog (201236 => 201237)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/ChangeLog 2016-05-21 01:17:42 UTC (rev 201236)
+++ trunk/Source/JavaScriptCore/ChangeLog 2016-05-21 02:00:42 UTC (rev 201237)
</span><span class="lines">@@ -1,3 +1,17 @@
</span><ins>+2016-05-20 Joseph Pecoraro <pecoraro@apple.com>
+
+ Remove LegacyProfiler
+ https://bugs.webkit.org/show_bug.cgi?id=153565
+
+ Reviewed by Saam Barati.
+
+ * inspector/protocol/Timeline.json:
+ * jsc.cpp:
+ * runtime/JSGlobalObject.cpp:
+ (JSC::JSGlobalObject::hasLegacyProfiler):
+ * runtime/JSGlobalObject.h:
+ (JSC::JSGlobalObject::supportsLegacyProfiling): Deleted.
+
</ins><span class="cx"> 2016-05-20 Saam barati <sbarati@apple.com>
</span><span class="cx">
</span><span class="cx"> JSScope::abstractAccess doesn't need to copy the SymbolTableEntry, it can use it by reference
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreinspectorprotocolTimelinejson"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/inspector/protocol/Timeline.json (201236 => 201237)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/inspector/protocol/Timeline.json 2016-05-21 01:17:42 UTC (rev 201236)
+++ trunk/Source/JavaScriptCore/inspector/protocol/Timeline.json 2016-05-21 02:00:42 UTC (rev 201237)
</span><span class="lines">@@ -51,40 +51,6 @@
</span><span class="cx"> { "name": "data", "type": "object", "description": "Event data." },
</span><span class="cx"> { "name": "children", "type": "array", "optional": true, "items": { "$ref": "TimelineEvent" }, "description": "Nested records." }
</span><span class="cx"> ]
</span><del>- },
- {
- "id": "CPUProfileNodeAggregateCallInfo",
- "type": "object",
- "description": "Aggregate CPU Profile call info. Holds time information for all the calls that happened on a node.",
- "properties": [
- { "name": "callCount", "type": "number", "description": "Total number of calls." },
- { "name": "startTime", "type": "number", "description": "Start time for the first call." },
- { "name": "endTime", "type": "number", "description": "End time for the last call." },
- { "name": "totalTime", "type": "number", "description": "Total execution time for all calls combined." }
- ]
- },
- {
- "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": "callInfo", "$ref": "CPUProfileNodeAggregateCallInfo", "description": "Aggregate info about all the calls that 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 }
- ]
</del><span class="cx"> }
</span><span class="cx"> ],
</span><span class="cx"> "commands": [
</span></span></pre></div>
<a id="trunkSourceJavaScriptCorejsccpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/jsc.cpp (201236 => 201237)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/jsc.cpp 2016-05-21 01:17:42 UTC (rev 201236)
+++ trunk/Source/JavaScriptCore/jsc.cpp 2016-05-21 02:00:42 UTC (rev 201237)
</span><span class="lines">@@ -868,7 +868,7 @@
</span><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> const ClassInfo GlobalObject::s_info = { "global", &JSGlobalObject::s_info, nullptr, CREATE_METHOD_TABLE(GlobalObject) };
</span><del>-const GlobalObjectMethodTable GlobalObject::s_globalObjectMethodTable = { &allowsAccessFrom, &supportsLegacyProfiling, &supportsRichSourceInfo, &shouldInterruptScript, &javaScriptRuntimeFlags, 0, &shouldInterruptScriptBeforeTimeout, &moduleLoaderResolve, &moduleLoaderFetch, nullptr, nullptr, nullptr, nullptr };
</del><ins>+const GlobalObjectMethodTable GlobalObject::s_globalObjectMethodTable = { &allowsAccessFrom, &supportsRichSourceInfo, &shouldInterruptScript, &javaScriptRuntimeFlags, 0, &shouldInterruptScriptBeforeTimeout, &moduleLoaderResolve, &moduleLoaderFetch, nullptr, nullptr, nullptr, nullptr };
</ins><span class="cx">
</span><span class="cx">
</span><span class="cx"> GlobalObject::GlobalObject(VM& vm, Structure* structure)
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreruntimeJSGlobalObjectcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/runtime/JSGlobalObject.cpp (201236 => 201237)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/runtime/JSGlobalObject.cpp 2016-05-21 01:17:42 UTC (rev 201236)
+++ trunk/Source/JavaScriptCore/runtime/JSGlobalObject.cpp 2016-05-21 02:00:42 UTC (rev 201237)
</span><span class="lines">@@ -208,7 +208,7 @@
</span><span class="cx">
</span><span class="cx"> const ClassInfo JSGlobalObject::s_info = { "GlobalObject", &Base::s_info, &globalObjectTable, CREATE_METHOD_TABLE(JSGlobalObject) };
</span><span class="cx">
</span><del>-const GlobalObjectMethodTable JSGlobalObject::s_globalObjectMethodTable = { &allowsAccessFrom, &supportsLegacyProfiling, &supportsRichSourceInfo, &shouldInterruptScript, &javaScriptRuntimeFlags, nullptr, &shouldInterruptScriptBeforeTimeout, nullptr, nullptr, nullptr, nullptr, nullptr, nullptr };
</del><ins>+const GlobalObjectMethodTable JSGlobalObject::s_globalObjectMethodTable = { &allowsAccessFrom, &supportsRichSourceInfo, &shouldInterruptScript, &javaScriptRuntimeFlags, nullptr, &shouldInterruptScriptBeforeTimeout, nullptr, nullptr, nullptr, nullptr, nullptr, nullptr };
</ins><span class="cx">
</span><span class="cx"> /* Source for JSGlobalObject.lut.h
</span><span class="cx"> @begin globalObjectTable
</span><span class="lines">@@ -833,7 +833,8 @@
</span><span class="cx">
</span><span class="cx"> bool JSGlobalObject::hasLegacyProfiler() const
</span><span class="cx"> {
</span><del>- return globalObjectMethodTable()->supportsLegacyProfiling(this);
</del><ins>+ // FIXME: Remove Legacy Profiler from JavaScriptCore.
+ return false;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> bool JSGlobalObject::put(JSCell* cell, ExecState* exec, PropertyName propertyName, JSValue value, PutPropertySlot& slot)
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreruntimeJSGlobalObjecth"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/runtime/JSGlobalObject.h (201236 => 201237)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/runtime/JSGlobalObject.h 2016-05-21 01:17:42 UTC (rev 201236)
+++ trunk/Source/JavaScriptCore/runtime/JSGlobalObject.h 2016-05-21 02:00:42 UTC (rev 201237)
</span><span class="lines">@@ -151,9 +151,6 @@
</span><span class="cx"> typedef bool (*AllowsAccessFromFunctionPtr)(const JSGlobalObject*, ExecState*);
</span><span class="cx"> AllowsAccessFromFunctionPtr allowsAccessFrom;
</span><span class="cx">
</span><del>- typedef bool (*SupportsLegacyProfilingFunctionPtr)(const JSGlobalObject*);
- SupportsLegacyProfilingFunctionPtr supportsLegacyProfiling;
-
</del><span class="cx"> typedef bool (*SupportsRichSourceInfoFunctionPtr)(const JSGlobalObject*);
</span><span class="cx"> SupportsRichSourceInfoFunctionPtr supportsRichSourceInfo;
</span><span class="cx">
</span><span class="lines">@@ -717,7 +714,6 @@
</span><span class="cx"> const GlobalObjectMethodTable* globalObjectMethodTable() const { return m_globalObjectMethodTable; }
</span><span class="cx">
</span><span class="cx"> static bool allowsAccessFrom(const JSGlobalObject*, ExecState*) { return true; }
</span><del>- static bool supportsLegacyProfiling(const JSGlobalObject*) { return false; }
</del><span class="cx"> static bool supportsRichSourceInfo(const JSGlobalObject*) { return true; }
</span><span class="cx">
</span><span class="cx"> JS_EXPORT_PRIVATE ExecState* globalExec();
</span></span></pre></div>
<a id="trunkSourceWebCoreCMakeListstxt"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/CMakeLists.txt (201236 => 201237)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/CMakeLists.txt 2016-05-21 01:17:42 UTC (rev 201236)
+++ trunk/Source/WebCore/CMakeLists.txt 2016-05-21 02:00:42 UTC (rev 201237)
</span><span class="lines">@@ -590,8 +590,6 @@
</span><span class="cx">
</span><span class="cx"> inspector/CommandLineAPIHost.idl
</span><span class="cx"> inspector/InspectorFrontendHost.idl
</span><del>- inspector/ScriptProfile.idl
- inspector/ScriptProfileNode.idl
</del><span class="cx">
</span><span class="cx"> loader/appcache/DOMApplicationCache.idl
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (201236 => 201237)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2016-05-21 01:17:42 UTC (rev 201236)
+++ trunk/Source/WebCore/ChangeLog 2016-05-21 02:00:42 UTC (rev 201237)
</span><span class="lines">@@ -1,3 +1,80 @@
</span><ins>+2016-05-20 Joseph Pecoraro <pecoraro@apple.com>
+
+ Remove LegacyProfiler
+ https://bugs.webkit.org/show_bug.cgi?id=153565
+
+ Reviewed by Saam Barati.
+
+ JavaScriptCore now provides a sampling profiler and it is enabled
+ by all ports. Web Inspector switched months ago to using the
+ sampling profiler and displaying its data. Remove the legacy
+ profiler, as it is no longer being used by anything other then
+ console.profile and tests. We will update console.profile's
+ behavior soon to have new behavior and use the sampling data.
+
+ * CMakeLists.txt:
+ * DerivedSources.cpp:
+ * DerivedSources.make:
+ * ForwardingHeaders/profiler/LegacyProfiler.h: Removed.
+ * WebCore.xcodeproj/project.pbxproj:
+ * bindings/js/JSCustomXPathNSResolver.cpp:
+ * bindings/js/JSDOMWindowBase.cpp:
+ (WebCore::JSDOMWindowBase::supportsLegacyProfiling): Deleted.
+ (WebCore::JSDOMWindowBase::supportsRichSourceInfo): Deleted.
+ * bindings/js/JSDOMWindowBase.h:
+ * bindings/js/JSWorkerGlobalScopeBase.cpp:
+ (WebCore::JSWorkerGlobalScopeBase::supportsLegacyProfiling): Deleted.
+ * bindings/js/JSWorkerGlobalScopeBase.h:
+ * bindings/js/ScriptCachedFrameData.cpp:
+ * bindings/js/ScriptController.cpp:
+ (WebCore::ScriptController::clearWindowShell): Deleted.
+ * bindings/js/ScriptProfile.h: Removed.
+ * bindings/js/ScriptProfileNode.h: Removed.
+ * bindings/scripts/CodeGeneratorJS.pm:
+ (AddClassForwardIfNeeded): Deleted.
+ * bindings/scripts/test/JS/JSTestObj.cpp:
+ (WebCore::jsTestObjPrototypeFunctionMethodWithSequenceArg): Deleted.
+ (WebCore::jsTestObjPrototypeFunctionMethodReturningSequence): Deleted.
+ * bindings/scripts/test/TestObj.idl:
+ * css/CSSParser.cpp:
+ * dom/Document.cpp:
+ * inspector/InspectorConsoleInstrumentation.h:
+ (WebCore::InspectorInstrumentation::stopProfiling):
+ * inspector/InspectorController.cpp:
+ (WebCore::InspectorController::InspectorController):
+ (WebCore::InspectorController::legacyProfilerEnabled): Deleted.
+ (WebCore::InspectorController::setLegacyProfilerEnabled): Deleted.
+ * inspector/InspectorController.h:
+ * inspector/InspectorInstrumentation.cpp:
+ (WebCore::InspectorInstrumentation::stopProfilingImpl):
+ * inspector/InspectorInstrumentation.h:
+ * inspector/InspectorTimelineAgent.cpp:
+ (WebCore::InspectorTimelineAgent::startFromConsole):
+ (WebCore::InspectorTimelineAgent::stopFromConsole):
+ * inspector/InspectorTimelineAgent.h:
+ * inspector/PageDebuggerAgent.cpp:
+ * inspector/PageRuntimeAgent.cpp:
+ * inspector/ScriptProfile.idl: Removed.
+ * inspector/ScriptProfileNode.idl: Removed.
+ * inspector/TimelineRecordFactory.cpp:
+ (WebCore::buildAggregateCallInfoInspectorObject): Deleted.
+ (WebCore::buildInspectorObject): Deleted.
+ (WebCore::buildProfileInspectorObject): Deleted.
+ (WebCore::TimelineRecordFactory::appendProfile): Deleted.
+ * inspector/TimelineRecordFactory.h:
+ * page/DOMWindow.cpp:
+ * page/Page.cpp:
+ * page/PageConsoleClient.cpp:
+ (WebCore::PageConsoleClient::profileEnd):
+ (WebCore::PageConsoleClient::clearProfiles): Deleted.
+ * page/PageConsoleClient.h:
+ * testing/Internals.cpp:
+ (WebCore::Internals::resetToConsistentState): Deleted.
+ (WebCore::Internals::consoleProfiles): Deleted.
+ (WebCore::Internals::setLegacyJavaScriptProfilingEnabled): Deleted.
+ * testing/Internals.h:
+ * testing/Internals.idl:
+
</ins><span class="cx"> 2016-05-20 Zalan Bujtas <zalan@apple.com>
</span><span class="cx">
</span><span class="cx"> `width: 1%` on nested table cell causes its table to hog horizontal space
</span></span></pre></div>
<a id="trunkSourceWebCoreDerivedSourcescpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/DerivedSources.cpp (201236 => 201237)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/DerivedSources.cpp 2016-05-21 01:17:42 UTC (rev 201236)
+++ trunk/Source/WebCore/DerivedSources.cpp 2016-05-21 02:00:42 UTC (rev 201237)
</span><span class="lines">@@ -421,8 +421,6 @@
</span><span class="cx"> #include "JSRTCTrackEvent.cpp"
</span><span class="cx"> #include "JSScreen.cpp"
</span><span class="cx"> #include "JSScriptProcessorNode.cpp"
</span><del>-#include "JSScriptProfile.cpp"
-#include "JSScriptProfileNode.cpp"
</del><span class="cx"> #if ENABLE(CSP_NEXT)
</span><span class="cx"> #include "JSSecurityPolicyViolationEvent.cpp"
</span><span class="cx"> #endif
</span></span></pre></div>
<a id="trunkSourceWebCoreDerivedSourcesmake"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/DerivedSources.make (201236 => 201237)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/DerivedSources.make 2016-05-21 01:17:42 UTC (rev 201236)
+++ trunk/Source/WebCore/DerivedSources.make 2016-05-21 02:00:42 UTC (rev 201237)
</span><span class="lines">@@ -504,8 +504,6 @@
</span><span class="cx"> $(WebCore)/html/track/VTTCue.idl \
</span><span class="cx"> $(WebCore)/inspector/CommandLineAPIHost.idl \
</span><span class="cx"> $(WebCore)/inspector/InspectorFrontendHost.idl \
</span><del>- $(WebCore)/inspector/ScriptProfile.idl \
- $(WebCore)/inspector/ScriptProfileNode.idl \
</del><span class="cx"> $(WebCore)/loader/appcache/DOMApplicationCache.idl \
</span><span class="cx"> $(WebCore)/page/AbstractView.idl \
</span><span class="cx"> $(WebCore)/page/BarProp.idl \
</span></span></pre></div>
<a id="trunkSourceWebCoreForwardingHeadersprofilerLegacyProfilerh"></a>
<div class="delfile"><h4>Deleted: trunk/Source/WebCore/ForwardingHeaders/profiler/LegacyProfiler.h (201236 => 201237)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ForwardingHeaders/profiler/LegacyProfiler.h 2016-05-21 01:17:42 UTC (rev 201236)
+++ trunk/Source/WebCore/ForwardingHeaders/profiler/LegacyProfiler.h 2016-05-21 02:00:42 UTC (rev 201237)
</span><span class="lines">@@ -1,5 +0,0 @@
</span><del>-#ifndef WebCore_FWD_LegacyProfiler_h
-#define WebCore_FWD_LegacyProfiler_h
-#include <JavaScriptCore/LegacyProfiler.h>
-#endif
-
</del></span></pre></div>
<a id="trunkSourceWebCoreWebCorexcodeprojprojectpbxproj"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj (201236 => 201237)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj 2016-05-21 01:17:42 UTC (rev 201236)
+++ trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj 2016-05-21 02:00:42 UTC (rev 201237)
</span><span class="lines">@@ -4051,12 +4051,6 @@
</span><span class="cx"> 9DAC7C541AF2CAA100437C44 /* CSSContentDistributionValue.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 9DAC7C521AF2CAA100437C44 /* CSSContentDistributionValue.cpp */; };
</span><span class="cx"> 9DAC7C551AF2CAA200437C44 /* CSSContentDistributionValue.h in Headers */ = {isa = PBXBuildFile; fileRef = 9DAC7C531AF2CAA100437C44 /* CSSContentDistributionValue.h */; };
</span><span class="cx"> 9DAC7C571AF2CB6400437C44 /* StyleContentAlignmentData.h in Headers */ = {isa = PBXBuildFile; fileRef = 9DAC7C561AF2CB6400437C44 /* StyleContentAlignmentData.h */; settings = {ATTRIBUTES = (Private, ); }; };
</span><del>- 9F72304F11184B4100AD0126 /* ScriptProfile.h in Headers */ = {isa = PBXBuildFile; fileRef = 9F72304C11184B4100AD0126 /* ScriptProfile.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 */; };
- 9FA37EFB1172FDA600C4CD55 /* JSScriptProfile.h in Headers */ = {isa = PBXBuildFile; fileRef = 9FA37EF71172FD9300C4CD55 /* JSScriptProfile.h */; };
- 9FA37EFC1172FDA600C4CD55 /* JSScriptProfileNode.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 9FA37EF81172FD9300C4CD55 /* JSScriptProfileNode.cpp */; };
- 9FA37EFD1172FDA600C4CD55 /* JSScriptProfileNode.h in Headers */ = {isa = PBXBuildFile; fileRef = 9FA37EF91172FD9300C4CD55 /* JSScriptProfileNode.h */; };
</del><span class="cx"> A07D3355152B630E001B6393 /* JSWebGLShaderPrecisionFormat.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A07D3353152B630E001B6393 /* JSWebGLShaderPrecisionFormat.cpp */; };
</span><span class="cx"> A07D3356152B630E001B6393 /* JSWebGLShaderPrecisionFormat.h in Headers */ = {isa = PBXBuildFile; fileRef = A07D3354152B630E001B6393 /* JSWebGLShaderPrecisionFormat.h */; };
</span><span class="cx"> A07D3358152B632D001B6393 /* WebGLShaderPrecisionFormat.h in Headers */ = {isa = PBXBuildFile; fileRef = A07D3357152B632D001B6393 /* WebGLShaderPrecisionFormat.h */; };
</span><span class="lines">@@ -11767,14 +11761,6 @@
</span><span class="cx"> 9DAC7C521AF2CAA100437C44 /* CSSContentDistributionValue.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = CSSContentDistributionValue.cpp; sourceTree = "<group>"; };
</span><span class="cx"> 9DAC7C531AF2CAA100437C44 /* CSSContentDistributionValue.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CSSContentDistributionValue.h; sourceTree = "<group>"; };
</span><span class="cx"> 9DAC7C561AF2CB6400437C44 /* StyleContentAlignmentData.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = StyleContentAlignmentData.h; sourceTree = "<group>"; };
</span><del>- 9F72304C11184B4100AD0126 /* ScriptProfile.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ScriptProfile.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>"; };
- 9FA37EF01172FD4100C4CD55 /* ScriptProfileNode.idl */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = ScriptProfileNode.idl; sourceTree = "<group>"; };
- 9FA37EF61172FD9300C4CD55 /* JSScriptProfile.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = JSScriptProfile.cpp; sourceTree = "<group>"; };
- 9FA37EF71172FD9300C4CD55 /* JSScriptProfile.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = JSScriptProfile.h; sourceTree = "<group>"; };
- 9FA37EF81172FD9300C4CD55 /* JSScriptProfileNode.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = JSScriptProfileNode.cpp; sourceTree = "<group>"; };
- 9FA37EF91172FD9300C4CD55 /* JSScriptProfileNode.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = JSScriptProfileNode.h; sourceTree = "<group>"; };
</del><span class="cx"> A07D3353152B630E001B6393 /* JSWebGLShaderPrecisionFormat.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = JSWebGLShaderPrecisionFormat.cpp; sourceTree = "<group>"; };
</span><span class="cx"> A07D3354152B630E001B6393 /* JSWebGLShaderPrecisionFormat.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = JSWebGLShaderPrecisionFormat.h; sourceTree = "<group>"; };
</span><span class="cx"> A07D3357152B632D001B6393 /* WebGLShaderPrecisionFormat.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WebGLShaderPrecisionFormat.h; sourceTree = "<group>"; };
</span><span class="lines">@@ -16282,10 +16268,6 @@
</span><span class="cx"> A584FE3A1864E2D800843B10 /* JSCommandLineAPIHost.h */,
</span><span class="cx"> 7A0E771C10C00DB100A0276E /* JSInspectorFrontendHost.cpp */,
</span><span class="cx"> 7A0E771D10C00DB100A0276E /* JSInspectorFrontendHost.h */,
</span><del>- 9FA37EF61172FD9300C4CD55 /* JSScriptProfile.cpp */,
- 9FA37EF71172FD9300C4CD55 /* JSScriptProfile.h */,
- 9FA37EF81172FD9300C4CD55 /* JSScriptProfileNode.cpp */,
- 9FA37EF91172FD9300C4CD55 /* JSScriptProfileNode.h */,
</del><span class="cx"> );
</span><span class="cx"> name = Inspector;
</span><span class="cx"> sourceTree = "<group>";
</span><span class="lines">@@ -16370,8 +16352,6 @@
</span><span class="cx"> F382088D147D35F90010BC06 /* PageRuntimeAgent.h */,
</span><span class="cx"> A5F36D3818F758720054C024 /* PageScriptDebugServer.cpp */,
</span><span class="cx"> A5F36D3918F758720054C024 /* PageScriptDebugServer.h */,
</span><del>- 9FA37EEF1172FD4100C4CD55 /* ScriptProfile.idl */,
- 9FA37EF01172FD4100C4CD55 /* ScriptProfileNode.idl */,
</del><span class="cx"> 7553CFE7108F473F00EA281E /* TimelineRecordFactory.cpp */,
</span><span class="cx"> 7553CFE6108F473F00EA281E /* TimelineRecordFactory.h */,
</span><span class="cx"> A56C5B98189F34570082D13C /* WebConsoleAgent.cpp */,
</span><span class="lines">@@ -22356,8 +22336,6 @@
</span><span class="cx"> A83E1C720E49042B00140B9C /* ScriptControllerMac.mm */,
</span><span class="cx"> 41F066E30F64BCF600A07EAC /* ScriptGlobalObject.cpp */,
</span><span class="cx"> 41F066E20F64BCF600A07EAC /* ScriptGlobalObject.h */,
</span><del>- 9F72304C11184B4100AD0126 /* ScriptProfile.h */,
- 9FA37EE31172FC8000C4CD55 /* ScriptProfileNode.h */,
</del><span class="cx"> 934CC1090EDB223900A658F2 /* ScriptSourceCode.h */,
</span><span class="cx"> 4127D5360F8AAB1D00E424F5 /* ScriptState.cpp */,
</span><span class="cx"> 41C760B00EDE03D300C1655F /* ScriptState.h */,
</span><span class="lines">@@ -26834,8 +26812,6 @@
</span><span class="cx"> 5E2C436C1BCF071E0001E2BC /* JSRTCTrackEvent.h in Headers */,
</span><span class="cx"> BCEC01C30C274DDD009F4EC9 /* JSScreen.h in Headers */,
</span><span class="cx"> FDA15ECE12B03F61003A583A /* JSScriptProcessorNode.h in Headers */,
</span><del>- 9FA37EFB1172FDA600C4CD55 /* JSScriptProfile.h in Headers */,
- 9FA37EFD1172FDA600C4CD55 /* JSScriptProfileNode.h in Headers */,
</del><span class="cx"> CED06AD11C77754800FDFAF1 /* JSSecurityPolicyViolationEvent.h in Headers */,
</span><span class="cx"> 9BDA64D81B975CF2009C4387 /* JSShadowRoot.h in Headers */,
</span><span class="cx"> CD9DE17B17AAC75B00EA386D /* JSSourceBuffer.h in Headers */,
</span><span class="lines">@@ -27826,8 +27802,6 @@
</span><span class="cx"> E11C9D9B0EB3681200E409DB /* ScriptExecutionContext.h in Headers */,
</span><span class="cx"> 41F066E40F64BCF600A07EAC /* ScriptGlobalObject.h in Headers */,
</span><span class="cx"> FD31603612B0267600C1A359 /* ScriptProcessorNode.h in Headers */,
</span><del>- 9F72304F11184B4100AD0126 /* ScriptProfile.h in Headers */,
- 9FA37EE41172FC8000C4CD55 /* ScriptProfileNode.h in Headers */,
</del><span class="cx"> 8A413AE01207BBA50082016E /* ScriptRunner.h in Headers */,
</span><span class="cx"> 934CC10A0EDB223900A658F2 /* ScriptSourceCode.h in Headers */,
</span><span class="cx"> 41C760B10EDE03D300C1655F /* ScriptState.h in Headers */,
</span><span class="lines">@@ -30600,8 +30574,6 @@
</span><span class="cx"> 5E2C436B1BCF071E0001E2BC /* JSRTCTrackEvent.cpp in Sources */,
</span><span class="cx"> BCEC01C20C274DDD009F4EC9 /* JSScreen.cpp in Sources */,
</span><span class="cx"> FDA15ECD12B03F61003A583A /* JSScriptProcessorNode.cpp in Sources */,
</span><del>- 9FA37EFA1172FDA600C4CD55 /* JSScriptProfile.cpp in Sources */,
- 9FA37EFC1172FDA600C4CD55 /* JSScriptProfileNode.cpp in Sources */,
</del><span class="cx"> CED06AD01C77754800FDFAF1 /* JSSecurityPolicyViolationEvent.cpp in Sources */,
</span><span class="cx"> 9BDA64D71B975CE5009C4387 /* JSShadowRoot.cpp in Sources */,
</span><span class="cx"> CD9DE17A17AAC75B00EA386D /* JSSourceBuffer.cpp in Sources */,
</span></span></pre></div>
<a id="trunkSourceWebCorebindingsjsJSCustomXPathNSResolvercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/bindings/js/JSCustomXPathNSResolver.cpp (201236 => 201237)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/bindings/js/JSCustomXPathNSResolver.cpp 2016-05-21 01:17:42 UTC (rev 201236)
+++ trunk/Source/WebCore/bindings/js/JSCustomXPathNSResolver.cpp 2016-05-21 02:00:42 UTC (rev 201237)
</span><span class="lines">@@ -34,7 +34,6 @@
</span><span class="cx"> #include "Page.h"
</span><span class="cx"> #include "PageConsoleClient.h"
</span><span class="cx"> #include "SecurityOrigin.h"
</span><del>-#include <profiler/Profile.h>
</del><span class="cx"> #include <runtime/JSLock.h>
</span><span class="cx"> #include <wtf/Ref.h>
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCorebindingsjsJSDOMWindowBasecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/bindings/js/JSDOMWindowBase.cpp (201236 => 201237)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/bindings/js/JSDOMWindowBase.cpp 2016-05-21 01:17:42 UTC (rev 201236)
+++ trunk/Source/WebCore/bindings/js/JSDOMWindowBase.cpp 2016-05-21 02:00:42 UTC (rev 201237)
</span><span class="lines">@@ -64,7 +64,7 @@
</span><span class="cx">
</span><span class="cx"> const ClassInfo JSDOMWindowBase::s_info = { "Window", &JSDOMGlobalObject::s_info, 0, CREATE_METHOD_TABLE(JSDOMWindowBase) };
</span><span class="cx">
</span><del>-const GlobalObjectMethodTable JSDOMWindowBase::s_globalObjectMethodTable = { &shouldAllowAccessFrom, &supportsLegacyProfiling, &supportsRichSourceInfo, &shouldInterruptScript, &javaScriptRuntimeFlags, &queueTaskToEventLoop, &shouldInterruptScriptBeforeTimeout, &moduleLoaderResolve, &moduleLoaderFetch, nullptr, nullptr, &moduleLoaderEvaluate, &defaultLanguage };
</del><ins>+const GlobalObjectMethodTable JSDOMWindowBase::s_globalObjectMethodTable = { &shouldAllowAccessFrom, &supportsRichSourceInfo, &shouldInterruptScript, &javaScriptRuntimeFlags, &queueTaskToEventLoop, &shouldInterruptScriptBeforeTimeout, &moduleLoaderResolve, &moduleLoaderFetch, nullptr, nullptr, &moduleLoaderEvaluate, &defaultLanguage };
</ins><span class="cx">
</span><span class="cx"> JSDOMWindowBase::JSDOMWindowBase(VM& vm, Structure* structure, PassRefPtr<DOMWindow> window, JSDOMWindowShell* shell)
</span><span class="cx"> : JSDOMGlobalObject(vm, structure, &shell->world(), &s_globalObjectMethodTable)
</span><span class="lines">@@ -125,20 +125,6 @@
</span><span class="cx"> printErrorMessageForFrame(wrapped().frame(), message);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-bool JSDOMWindowBase::supportsLegacyProfiling(const JSGlobalObject* object)
-{
- const JSDOMWindowBase* thisObject = static_cast<const JSDOMWindowBase*>(object);
- Frame* frame = thisObject->wrapped().frame();
- if (!frame)
- return false;
-
- Page* page = frame->page();
- if (!page)
- return false;
-
- return page->inspectorController().legacyProfilerEnabled();
-}
-
</del><span class="cx"> bool JSDOMWindowBase::supportsRichSourceInfo(const JSGlobalObject* object)
</span><span class="cx"> {
</span><span class="cx"> const JSDOMWindowBase* thisObject = static_cast<const JSDOMWindowBase*>(object);
</span><span class="lines">@@ -152,7 +138,6 @@
</span><span class="cx">
</span><span class="cx"> bool enabled = page->inspectorController().enabled();
</span><span class="cx"> ASSERT(enabled || !thisObject->debugger());
</span><del>- ASSERT(enabled || !supportsLegacyProfiling(thisObject));
</del><span class="cx"> return enabled;
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCorebindingsjsJSDOMWindowBaseh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/bindings/js/JSDOMWindowBase.h (201236 => 201237)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/bindings/js/JSDOMWindowBase.h 2016-05-21 01:17:42 UTC (rev 201236)
+++ trunk/Source/WebCore/bindings/js/JSDOMWindowBase.h 2016-05-21 02:00:42 UTC (rev 201237)
</span><span class="lines">@@ -60,7 +60,6 @@
</span><span class="cx">
</span><span class="cx"> static const JSC::GlobalObjectMethodTable s_globalObjectMethodTable;
</span><span class="cx">
</span><del>- static bool supportsLegacyProfiling(const JSC::JSGlobalObject*);
</del><span class="cx"> static bool supportsRichSourceInfo(const JSC::JSGlobalObject*);
</span><span class="cx"> static bool shouldInterruptScript(const JSC::JSGlobalObject*);
</span><span class="cx"> static bool shouldInterruptScriptBeforeTimeout(const JSC::JSGlobalObject*);
</span></span></pre></div>
<a id="trunkSourceWebCorebindingsjsJSWorkerGlobalScopeBasecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/bindings/js/JSWorkerGlobalScopeBase.cpp (201236 => 201237)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/bindings/js/JSWorkerGlobalScopeBase.cpp 2016-05-21 01:17:42 UTC (rev 201236)
+++ trunk/Source/WebCore/bindings/js/JSWorkerGlobalScopeBase.cpp 2016-05-21 02:00:42 UTC (rev 201237)
</span><span class="lines">@@ -44,7 +44,7 @@
</span><span class="cx">
</span><span class="cx"> const ClassInfo JSWorkerGlobalScopeBase::s_info = { "WorkerGlobalScope", &JSDOMGlobalObject::s_info, 0, CREATE_METHOD_TABLE(JSWorkerGlobalScopeBase) };
</span><span class="cx">
</span><del>-const GlobalObjectMethodTable JSWorkerGlobalScopeBase::s_globalObjectMethodTable = { &allowsAccessFrom, &supportsLegacyProfiling, &supportsRichSourceInfo, &shouldInterruptScript, &javaScriptRuntimeFlags, &queueTaskToEventLoop, &shouldInterruptScriptBeforeTimeout, nullptr, nullptr, nullptr, nullptr, nullptr, &defaultLanguage };
</del><ins>+const GlobalObjectMethodTable JSWorkerGlobalScopeBase::s_globalObjectMethodTable = { &allowsAccessFrom, &supportsRichSourceInfo, &shouldInterruptScript, &javaScriptRuntimeFlags, &queueTaskToEventLoop, &shouldInterruptScriptBeforeTimeout, nullptr, nullptr, nullptr, nullptr, nullptr, &defaultLanguage };
</ins><span class="cx">
</span><span class="cx"> JSWorkerGlobalScopeBase::JSWorkerGlobalScopeBase(JSC::VM& vm, JSC::Structure* structure, PassRefPtr<WorkerGlobalScope> impl)
</span><span class="cx"> : JSDOMGlobalObject(vm, structure, &normalWorld(vm), &s_globalObjectMethodTable)
</span><span class="lines">@@ -73,11 +73,6 @@
</span><span class="cx"> return JSGlobalObject::allowsAccessFrom(object, exec);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-bool JSWorkerGlobalScopeBase::supportsLegacyProfiling(const JSGlobalObject* object)
-{
- return JSGlobalObject::supportsLegacyProfiling(object);
-}
-
</del><span class="cx"> bool JSWorkerGlobalScopeBase::supportsRichSourceInfo(const JSGlobalObject* object)
</span><span class="cx"> {
</span><span class="cx"> return JSGlobalObject::supportsRichSourceInfo(object);
</span></span></pre></div>
<a id="trunkSourceWebCorebindingsjsJSWorkerGlobalScopeBaseh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/bindings/js/JSWorkerGlobalScopeBase.h (201236 => 201237)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/bindings/js/JSWorkerGlobalScopeBase.h 2016-05-21 01:17:42 UTC (rev 201236)
+++ trunk/Source/WebCore/bindings/js/JSWorkerGlobalScopeBase.h 2016-05-21 02:00:42 UTC (rev 201237)
</span><span class="lines">@@ -53,7 +53,6 @@
</span><span class="cx"> static const JSC::GlobalObjectMethodTable s_globalObjectMethodTable;
</span><span class="cx">
</span><span class="cx"> static bool allowsAccessFrom(const JSC::JSGlobalObject*, JSC::ExecState*);
</span><del>- static bool supportsLegacyProfiling(const JSC::JSGlobalObject*);
</del><span class="cx"> static bool supportsRichSourceInfo(const JSC::JSGlobalObject*);
</span><span class="cx"> static bool shouldInterruptScript(const JSC::JSGlobalObject*);
</span><span class="cx"> static bool shouldInterruptScriptBeforeTimeout(const JSC::JSGlobalObject*);
</span></span></pre></div>
<a id="trunkSourceWebCorebindingsjsScriptCachedFrameDatacpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/bindings/js/ScriptCachedFrameData.cpp (201236 => 201237)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/bindings/js/ScriptCachedFrameData.cpp 2016-05-21 01:17:42 UTC (rev 201236)
+++ trunk/Source/WebCore/bindings/js/ScriptCachedFrameData.cpp 2016-05-21 02:00:42 UTC (rev 201237)
</span><span class="lines">@@ -40,7 +40,6 @@
</span><span class="cx"> #include "PageGroup.h"
</span><span class="cx"> #include "ScriptController.h"
</span><span class="cx"> #include <heap/StrongInlines.h>
</span><del>-#include <profiler/Profile.h>
</del><span class="cx"> #include <runtime/JSLock.h>
</span><span class="cx"> #include <runtime/WeakGCMapInlines.h>
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCorebindingsjsScriptControllercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/bindings/js/ScriptController.cpp (201236 => 201237)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/bindings/js/ScriptController.cpp 2016-05-21 01:17:42 UTC (rev 201236)
+++ trunk/Source/WebCore/bindings/js/ScriptController.cpp 2016-05-21 02:00:42 UTC (rev 201237)
</span><span class="lines">@@ -52,7 +52,6 @@
</span><span class="cx"> #include <debugger/Debugger.h>
</span><span class="cx"> #include <heap/StrongInlines.h>
</span><span class="cx"> #include <inspector/ScriptCallStack.h>
</span><del>-#include <profiler/Profile.h>
</del><span class="cx"> #include <runtime/InitializeThreading.h>
</span><span class="cx"> #include <runtime/JSLock.h>
</span><span class="cx"> #include <wtf/Threading.h>
</span><span class="lines">@@ -215,13 +214,6 @@
</span><span class="cx"> attachDebugger(windowShell, nullptr);
</span><span class="cx"> windowShell->window()->setConsoleClient(nullptr);
</span><span class="cx">
</span><del>- // FIXME: We should clear console profiles for each frame as soon as the frame is destroyed.
- // Instead of clearing all of them when the main frame is destroyed.
- if (m_frame.isMainFrame()) {
- if (Page* page = m_frame.page())
- page->console().clearProfiles();
- }
-
</del><span class="cx"> windowShell->window()->willRemoveFromWindowShell();
</span><span class="cx"> windowShell->setWindow(newDOMWindow);
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCorebindingsjsScriptProfileh"></a>
<div class="delfile"><h4>Deleted: trunk/Source/WebCore/bindings/js/ScriptProfile.h (201236 => 201237)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/bindings/js/ScriptProfile.h 2016-05-21 01:17:42 UTC (rev 201236)
+++ trunk/Source/WebCore/bindings/js/ScriptProfile.h 2016-05-21 02:00:42 UTC (rev 201237)
</span><span class="lines">@@ -1,38 +0,0 @@
</span><del>-/*
- * Copyright (C) 2010, 2014 Apple Inc. All rights reserved.
- * Copyright (C) 2010 Google Inc. All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- * notice, this list of conditions and the following disclaimer in the
- * documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY APPLE INC. ``AS IS'' AND ANY
- * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR
- * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
- * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
- * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
- * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
- * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-#ifndef ScriptProfile_h
-#define ScriptProfile_h
-
-#include <profiler/Profile.h>
-
-namespace WebCore {
-
-typedef JSC::Profile ScriptProfile;
-
-} // namespace WebCore
-
-#endif // ScriptProfile_h
</del></span></pre></div>
<a id="trunkSourceWebCorebindingsjsScriptProfileNodeh"></a>
<div class="delfile"><h4>Deleted: trunk/Source/WebCore/bindings/js/ScriptProfileNode.h (201236 => 201237)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/bindings/js/ScriptProfileNode.h 2016-05-21 01:17:42 UTC (rev 201236)
+++ trunk/Source/WebCore/bindings/js/ScriptProfileNode.h 2016-05-21 02:00:42 UTC (rev 201237)
</span><span class="lines">@@ -1,38 +0,0 @@
</span><del>-/*
- * Copyright (C) 2010 Apple Inc. All rights reserved.
- * Copyright (C) 2010 Google Inc. All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- * notice, this list of conditions and the following disclaimer in the
- * documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY APPLE INC. ``AS IS'' AND ANY
- * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR
- * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
- * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
- * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
- * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
- * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-#ifndef ScriptProfileNode_h
-#define ScriptProfileNode_h
-
-#include <profiler/ProfileNode.h>
-
-namespace WebCore {
-
-typedef JSC::ProfileNode ScriptProfileNode;
-
-} // namespace WebCore
-
-#endif // ScriptProfileNode_h
</del></span></pre></div>
<a id="trunkSourceWebCorebindingsscriptsCodeGeneratorJSpm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/bindings/scripts/CodeGeneratorJS.pm (201236 => 201237)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/bindings/scripts/CodeGeneratorJS.pm 2016-05-21 01:17:42 UTC (rev 201236)
+++ trunk/Source/WebCore/bindings/scripts/CodeGeneratorJS.pm 2016-05-21 02:00:42 UTC (rev 201237)
</span><span class="lines">@@ -264,12 +264,6 @@
</span><span class="cx"> {
</span><span class="cx"> my $interfaceName = shift;
</span><span class="cx">
</span><del>- if ($interfaceName eq "ScriptProfileNode") {
- $headerIncludes{"<profiler/ProfileNode.h>"} = 1;
- push(@headerContent, "typedef JSC::ProfileNode ScriptProfileNode;\n\n");
- return;
- }
-
</del><span class="cx"> # SVGAnimatedLength/Number/etc. are typedefs and should not be forward-declared as classes.
</span><span class="cx"> return if $codeGenerator->IsSVGAnimatedType($interfaceName);
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCorebindingsscriptstestJSJSTestObjcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/bindings/scripts/test/JS/JSTestObj.cpp (201236 => 201237)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/bindings/scripts/test/JS/JSTestObj.cpp 2016-05-21 01:17:42 UTC (rev 201236)
+++ trunk/Source/WebCore/bindings/scripts/test/JS/JSTestObj.cpp 2016-05-21 02:00:42 UTC (rev 201237)
</span><span class="lines">@@ -42,7 +42,6 @@
</span><span class="cx"> #include "JSNode.h"
</span><span class="cx"> #include "JSSVGDocument.h"
</span><span class="cx"> #include "JSSVGPoint.h"
</span><del>-#include "JSScriptProfile.h"
</del><span class="cx"> #include "JSTestCallback.h"
</span><span class="cx"> #include "JSTestCallbackFunction.h"
</span><span class="cx"> #include "JSTestNode.h"
</span><span class="lines">@@ -54,7 +53,6 @@
</span><span class="cx"> #include "SVGDocument.h"
</span><span class="cx"> #include "SVGPoint.h"
</span><span class="cx"> #include "SVGStaticPropertyTearOff.h"
</span><del>-#include "ScriptProfile.h"
</del><span class="cx"> #include "SerializedScriptValue.h"
</span><span class="cx"> #include "Settings.h"
</span><span class="cx"> #include "TestObj.h"
</span><span class="lines">@@ -597,8 +595,6 @@
</span><span class="cx"> JSC::EncodedJSValue JSC_HOST_CALL jsTestObjPrototypeFunctionNullableStringMethod(JSC::ExecState*);
</span><span class="cx"> JSC::EncodedJSValue JSC_HOST_CALL jsTestObjConstructorFunctionNullableStringStaticMethod(JSC::ExecState*);
</span><span class="cx"> JSC::EncodedJSValue JSC_HOST_CALL jsTestObjPrototypeFunctionNullableStringSpecialMethod(JSC::ExecState*);
</span><del>-JSC::EncodedJSValue JSC_HOST_CALL jsTestObjPrototypeFunctionMethodWithSequenceArg(JSC::ExecState*);
-JSC::EncodedJSValue JSC_HOST_CALL jsTestObjPrototypeFunctionMethodReturningSequence(JSC::ExecState*);
</del><span class="cx"> JSC::EncodedJSValue JSC_HOST_CALL jsTestObjPrototypeFunctionMethodWithEnumArg(JSC::ExecState*);
</span><span class="cx"> JSC::EncodedJSValue JSC_HOST_CALL jsTestObjPrototypeFunctionMethodWithOptionalEnumArg(JSC::ExecState*);
</span><span class="cx"> JSC::EncodedJSValue JSC_HOST_CALL jsTestObjPrototypeFunctionMethodWithOptionalEnumArgAndDefaultValue(JSC::ExecState*);
</span><span class="lines">@@ -1169,8 +1165,6 @@
</span><span class="cx"> { "methodWithXPathNSResolverParameter", JSC::Function, NoIntrinsic, { (intptr_t)static_cast<NativeFunction>(jsTestObjPrototypeFunctionMethodWithXPathNSResolverParameter), (intptr_t) (1) } },
</span><span class="cx"> { "nullableStringMethod", JSC::Function, NoIntrinsic, { (intptr_t)static_cast<NativeFunction>(jsTestObjPrototypeFunctionNullableStringMethod), (intptr_t) (0) } },
</span><span class="cx"> { "nullableStringSpecialMethod", JSC::Function, NoIntrinsic, { (intptr_t)static_cast<NativeFunction>(jsTestObjPrototypeFunctionNullableStringSpecialMethod), (intptr_t) (1) } },
</span><del>- { "methodWithSequenceArg", JSC::Function, NoIntrinsic, { (intptr_t)static_cast<NativeFunction>(jsTestObjPrototypeFunctionMethodWithSequenceArg), (intptr_t) (1) } },
- { "methodReturningSequence", JSC::Function, NoIntrinsic, { (intptr_t)static_cast<NativeFunction>(jsTestObjPrototypeFunctionMethodReturningSequence), (intptr_t) (1) } },
</del><span class="cx"> { "methodWithEnumArg", JSC::Function, NoIntrinsic, { (intptr_t)static_cast<NativeFunction>(jsTestObjPrototypeFunctionMethodWithEnumArg), (intptr_t) (1) } },
</span><span class="cx"> { "methodWithOptionalEnumArg", JSC::Function, NoIntrinsic, { (intptr_t)static_cast<NativeFunction>(jsTestObjPrototypeFunctionMethodWithOptionalEnumArg), (intptr_t) (0) } },
</span><span class="cx"> { "methodWithOptionalEnumArgAndDefaultValue", JSC::Function, NoIntrinsic, { (intptr_t)static_cast<NativeFunction>(jsTestObjPrototypeFunctionMethodWithOptionalEnumArgAndDefaultValue), (intptr_t) (0) } },
</span><span class="lines">@@ -4200,40 +4194,6 @@
</span><span class="cx"> return JSValue::encode(result);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-EncodedJSValue JSC_HOST_CALL jsTestObjPrototypeFunctionMethodWithSequenceArg(ExecState* state)
-{
- JSValue thisValue = state->thisValue();
- auto castedThis = jsDynamicCast<JSTestObj*>(thisValue);
- if (UNLIKELY(!castedThis))
- return throwThisTypeError(*state, "TestObj", "methodWithSequenceArg");
- ASSERT_GC_OBJECT_INHERITS(castedThis, JSTestObj::info());
- auto& impl = castedThis->wrapped();
- if (UNLIKELY(state->argumentCount() < 1))
- return throwVMError(state, createNotEnoughArgumentsError(state));
- auto sequenceArg = (toRefPtrNativeArray<ScriptProfile, JSScriptProfile>(state, state->argument(0), &JSScriptProfile::toWrapped));
- if (UNLIKELY(state->hadException()))
- return JSValue::encode(jsUndefined());
- impl.methodWithSequenceArg(WTFMove(sequenceArg));
- return JSValue::encode(jsUndefined());
-}
-
-EncodedJSValue JSC_HOST_CALL jsTestObjPrototypeFunctionMethodReturningSequence(ExecState* state)
-{
- JSValue thisValue = state->thisValue();
- auto castedThis = jsDynamicCast<JSTestObj*>(thisValue);
- if (UNLIKELY(!castedThis))
- return throwThisTypeError(*state, "TestObj", "methodReturningSequence");
- ASSERT_GC_OBJECT_INHERITS(castedThis, JSTestObj::info());
- auto& impl = castedThis->wrapped();
- if (UNLIKELY(state->argumentCount() < 1))
- return throwVMError(state, createNotEnoughArgumentsError(state));
- auto longArg = convert<int32_t>(*state, state->argument(0), NormalConversion);
- if (UNLIKELY(state->hadException()))
- return JSValue::encode(jsUndefined());
- JSValue result = jsArray(state, castedThis->globalObject(), impl.methodReturningSequence(WTFMove(longArg)));
- return JSValue::encode(result);
-}
-
</del><span class="cx"> EncodedJSValue JSC_HOST_CALL jsTestObjPrototypeFunctionMethodWithEnumArg(ExecState* state)
</span><span class="cx"> {
</span><span class="cx"> JSValue thisValue = state->thisValue();
</span></span></pre></div>
<a id="trunkSourceWebCorebindingsscriptstestTestObjidl"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/bindings/scripts/test/TestObj.idl (201236 => 201237)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/bindings/scripts/test/TestObj.idl 2016-05-21 01:17:42 UTC (rev 201236)
+++ trunk/Source/WebCore/bindings/scripts/test/TestObj.idl 2016-05-21 02:00:42 UTC (rev 201237)
</span><span class="lines">@@ -117,9 +117,6 @@
</span><span class="cx"> static DOMString? nullableStringStaticMethod();
</span><span class="cx"> getter DOMString? nullableStringSpecialMethod(unsigned long index);
</span><span class="cx">
</span><del>- void methodWithSequenceArg(sequence<ScriptProfile> sequenceArg);
- sequence<ScriptProfile> methodReturningSequence(long longArg);
-
</del><span class="cx"> void methodWithEnumArg(TestEnumType enumArg);
</span><span class="cx"> void methodWithOptionalEnumArg(optional TestEnumType enumArg);
</span><span class="cx"> void methodWithOptionalEnumArgAndDefaultValue(optional TestEnumType enumArg = "EnumValue1");
</span></span></pre></div>
<a id="trunkSourceWebCorecssCSSParsercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/css/CSSParser.cpp (201236 => 201237)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/css/CSSParser.cpp 2016-05-21 01:17:42 UTC (rev 201236)
+++ trunk/Source/WebCore/css/CSSParser.cpp 2016-05-21 02:00:42 UTC (rev 201237)
</span><span class="lines">@@ -100,7 +100,6 @@
</span><span class="cx"> #include "WebKitCSSFilterValue.h"
</span><span class="cx"> #include "WebKitCSSRegionRule.h"
</span><span class="cx"> #include "WebKitCSSTransformValue.h"
</span><del>-#include <JavaScriptCore/Profile.h>
</del><span class="cx"> #include <bitset>
</span><span class="cx"> #include <limits.h>
</span><span class="cx"> #include <wtf/HexNumber.h>
</span></span></pre></div>
<a id="trunkSourceWebCoredomDocumentcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/dom/Document.cpp (201236 => 201237)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/dom/Document.cpp 2016-05-21 01:17:42 UTC (rev 201236)
+++ trunk/Source/WebCore/dom/Document.cpp 2016-05-21 02:00:42 UTC (rev 201237)
</span><span class="lines">@@ -183,7 +183,6 @@
</span><span class="cx"> #include "XPathNSResolver.h"
</span><span class="cx"> #include "XPathResult.h"
</span><span class="cx"> #include "htmlediting.h"
</span><del>-#include <JavaScriptCore/Profile.h>
</del><span class="cx"> #include <ctime>
</span><span class="cx"> #include <inspector/ScriptCallStack.h>
</span><span class="cx"> #include <wtf/CurrentTime.h>
</span></span></pre></div>
<a id="trunkSourceWebCoreinspectorInspectorConsoleInstrumentationh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/inspector/InspectorConsoleInstrumentation.h (201236 => 201237)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/inspector/InspectorConsoleInstrumentation.h 2016-05-21 01:17:42 UTC (rev 201236)
+++ trunk/Source/WebCore/inspector/InspectorConsoleInstrumentation.h 2016-05-21 02:00:42 UTC (rev 201237)
</span><span class="lines">@@ -33,7 +33,6 @@
</span><span class="cx"> #define InspectorConsoleInstrumentation_h
</span><span class="cx">
</span><span class="cx"> #include "InspectorInstrumentation.h"
</span><del>-#include "ScriptProfile.h"
</del><span class="cx"> #include <inspector/ScriptArguments.h>
</span><span class="cx"> #include <inspector/ScriptCallStack.h>
</span><span class="cx">
</span><span class="lines">@@ -85,9 +84,9 @@
</span><span class="cx"> startProfilingImpl(instrumentingAgentsForPage(page), exec, title);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-inline RefPtr<JSC::Profile> InspectorInstrumentation::stopProfiling(Page& page, JSC::ExecState* exec, const String &title)
</del><ins>+inline void InspectorInstrumentation::stopProfiling(Page& page, JSC::ExecState* exec, const String &title)
</ins><span class="cx"> {
</span><del>- return stopProfilingImpl(instrumentingAgentsForPage(page), exec, title);
</del><ins>+ stopProfilingImpl(instrumentingAgentsForPage(page), exec, title);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> } // namespace WebCore
</span></span></pre></div>
<a id="trunkSourceWebCoreinspectorInspectorControllercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/inspector/InspectorController.cpp (201236 => 201237)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/inspector/InspectorController.cpp 2016-05-21 01:17:42 UTC (rev 201236)
+++ trunk/Source/WebCore/inspector/InspectorController.cpp 2016-05-21 02:00:42 UTC (rev 201237)
</span><span class="lines">@@ -72,7 +72,6 @@
</span><span class="cx"> #include <inspector/agents/InspectorAgent.h>
</span><span class="cx"> #include <inspector/agents/InspectorHeapAgent.h>
</span><span class="cx"> #include <inspector/agents/InspectorScriptProfilerAgent.h>
</span><del>-#include <profiler/LegacyProfiler.h>
</del><span class="cx"> #include <runtime/JSLock.h>
</span><span class="cx"> #include <wtf/Stopwatch.h>
</span><span class="cx">
</span><span class="lines">@@ -171,14 +170,11 @@
</span><span class="cx"> m_instrumentingAgents->setWebConsoleAgent(consoleAgentPtr.get());
</span><span class="cx"> m_agents.append(WTFMove(consoleAgentPtr));
</span><span class="cx">
</span><del>- auto timelineAgentPtr = std::make_unique<InspectorTimelineAgent>(pageContext, scriptProfilerAgent, heapAgent, pageAgent);
- m_timelineAgent = timelineAgentPtr.get();
- m_agents.append(WTFMove(timelineAgentPtr));
-
</del><span class="cx"> auto debuggerAgentPtr = std::make_unique<PageDebuggerAgent>(pageContext, pageAgent, m_overlay.get());
</span><span class="cx"> PageDebuggerAgent* debuggerAgent = debuggerAgentPtr.get();
</span><span class="cx"> m_agents.append(WTFMove(debuggerAgentPtr));
</span><span class="cx">
</span><ins>+ m_agents.append(std::make_unique<InspectorTimelineAgent>(pageContext, scriptProfilerAgent, heapAgent, pageAgent));
</ins><span class="cx"> m_agents.append(std::make_unique<InspectorDOMDebuggerAgent>(pageContext, m_domAgent, debuggerAgent));
</span><span class="cx"> m_agents.append(std::make_unique<InspectorApplicationCacheAgent>(pageContext, pageAgent));
</span><span class="cx"> m_agents.append(std::make_unique<InspectorLayerTreeAgent>(pageContext));
</span><span class="lines">@@ -414,27 +410,6 @@
</span><span class="cx"> #endif
</span><span class="cx"> }
</span><span class="cx">
</span><del>-bool InspectorController::legacyProfilerEnabled() const
-{
- return m_legacyProfilerEnabled;
-}
-
-void InspectorController::setLegacyProfilerEnabled(bool enable)
-{
- m_legacyProfilerEnabled = enable;
-
- ErrorString unused;
- if (enable) {
- m_instrumentingAgents->setPersistentInspectorTimelineAgent(m_timelineAgent);
- m_scriptDebugServer.recompileAllJSFunctions();
- m_timelineAgent->start(unused);
- } else {
- m_instrumentingAgents->setPersistentInspectorTimelineAgent(nullptr);
- m_scriptDebugServer.recompileAllJSFunctions();
- m_timelineAgent->stop(unused);
- }
-}
-
</del><span class="cx"> bool InspectorController::developerExtrasEnabled() const
</span><span class="cx"> {
</span><span class="cx"> return m_page.settings().developerExtrasEnabled();
</span></span></pre></div>
<a id="trunkSourceWebCoreinspectorInspectorControllerh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/inspector/InspectorController.h (201236 => 201237)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/inspector/InspectorController.h 2016-05-21 01:17:42 UTC (rev 201236)
+++ trunk/Source/WebCore/inspector/InspectorController.h 2016-05-21 02:00:42 UTC (rev 201237)
</span><span class="lines">@@ -63,7 +63,6 @@
</span><span class="cx"> class InspectorFrontendClient;
</span><span class="cx"> class InspectorInstrumentation;
</span><span class="cx"> class InspectorPageAgent;
</span><del>-class InspectorTimelineAgent;
</del><span class="cx"> class InstrumentingAgents;
</span><span class="cx"> class Node;
</span><span class="cx"> class Page;
</span><span class="lines">@@ -111,9 +110,6 @@
</span><span class="cx"> void setIsUnderTest(bool isUnderTest) { m_isUnderTest = isUnderTest; }
</span><span class="cx"> WEBCORE_EXPORT void evaluateForTestInFrontend(const String& script);
</span><span class="cx">
</span><del>- WEBCORE_EXPORT bool legacyProfilerEnabled() const;
- WEBCORE_EXPORT void setLegacyProfilerEnabled(bool);
-
</del><span class="cx"> InspectorClient* inspectorClient() const { return m_inspectorClient; }
</span><span class="cx"> InspectorFrontendClient* inspectorFrontendClient() const { return m_inspectorFrontendClient; }
</span><span class="cx"> InspectorPageAgent* pageAgent() const { return m_pageAgent; }
</span><span class="lines">@@ -148,11 +144,9 @@
</span><span class="cx"> Inspector::InspectorAgent* m_inspectorAgent { nullptr };
</span><span class="cx"> InspectorDOMAgent* m_domAgent { nullptr };
</span><span class="cx"> InspectorPageAgent* m_pageAgent { nullptr };
</span><del>- InspectorTimelineAgent* m_timelineAgent { nullptr };
</del><span class="cx">
</span><span class="cx"> bool m_isUnderTest { false };
</span><span class="cx"> bool m_isAutomaticInspection { false };
</span><del>- bool m_legacyProfilerEnabled { false };
</del><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> } // namespace WebCore
</span></span></pre></div>
<a id="trunkSourceWebCoreinspectorInspectorInstrumentationcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/inspector/InspectorInstrumentation.cpp (201236 => 201237)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/inspector/InspectorInstrumentation.cpp 2016-05-21 01:17:42 UTC (rev 201236)
+++ trunk/Source/WebCore/inspector/InspectorInstrumentation.cpp 2016-05-21 02:00:42 UTC (rev 201237)
</span><span class="lines">@@ -67,7 +67,6 @@
</span><span class="cx"> #include <inspector/ScriptArguments.h>
</span><span class="cx"> #include <inspector/ScriptCallStack.h>
</span><span class="cx"> #include <inspector/agents/InspectorDebuggerAgent.h>
</span><del>-#include <profiler/Profile.h>
</del><span class="cx"> #include <runtime/ConsoleTypes.h>
</span><span class="cx"> #include <wtf/StdLibExtras.h>
</span><span class="cx"> #include <wtf/text/CString.h>
</span><span class="lines">@@ -894,11 +893,10 @@
</span><span class="cx"> timelineAgent->startFromConsole(exec, title);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-RefPtr<JSC::Profile> InspectorInstrumentation::stopProfilingImpl(InstrumentingAgents& instrumentingAgents, JSC::ExecState* exec, const String& title)
</del><ins>+void InspectorInstrumentation::stopProfilingImpl(InstrumentingAgents& instrumentingAgents, JSC::ExecState* exec, const String& title)
</ins><span class="cx"> {
</span><span class="cx"> if (InspectorTimelineAgent* timelineAgent = instrumentingAgents.persistentInspectorTimelineAgent())
</span><del>- return timelineAgent->stopFromConsole(exec, title);
- return nullptr;
</del><ins>+ timelineAgent->stopFromConsole(exec, title);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void InspectorInstrumentation::didOpenDatabaseImpl(InstrumentingAgents& instrumentingAgents, RefPtr<Database>&& database, const String& domain, const String& name, const String& version)
</span></span></pre></div>
<a id="trunkSourceWebCoreinspectorInspectorInstrumentationh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/inspector/InspectorInstrumentation.h (201236 => 201237)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/inspector/InspectorInstrumentation.h 2016-05-21 01:17:42 UTC (rev 201236)
+++ trunk/Source/WebCore/inspector/InspectorInstrumentation.h 2016-05-21 02:00:42 UTC (rev 201237)
</span><span class="lines">@@ -61,10 +61,6 @@
</span><span class="cx"> class ScriptCallStack;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-namespace JSC {
-class Profile;
-}
-
</del><span class="cx"> namespace WebCore {
</span><span class="cx">
</span><span class="cx"> class CSSRule;
</span><span class="lines">@@ -218,7 +214,7 @@
</span><span class="cx"> static void didFireAnimationFrame(const InspectorInstrumentationCookie&);
</span><span class="cx">
</span><span class="cx"> static void startProfiling(Page&, JSC::ExecState*, const String& title);
</span><del>- static RefPtr<JSC::Profile> stopProfiling(Page&, JSC::ExecState*, const String& title);
</del><ins>+ static void stopProfiling(Page&, JSC::ExecState*, const String& title);
</ins><span class="cx">
</span><span class="cx"> static void didOpenDatabase(ScriptExecutionContext*, RefPtr<Database>&&, const String& domain, const String& name, const String& version);
</span><span class="cx">
</span><span class="lines">@@ -387,7 +383,7 @@
</span><span class="cx"> static void didFireAnimationFrameImpl(const InspectorInstrumentationCookie&);
</span><span class="cx">
</span><span class="cx"> static void startProfilingImpl(InstrumentingAgents&, JSC::ExecState*, const String& title);
</span><del>- static RefPtr<JSC::Profile> stopProfilingImpl(InstrumentingAgents&, JSC::ExecState*, const String& title);
</del><ins>+ static void stopProfilingImpl(InstrumentingAgents&, JSC::ExecState*, const String& title);
</ins><span class="cx">
</span><span class="cx"> static void didOpenDatabaseImpl(InstrumentingAgents&, RefPtr<Database>&&, const String& domain, const String& name, const String& version);
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreinspectorInspectorTimelineAgentcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/inspector/InspectorTimelineAgent.cpp (201236 => 201237)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/inspector/InspectorTimelineAgent.cpp 2016-05-21 01:17:42 UTC (rev 201236)
+++ trunk/Source/WebCore/inspector/InspectorTimelineAgent.cpp 2016-05-21 02:00:42 UTC (rev 201237)
</span><span class="lines">@@ -47,7 +47,6 @@
</span><span class="cx"> #include <inspector/agents/InspectorDebuggerAgent.h>
</span><span class="cx"> #include <inspector/agents/InspectorHeapAgent.h>
</span><span class="cx"> #include <inspector/agents/InspectorScriptProfilerAgent.h>
</span><del>-#include <profiler/LegacyProfiler.h>
</del><span class="cx"> #include <wtf/Stopwatch.h>
</span><span class="cx">
</span><span class="cx"> #if PLATFORM(IOS)
</span><span class="lines">@@ -242,58 +241,14 @@
</span><span class="cx"> return m_environment.executionStopwatch()->elapsedTime();
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void InspectorTimelineAgent::startFromConsole(JSC::ExecState* exec, const String &title)
</del><ins>+void InspectorTimelineAgent::startFromConsole(JSC::ExecState*, const String&)
</ins><span class="cx"> {
</span><span class="cx"> // FIXME: <https://webkit.org/b/153499> Web Inspector: console.profile should use the new Sampling Profiler
</span><del>-
- // Only allow recording of a profile if it is anonymous (empty title) or does not match
- // the title of an already recording profile.
- if (!title.isEmpty()) {
- for (const TimelineRecordEntry& record : m_pendingConsoleProfileRecords) {
- String recordTitle;
- record.data->getString(ASCIILiteral("title"), recordTitle);
- if (recordTitle == title)
- return;
- }
- }
-
- if (!m_enabled && m_pendingConsoleProfileRecords.isEmpty())
- internalStart();
-
- JSC::LegacyProfiler::profiler()->startProfiling(exec, title, m_environment.executionStopwatch());
-
- m_pendingConsoleProfileRecords.append(createRecordEntry(TimelineRecordFactory::createConsoleProfileData(title), TimelineRecordType::ConsoleProfile, true, frameFromExecState(exec)));
</del><span class="cx"> }
</span><span class="cx">
</span><del>-RefPtr<JSC::Profile> InspectorTimelineAgent::stopFromConsole(JSC::ExecState* exec, const String& title)
</del><ins>+void InspectorTimelineAgent::stopFromConsole(JSC::ExecState*, const String&)
</ins><span class="cx"> {
</span><span class="cx"> // FIXME: <https://webkit.org/b/153499> Web Inspector: console.profile should use the new Sampling Profiler
</span><del>-
- // Stop profiles in reverse order. If the title is empty, then stop the last profile.
- // Otherwise, match the title of the profile to stop.
- for (ptrdiff_t i = m_pendingConsoleProfileRecords.size() - 1; i >= 0; --i) {
- const TimelineRecordEntry& record = m_pendingConsoleProfileRecords[i];
-
- String recordTitle;
- record.data->getString(ASCIILiteral("title"), recordTitle);
-
- if (title.isEmpty() || recordTitle == title) {
- RefPtr<JSC::Profile> profile = JSC::LegacyProfiler::profiler()->stopProfiling(exec, title);
- if (profile)
- TimelineRecordFactory::appendProfile(record.data.get(), profile.copyRef());
-
- didCompleteRecordEntry(record);
-
- m_pendingConsoleProfileRecords.remove(i);
-
- if (!m_enabledFromFrontend && m_pendingConsoleProfileRecords.isEmpty())
- internalStop();
-
- return profile;
- }
- }
-
- return nullptr;
</del><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void InspectorTimelineAgent::willCallFunction(const String& scriptName, int scriptLine, Frame* frame)
</span></span></pre></div>
<a id="trunkSourceWebCoreinspectorInspectorTimelineAgenth"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/inspector/InspectorTimelineAgent.h (201236 => 201237)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/inspector/InspectorTimelineAgent.h 2016-05-21 01:17:42 UTC (rev 201236)
+++ trunk/Source/WebCore/inspector/InspectorTimelineAgent.h 2016-05-21 02:00:42 UTC (rev 201237)
</span><span class="lines">@@ -41,10 +41,6 @@
</span><span class="cx"> #include <inspector/ScriptDebugListener.h>
</span><span class="cx"> #include <wtf/Vector.h>
</span><span class="cx">
</span><del>-namespace JSC {
-class Profile;
-}
-
</del><span class="cx"> namespace Inspector {
</span><span class="cx"> class InspectorHeapAgent;
</span><span class="cx"> class InspectorScriptProfilerAgent;
</span><span class="lines">@@ -113,8 +109,8 @@
</span><span class="cx"> void didCommitLoad();
</span><span class="cx">
</span><span class="cx"> // Methods called from WebCore.
</span><del>- void startFromConsole(JSC::ExecState*, const String &title);
- RefPtr<JSC::Profile> stopFromConsole(JSC::ExecState*, const String& title);
</del><ins>+ void startFromConsole(JSC::ExecState*, const String& title);
+ void stopFromConsole(JSC::ExecState*, const String& title);
</ins><span class="cx">
</span><span class="cx"> // InspectorInstrumentation callbacks.
</span><span class="cx"> void didInstallTimer(int timerId, std::chrono::milliseconds timeout, bool singleShot, Frame*);
</span><span class="lines">@@ -204,11 +200,10 @@
</span><span class="cx"> InspectorPageAgent* m_pageAgent;
</span><span class="cx">
</span><span class="cx"> Vector<TimelineRecordEntry> m_recordStack;
</span><ins>+
</ins><span class="cx"> int m_id { 1 };
</span><span class="cx"> int m_maxCallStackDepth { 5 };
</span><span class="cx">
</span><del>- Vector<TimelineRecordEntry> m_pendingConsoleProfileRecords;
-
</del><span class="cx"> bool m_enabled { false };
</span><span class="cx"> bool m_enabledFromFrontend { false };
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreinspectorPageDebuggerAgentcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/inspector/PageDebuggerAgent.cpp (201236 => 201237)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/inspector/PageDebuggerAgent.cpp 2016-05-21 01:17:42 UTC (rev 201236)
+++ trunk/Source/WebCore/inspector/PageDebuggerAgent.cpp 2016-05-21 02:00:42 UTC (rev 201237)
</span><span class="lines">@@ -45,7 +45,6 @@
</span><span class="cx"> #include <inspector/InjectedScriptManager.h>
</span><span class="cx"> #include <inspector/ScriptCallStack.h>
</span><span class="cx"> #include <inspector/ScriptCallStackFactory.h>
</span><del>-#include <profiler/Profile.h>
</del><span class="cx"> #include <wtf/NeverDestroyed.h>
</span><span class="cx">
</span><span class="cx"> using namespace Inspector;
</span></span></pre></div>
<a id="trunkSourceWebCoreinspectorPageRuntimeAgentcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/inspector/PageRuntimeAgent.cpp (201236 => 201237)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/inspector/PageRuntimeAgent.cpp 2016-05-21 01:17:42 UTC (rev 201236)
+++ trunk/Source/WebCore/inspector/PageRuntimeAgent.cpp 2016-05-21 02:00:42 UTC (rev 201237)
</span><span class="lines">@@ -45,7 +45,6 @@
</span><span class="cx"> #include "SecurityOrigin.h"
</span><span class="cx"> #include <inspector/InjectedScript.h>
</span><span class="cx"> #include <inspector/InjectedScriptManager.h>
</span><del>-#include <profiler/Profile.h>
</del><span class="cx">
</span><span class="cx"> using Inspector::Protocol::Runtime::ExecutionContextDescription;
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreinspectorScriptProfileidl"></a>
<div class="delfile"><h4>Deleted: trunk/Source/WebCore/inspector/ScriptProfile.idl (201236 => 201237)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/inspector/ScriptProfile.idl 2016-05-21 01:17:42 UTC (rev 201236)
+++ trunk/Source/WebCore/inspector/ScriptProfile.idl 2016-05-21 02:00:42 UTC (rev 201237)
</span><span class="lines">@@ -1,36 +0,0 @@
</span><del>-/*
- * Copyright (C) 2010 Apple Inc. All rights reserved.
- * Copyright (C) 2010 Google Inc. All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- * notice, this list of conditions and the following disclaimer in the
- * documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY APPLE INC. ``AS IS'' AND ANY
- * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR
- * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
- * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
- * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
- * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
- * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-[
- NoInterfaceObject,
- SkipVTableValidation,
- ExportMacro=WEBCORE_EXPORT,
-] interface ScriptProfile {
- readonly attribute DOMString title;
- readonly attribute unsigned long uid;
- readonly attribute ScriptProfileNode rootNode;
-};
-
</del></span></pre></div>
<a id="trunkSourceWebCoreinspectorScriptProfileNodeidl"></a>
<div class="delfile"><h4>Deleted: trunk/Source/WebCore/inspector/ScriptProfileNode.idl (201236 => 201237)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/inspector/ScriptProfileNode.idl 2016-05-21 01:17:42 UTC (rev 201236)
+++ trunk/Source/WebCore/inspector/ScriptProfileNode.idl 2016-05-21 02:00:42 UTC (rev 201237)
</span><span class="lines">@@ -1,41 +0,0 @@
</span><del>-/*
- * Copyright (C) 2010 Apple Inc. All rights reserved.
- * Copyright (C) 2010 Google Inc. All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- * notice, this list of conditions and the following disclaimer in the
- * documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY APPLE INC. ``AS IS'' AND ANY
- * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR
- * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
- * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
- * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
- * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
- * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-[
- NoInterfaceObject,
- ImplementationLacksVTable,
- ExportMacro=WEBCORE_EXPORT,
-] interface ScriptProfileNode {
- readonly attribute unsigned long id;
-
- readonly attribute DOMString functionName;
-
- readonly attribute DOMString url;
- readonly attribute unsigned long lineNumber;
- readonly attribute unsigned long columnNumber;
-
- sequence<ScriptProfileNode> children();
-};
</del></span></pre></div>
<a id="trunkSourceWebCoreinspectorTimelineRecordFactorycpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/inspector/TimelineRecordFactory.cpp (201236 => 201237)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/inspector/TimelineRecordFactory.cpp 2016-05-21 01:17:42 UTC (rev 201236)
+++ trunk/Source/WebCore/inspector/TimelineRecordFactory.cpp 2016-05-21 02:00:42 UTC (rev 201237)
</span><span class="lines">@@ -39,7 +39,6 @@
</span><span class="cx"> #include <inspector/ScriptBreakpoint.h>
</span><span class="cx"> #include <inspector/ScriptCallStack.h>
</span><span class="cx"> #include <inspector/ScriptCallStackFactory.h>
</span><del>-#include <profiler/Profile.h>
</del><span class="cx">
</span><span class="cx"> using namespace Inspector;
</span><span class="cx">
</span><span class="lines">@@ -152,63 +151,4 @@
</span><span class="cx"> data->setArray(ASCIILiteral("root"), createQuad(quad));
</span><span class="cx"> }
</span><span class="cx">
</span><del>-static Ref<Protocol::Timeline::CPUProfileNodeAggregateCallInfo> buildAggregateCallInfoInspectorObject(const JSC::ProfileNode* node)
-{
- double startTime = node->calls()[0].startTime();
- double endTime = node->calls().last().startTime() + node->calls().last().elapsedTime();
-
- double totalTime = 0;
- for (const JSC::ProfileNode::Call& call : node->calls())
- totalTime += call.elapsedTime();
-
- return Protocol::Timeline::CPUProfileNodeAggregateCallInfo::create()
- .setCallCount(node->calls().size())
- .setStartTime(startTime)
- .setEndTime(endTime)
- .setTotalTime(totalTime)
- .release();
-}
-
-static Ref<Protocol::Timeline::CPUProfileNode> buildInspectorObject(const JSC::ProfileNode* node)
-{
- auto result = Protocol::Timeline::CPUProfileNode::create()
- .setId(node->id())
- .setCallInfo(buildAggregateCallInfoInspectorObject(node))
- .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()) {
- auto children = Protocol::Array<Protocol::Timeline::CPUProfileNode>::create();
- for (RefPtr<JSC::ProfileNode> profileNode : node->children())
- children->addItem(buildInspectorObject(profileNode.get()));
- result->setChildren(WTFMove(children));
- }
-
- return result;
-}
-
-static Ref<Protocol::Timeline::CPUProfile> buildProfileInspectorObject(const JSC::Profile* profile)
-{
- auto rootNodes = Protocol::Array<Protocol::Timeline::CPUProfileNode>::create();
- for (RefPtr<JSC::ProfileNode> profileNode : profile->rootNode()->children())
- rootNodes->addItem(buildInspectorObject(profileNode.get()));
-
- return Protocol::Timeline::CPUProfile::create()
- .setRootNodes(WTFMove(rootNodes))
- .release();
-}
-
-void TimelineRecordFactory::appendProfile(InspectorObject* data, RefPtr<JSC::Profile>&& profile)
-{
- data->setValue(ASCIILiteral("profile"), buildProfileInspectorObject(profile.get()));
-}
-
</del><span class="cx"> } // namespace WebCore
</span></span></pre></div>
<a id="trunkSourceWebCoreinspectorTimelineRecordFactoryh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/inspector/TimelineRecordFactory.h (201236 => 201237)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/inspector/TimelineRecordFactory.h 2016-05-21 01:17:42 UTC (rev 201236)
+++ trunk/Source/WebCore/inspector/TimelineRecordFactory.h 2016-05-21 02:00:42 UTC (rev 201237)
</span><span class="lines">@@ -36,10 +36,6 @@
</span><span class="cx"> #include <wtf/Forward.h>
</span><span class="cx"> #include <wtf/text/WTFString.h>
</span><span class="cx">
</span><del>-namespace JSC {
-class Profile;
-}
-
</del><span class="cx"> namespace Inspector {
</span><span class="cx"> struct ScriptBreakpointAction;
</span><span class="cx"> }
</span><span class="lines">@@ -65,7 +61,6 @@
</span><span class="cx"> static Ref<Inspector::InspectorObject> createPaintData(const FloatQuad&);
</span><span class="cx">
</span><span class="cx"> static void appendLayoutRoot(Inspector::InspectorObject* data, const FloatQuad&);
</span><del>- static void appendProfile(Inspector::InspectorObject*, RefPtr<JSC::Profile>&&);
</del><span class="cx">
</span><span class="cx"> private:
</span><span class="cx"> TimelineRecordFactory() { }
</span></span></pre></div>
<a id="trunkSourceWebCorepageDOMWindowcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/page/DOMWindow.cpp (201236 => 201237)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/page/DOMWindow.cpp 2016-05-21 01:17:42 UTC (rev 201236)
+++ trunk/Source/WebCore/page/DOMWindow.cpp 2016-05-21 02:00:42 UTC (rev 201237)
</span><span class="lines">@@ -101,7 +101,6 @@
</span><span class="cx"> #include "WebKitPoint.h"
</span><span class="cx"> #include "WindowFeatures.h"
</span><span class="cx"> #include "WindowFocusAllowedIndicator.h"
</span><del>-#include <JavaScriptCore/Profile.h>
</del><span class="cx"> #include <algorithm>
</span><span class="cx"> #include <inspector/ScriptCallStack.h>
</span><span class="cx"> #include <inspector/ScriptCallStackFactory.h>
</span></span></pre></div>
<a id="trunkSourceWebCorepagePagecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/page/Page.cpp (201236 => 201237)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/page/Page.cpp 2016-05-21 01:17:42 UTC (rev 201236)
+++ trunk/Source/WebCore/page/Page.cpp 2016-05-21 02:00:42 UTC (rev 201237)
</span><span class="lines">@@ -96,7 +96,6 @@
</span><span class="cx"> #include "VisitedLinkStore.h"
</span><span class="cx"> #include "VoidCallback.h"
</span><span class="cx"> #include "Widget.h"
</span><del>-#include <JavaScriptCore/Profile.h>
</del><span class="cx"> #include <wtf/HashMap.h>
</span><span class="cx"> #include <wtf/RefCountedLeakCounter.h>
</span><span class="cx"> #include <wtf/StdLibExtras.h>
</span></span></pre></div>
<a id="trunkSourceWebCorepagePageConsoleClientcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/page/PageConsoleClient.cpp (201236 => 201237)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/page/PageConsoleClient.cpp 2016-05-21 01:17:42 UTC (rev 201236)
+++ trunk/Source/WebCore/page/PageConsoleClient.cpp 2016-05-21 02:00:42 UTC (rev 201237)
</span><span class="lines">@@ -191,8 +191,7 @@
</span><span class="cx"> void PageConsoleClient::profileEnd(JSC::ExecState* exec, const String& title)
</span><span class="cx"> {
</span><span class="cx"> // FIXME: <https://webkit.org/b/153499> Web Inspector: console.profile should use the new Sampling Profiler
</span><del>- if (RefPtr<JSC::Profile> profile = InspectorInstrumentation::stopProfiling(m_page, exec, title))
- m_profiles.append(WTFMove(profile));
</del><ins>+ InspectorInstrumentation::stopProfiling(m_page, exec, title);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void PageConsoleClient::takeHeapSnapshot(JSC::ExecState*, const String& title)
</span><span class="lines">@@ -216,9 +215,4 @@
</span><span class="cx"> InspectorInstrumentation::consoleTimeStamp(m_page.mainFrame(), WTFMove(arguments));
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void PageConsoleClient::clearProfiles()
-{
- m_profiles.clear();
-}
-
</del><span class="cx"> } // namespace WebCore
</span></span></pre></div>
<a id="trunkSourceWebCorepagePageConsoleClienth"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/page/PageConsoleClient.h (201236 => 201237)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/page/PageConsoleClient.h 2016-05-21 01:17:42 UTC (rev 201236)
+++ trunk/Source/WebCore/page/PageConsoleClient.h 2016-05-21 02:00:42 UTC (rev 201237)
</span><span class="lines">@@ -30,7 +30,6 @@
</span><span class="cx"> #define PageConsoleClient_h
</span><span class="cx">
</span><span class="cx"> #include <inspector/ScriptCallStack.h>
</span><del>-#include <profiler/Profile.h>
</del><span class="cx"> #include <runtime/ConsoleClient.h>
</span><span class="cx"> #include <wtf/Forward.h>
</span><span class="cx">
</span><span class="lines">@@ -43,8 +42,6 @@
</span><span class="cx"> class Document;
</span><span class="cx"> class Page;
</span><span class="cx">
</span><del>-typedef Vector<RefPtr<JSC::Profile>> ProfilesArray;
-
</del><span class="cx"> class WEBCORE_EXPORT PageConsoleClient final : public JSC::ConsoleClient {
</span><span class="cx"> WTF_MAKE_FAST_ALLOCATED;
</span><span class="cx"> public:
</span><span class="lines">@@ -61,9 +58,6 @@
</span><span class="cx"> void addMessage(MessageSource, MessageLevel, const String& message, RefPtr<Inspector::ScriptCallStack>&&);
</span><span class="cx"> void addMessage(MessageSource, MessageLevel, const String& message, unsigned long requestIdentifier = 0, Document* = nullptr);
</span><span class="cx">
</span><del>- const ProfilesArray& profiles() const { return m_profiles; }
- void clearProfiles();
-
</del><span class="cx"> protected:
</span><span class="cx"> void messageWithTypeAndLevel(MessageType, MessageLevel, JSC::ExecState*, RefPtr<Inspector::ScriptArguments>&&) override;
</span><span class="cx"> void count(JSC::ExecState*, RefPtr<Inspector::ScriptArguments>&&) override;
</span><span class="lines">@@ -76,7 +70,6 @@
</span><span class="cx">
</span><span class="cx"> private:
</span><span class="cx"> Page& m_page;
</span><del>- ProfilesArray m_profiles;
</del><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> } // namespace WebCore
</span></span></pre></div>
<a id="trunkSourceWebCoretestingInternalscpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/testing/Internals.cpp (201236 => 201237)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/testing/Internals.cpp 2016-05-21 01:17:42 UTC (rev 201236)
+++ trunk/Source/WebCore/testing/Internals.cpp 2016-05-21 02:00:42 UTC (rev 201237)
</span><span class="lines">@@ -125,7 +125,6 @@
</span><span class="cx"> #include "WebCoreJSClientData.h"
</span><span class="cx"> #include "WorkerThread.h"
</span><span class="cx"> #include "XMLHttpRequest.h"
</span><del>-#include <JavaScriptCore/Profile.h>
</del><span class="cx"> #include <bytecode/CodeBlock.h>
</span><span class="cx"> #include <inspector/InspectorAgentBase.h>
</span><span class="cx"> #include <inspector/InspectorFrontendChannel.h>
</span><span class="lines">@@ -389,7 +388,6 @@
</span><span class="cx"> WebCore::overrideUserPreferredLanguages(Vector<String>());
</span><span class="cx"> WebCore::Settings::setUsesOverlayScrollbars(false);
</span><span class="cx"> WebCore::Settings::setUsesMockScrollAnimator(false);
</span><del>- page.inspectorController().setLegacyProfilerEnabled(false);
</del><span class="cx"> #if ENABLE(VIDEO_TRACK)
</span><span class="cx"> page.group().captionPreferences().setCaptionsStyleSheetOverride(emptyString());
</span><span class="cx"> page.group().captionPreferences().setTestingMode(false);
</span><span class="lines">@@ -1734,11 +1732,6 @@
</span><span class="cx"> return document->frame()->editor().countMatchesForText(text, nullptr, findOptions, 1000, mark, nullptr);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-const ProfilesArray& Internals::consoleProfiles() const
-{
- return contextDocument()->page()->console().profiles();
-}
-
</del><span class="cx"> unsigned Internals::numberOfLiveNodes() const
</span><span class="cx"> {
</span><span class="cx"> unsigned nodeCount = 0;
</span><span class="lines">@@ -1767,17 +1760,6 @@
</span><span class="cx"> m_inspectorFrontend = nullptr;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void Internals::setLegacyJavaScriptProfilingEnabled(bool enabled, ExceptionCode& ec)
-{
- Page* page = contextDocument()->frame()->page();
- if (!page) {
- ec = INVALID_ACCESS_ERR;
- return;
- }
-
- page->inspectorController().setLegacyProfilerEnabled(enabled);
-}
-
</del><span class="cx"> void Internals::setInspectorIsUnderTest(bool isUnderTest, ExceptionCode& ec)
</span><span class="cx"> {
</span><span class="cx"> Page* page = contextDocument()->frame()->page();
</span></span></pre></div>
<a id="trunkSourceWebCoretestingInternalsh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/testing/Internals.h (201236 => 201237)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/testing/Internals.h 2016-05-21 01:17:42 UTC (rev 201236)
+++ trunk/Source/WebCore/testing/Internals.h 2016-05-21 02:00:42 UTC (rev 201237)
</span><span class="lines">@@ -267,14 +267,11 @@
</span><span class="cx"> void insertAuthorCSS(const String&, ExceptionCode&) const;
</span><span class="cx"> void insertUserCSS(const String&, ExceptionCode&) const;
</span><span class="cx">
</span><del>- const ProfilesArray& consoleProfiles() const;
-
</del><span class="cx"> unsigned numberOfLiveNodes() const;
</span><span class="cx"> unsigned numberOfLiveDocuments() const;
</span><span class="cx">
</span><span class="cx"> RefPtr<DOMWindow> openDummyInspectorFrontend(const String& url);
</span><span class="cx"> void closeDummyInspectorFrontend();
</span><del>- void setLegacyJavaScriptProfilingEnabled(bool enabled, ExceptionCode&);
</del><span class="cx"> void setInspectorIsUnderTest(bool isUnderTest, ExceptionCode&);
</span><span class="cx">
</span><span class="cx"> String counterValue(Element&);
</span></span></pre></div>
<a id="trunkSourceWebCoretestingInternalsidl"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/testing/Internals.idl (201236 => 201237)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/testing/Internals.idl 2016-05-21 01:17:42 UTC (rev 201236)
+++ trunk/Source/WebCore/testing/Internals.idl 2016-05-21 02:00:42 UTC (rev 201237)
</span><span class="lines">@@ -260,16 +260,10 @@
</span><span class="cx"> [RaisesException] void setDeviceProximity(DOMString eventType, unrestricted double value, unrestricted double min, unrestricted double max);
</span><span class="cx"> #endif
</span><span class="cx">
</span><del>- // As per spec: http://www.w3.org/TR/WebIDL/#idl-sequence
- // "Sequences must not be used as the type of an attribute, constant or exception field."
- // FIXME: this will lead to BUG internals.consoleProfiles !== internals.consoleProfiles as profile will always returns new array.
- readonly attribute ScriptProfile[] consoleProfiles;
-
</del><span class="cx"> unsigned long numberOfLiveNodes();
</span><span class="cx"> unsigned long numberOfLiveDocuments();
</span><span class="cx"> DOMWindow openDummyInspectorFrontend(DOMString url);
</span><span class="cx"> void closeDummyInspectorFrontend();
</span><del>- [RaisesException] void setLegacyJavaScriptProfilingEnabled(boolean enabled);
</del><span class="cx"> [RaisesException] void setInspectorIsUnderTest(boolean isUnderTest);
</span><span class="cx">
</span><span class="cx"> DOMString counterValue(Element element);
</span></span></pre></div>
<a id="trunkSourceWebKitwinChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/win/ChangeLog (201236 => 201237)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/win/ChangeLog 2016-05-21 01:17:42 UTC (rev 201236)
+++ trunk/Source/WebKit/win/ChangeLog 2016-05-21 02:00:42 UTC (rev 201237)
</span><span class="lines">@@ -1,3 +1,18 @@
</span><ins>+2016-05-20 Joseph Pecoraro <pecoraro@apple.com>
+
+ Remove LegacyProfiler
+ https://bugs.webkit.org/show_bug.cgi?id=153565
+
+ Reviewed by Saam Barati.
+
+ * Interfaces/IWebInspector.idl:
+ * WebCoreStatistics.cpp:
+ * WebInspector.cpp:
+ (WebInspector::isJavaScriptProfilingEnabled): Deleted.
+ (WebInspector::setJavaScriptProfilingEnabled): Deleted.
+ * WebInspector.h:
+ * WebView.cpp:
+
</ins><span class="cx"> 2016-05-16 Joseph Pecoraro <pecoraro@apple.com>
</span><span class="cx">
</span><span class="cx"> Unreviewed rollout r200924. Caused js/regress/string-replace-generic.html to fail.
</span></span></pre></div>
<a id="trunkSourceWebKitwinInterfacesIWebInspectoridl"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/win/Interfaces/IWebInspector.idl (201236 => 201237)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/win/Interfaces/IWebInspector.idl 2016-05-21 01:17:42 UTC (rev 201236)
+++ trunk/Source/WebKit/win/Interfaces/IWebInspector.idl 2016-05-21 02:00:42 UTC (rev 201237)
</span><span class="lines">@@ -52,9 +52,6 @@
</span><span class="cx"> HRESULT isProfilingJavaScript(BOOL* isProfiling);
</span><span class="cx"> HRESULT toggleProfilingJavaScript();
</span><span class="cx">
</span><del>- HRESULT isJavaScriptProfilingEnabled(BOOL* isProfilingEnabled);
- HRESULT setJavaScriptProfilingEnabled(BOOL enabled);
-
</del><span class="cx"> HRESULT isTimelineProfilingEnabled(BOOL* isEnabled);
</span><span class="cx"> HRESULT setTimelineProfilingEnabled(BOOL enabled);
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebKitwinWebCoreStatisticscpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/win/WebCoreStatistics.cpp (201236 => 201237)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/win/WebCoreStatistics.cpp 2016-05-21 01:17:42 UTC (rev 201236)
+++ trunk/Source/WebKit/win/WebCoreStatistics.cpp 2016-05-21 02:00:42 UTC (rev 201237)
</span><span class="lines">@@ -29,7 +29,6 @@
</span><span class="cx"> #include "COMPropertyBag.h"
</span><span class="cx"> #include <JavaScriptCore/JSLock.h>
</span><span class="cx"> #include <JavaScriptCore/MemoryStatistics.h>
</span><del>-#include <JavaScriptCore/Profile.h>
</del><span class="cx"> #include <WebCore/DOMWindow.h>
</span><span class="cx"> #include <WebCore/FontCache.h>
</span><span class="cx"> #include <WebCore/GCController.h>
</span></span></pre></div>
<a id="trunkSourceWebKitwinWebInspectorcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/win/WebInspector.cpp (201236 => 201237)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/win/WebInspector.cpp 2016-05-21 01:17:42 UTC (rev 201236)
+++ trunk/Source/WebKit/win/WebInspector.cpp 2016-05-21 02:00:42 UTC (rev 201237)
</span><span class="lines">@@ -202,38 +202,6 @@
</span><span class="cx"> return S_OK;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-HRESULT WebInspector::isJavaScriptProfilingEnabled(_Out_ BOOL* isProfilingEnabled)
-{
- if (!isProfilingEnabled)
- return E_POINTER;
-
- *isProfilingEnabled = FALSE;
-
- if (!m_inspectedWebView)
- return S_OK;
-
- Page* inspectedPage = m_inspectedWebView->page();
- if (!inspectedPage)
- return S_OK;
-
- *isProfilingEnabled = inspectedPage->inspectorController().legacyProfilerEnabled();
- return S_OK;
-}
-
-HRESULT WebInspector::setJavaScriptProfilingEnabled(BOOL enabled)
-{
- if (!m_inspectedWebView)
- return S_OK;
-
- Page* inspectedPage = m_inspectedWebView->page();
- if (!inspectedPage)
- return S_OK;
-
- inspectedPage->inspectorController().setLegacyProfilerEnabled(enabled);
-
- return S_OK;
-}
-
</del><span class="cx"> HRESULT WebInspector::evaluateInFrontend(_In_ BSTR bScript)
</span><span class="cx"> {
</span><span class="cx"> if (!m_inspectedWebView)
</span></span></pre></div>
<a id="trunkSourceWebKitwinWebInspectorh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/win/WebInspector.h (201236 => 201237)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/win/WebInspector.h 2016-05-21 01:17:42 UTC (rev 201236)
+++ trunk/Source/WebKit/win/WebInspector.h 2016-05-21 02:00:42 UTC (rev 201237)
</span><span class="lines">@@ -60,9 +60,6 @@
</span><span class="cx"> virtual HRESULT STDMETHODCALLTYPE isProfilingJavaScript(_Out_ BOOL*);
</span><span class="cx"> virtual HRESULT STDMETHODCALLTYPE toggleProfilingJavaScript();
</span><span class="cx">
</span><del>- virtual HRESULT STDMETHODCALLTYPE isJavaScriptProfilingEnabled(_Out_ BOOL*);
- virtual HRESULT STDMETHODCALLTYPE setJavaScriptProfilingEnabled(BOOL);
-
</del><span class="cx"> virtual HRESULT STDMETHODCALLTYPE evaluateInFrontend(_In_ BSTR script);
</span><span class="cx">
</span><span class="cx"> virtual HRESULT STDMETHODCALLTYPE isTimelineProfilingEnabled(_Out_ BOOL*);
</span></span></pre></div>
<a id="trunkSourceWebKitwinWebViewcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/win/WebView.cpp (201236 => 201237)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/win/WebView.cpp 2016-05-21 01:17:42 UTC (rev 201236)
+++ trunk/Source/WebKit/win/WebView.cpp 2016-05-21 02:00:42 UTC (rev 201237)
</span><span class="lines">@@ -78,7 +78,6 @@
</span><span class="cx"> #include <JavaScriptCore/InitializeThreading.h>
</span><span class="cx"> #include <JavaScriptCore/JSCJSValue.h>
</span><span class="cx"> #include <JavaScriptCore/JSLock.h>
</span><del>-#include <JavaScriptCore/Profile.h>
</del><span class="cx"> #include <WebCore/AXObjectCache.h>
</span><span class="cx"> #include <WebCore/ApplicationCacheStorage.h>
</span><span class="cx"> #include <WebCore/BString.h>
</span><span class="lines">@@ -121,7 +120,6 @@
</span><span class="cx"> #include <WebCore/HitTestResult.h>
</span><span class="cx"> #include <WebCore/IntRect.h>
</span><span class="cx"> #include <WebCore/JSElement.h>
</span><del>-#include <WebCore/JSScriptProfile.h>
</del><span class="cx"> #include <WebCore/KeyboardEvent.h>
</span><span class="cx"> #include <WebCore/Logging.h>
</span><span class="cx"> #include <WebCore/MIMETypeRegistry.h>
</span></span></pre>
</div>
</div>
</body>
</html>