<!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>[195916] 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/195916">195916</a></dd>
<dt>Author</dt> <dd>commit-queue@webkit.org</dd>
<dt>Date</dt> <dd>2016-01-30 16:41:57 -0800 (Sat, 30 Jan 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>Unreviewed, rolling out <a href="http://trac.webkit.org/projects/webkit/changeset/195799">r195799</a> and <a href="http://trac.webkit.org/projects/webkit/changeset/195828">r195828</a>.
https://bugs.webkit.org/show_bug.cgi?id=153722
Caused assertion failures, severely affecting EWS (Requested
by ap on #webkit).
Reverted changesets:
"Web Inspector: InspectorTimelineAgent doesn't need to
recompile functions because it now uses the sampling profiler"
https://bugs.webkit.org/show_bug.cgi?id=153500
http://trac.webkit.org/changeset/195799
"Attempt to fix the Windows build after <a href="http://trac.webkit.org/projects/webkit/changeset/195799">r195799</a>"
http://trac.webkit.org/changeset/195828</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsChangeLog">trunk/LayoutTests/ChangeLog</a></li>
<li><a href="#trunkLayoutTestsfastprofileranonymouseventhandlerhtml">trunk/LayoutTests/fast/profiler/anonymous-event-handler.html</a></li>
<li><a href="#trunkLayoutTestsfastprofileranonymousfunctioncalledfromdifferentcontextshtml">trunk/LayoutTests/fast/profiler/anonymous-function-called-from-different-contexts.html</a></li>
<li><a href="#trunkLayoutTestsfastprofileranonymousfunctioncallsbuiltinfunctionshtml">trunk/LayoutTests/fast/profiler/anonymous-function-calls-built-in-functions.html</a></li>
<li><a href="#trunkLayoutTestsfastprofileranonymousfunctioncallsevalhtml">trunk/LayoutTests/fast/profiler/anonymous-function-calls-eval.html</a></li>
<li><a href="#trunkLayoutTestsfastprofileranonymousfunctionswithdisplaynameshtml">trunk/LayoutTests/fast/profiler/anonymous-functions-with-display-names.html</a></li>
<li><a href="#trunkLayoutTestsfastprofilerapplyhtml">trunk/LayoutTests/fast/profiler/apply.html</a></li>
<li><a href="#trunkLayoutTestsfastprofilerbuiltinfunctioncallsanonymoushtml">trunk/LayoutTests/fast/profiler/built-in-function-calls-anonymous.html</a></li>
<li><a href="#trunkLayoutTestsfastprofilerbuiltinfunctioncallsuserdefinedfunctionhtml">trunk/LayoutTests/fast/profiler/built-in-function-calls-user-defined-function.html</a></li>
<li><a href="#trunkLayoutTestsfastprofilercallregisterleakhtml">trunk/LayoutTests/fast/profiler/call-register-leak.html</a></li>
<li><a href="#trunkLayoutTestsfastprofilercallhtml">trunk/LayoutTests/fast/profiler/call.html</a></li>
<li><a href="#trunkLayoutTestsfastprofilercallingthefunctionthatstartedtheprofilerfromanotherscopehtml">trunk/LayoutTests/fast/profiler/calling-the-function-that-started-the-profiler-from-another-scope.html</a></li>
<li><a href="#trunkLayoutTestsfastprofilercomparemultipleprofileshtml">trunk/LayoutTests/fast/profiler/compare-multiple-profiles.html</a></li>
<li><a href="#trunkLayoutTestsfastprofilerconstructorhtml">trunk/LayoutTests/fast/profiler/constructor.html</a></li>
<li><a href="#trunkLayoutTestsfastprofilerdeadtimehtml">trunk/LayoutTests/fast/profiler/dead-time.html</a></li>
<li><a href="#trunkLayoutTestsfastprofilerdocumentdotwritehtml">trunk/LayoutTests/fast/profiler/document-dot-write.html</a></li>
<li><a href="#trunkLayoutTestsfastprofilereventhandlerhtml">trunk/LayoutTests/fast/profiler/event-handler.html</a></li>
<li><a href="#trunkLayoutTestsfastprofilerexecutioncontextandevalonsamelinehtml">trunk/LayoutTests/fast/profiler/execution-context-and-eval-on-same-line.html</a></li>
<li><a href="#trunkLayoutTestsfastprofilerinlineeventhandlerhtml">trunk/LayoutTests/fast/profiler/inline-event-handler.html</a></li>
<li><a href="#trunkLayoutTestsfastprofilermanycallsinthesamescopehtml">trunk/LayoutTests/fast/profiler/many-calls-in-the-same-scope.html</a></li>
<li><a href="#trunkLayoutTestsfastprofilermultipleanddifferentscopedanonymousfunctioncallshtml">trunk/LayoutTests/fast/profiler/multiple-and-different-scoped-anonymous-function-calls.html</a></li>
<li><a href="#trunkLayoutTestsfastprofilermultipleanddifferentscopedfunctioncallshtml">trunk/LayoutTests/fast/profiler/multiple-and-different-scoped-function-calls.html</a></li>
<li><a href="#trunkLayoutTestsfastprofilermultipleanonymousfunctionscalledfromthesamefunctionhtml">trunk/LayoutTests/fast/profiler/multiple-anonymous-functions-called-from-the-same-function.html</a></li>
<li><a href="#trunkLayoutTestsfastprofilermultipleframeshtml">trunk/LayoutTests/fast/profiler/multiple-frames.html</a></li>
<li><a href="#trunkLayoutTestsfastprofilernamedfunctionswithdisplaynameshtml">trunk/LayoutTests/fast/profiler/named-functions-with-display-names.html</a></li>
<li><a href="#trunkLayoutTestsfastprofilernestedanonymousfunctonhtml">trunk/LayoutTests/fast/profiler/nested-anonymous-functon.html</a></li>
<li><a href="#trunkLayoutTestsfastprofilernestedstartandstopprofilerhtml">trunk/LayoutTests/fast/profiler/nested-start-and-stop-profiler.html</a></li>
<li><a href="#trunkLayoutTestsfastprofilernoexecutioncontexthtml">trunk/LayoutTests/fast/profiler/no-execution-context.html</a></li>
<li><a href="#trunkLayoutTestsfastprofileroneexecutioncontexthtml">trunk/LayoutTests/fast/profiler/one-execution-context.html</a></li>
<li><a href="#trunkLayoutTestsfastprofilerprofilecallsinincludedfilehtml">trunk/LayoutTests/fast/profiler/profile-calls-in-included-file.html</a></li>
<li><a href="#trunkLayoutTestsfastprofilerprofilewithnotitlehtml">trunk/LayoutTests/fast/profiler/profile-with-no-title.html</a></li>
<li><a href="#trunkLayoutTestsfastprofilerprofilingfromanestedlocationbutstopprofilingoutsidethenestinghtml">trunk/LayoutTests/fast/profiler/profiling-from-a-nested-location-but-stop-profiling-outside-the-nesting.html</a></li>
<li><a href="#trunkLayoutTestsfastprofilerprofilingfromanestedlocationhtml">trunk/LayoutTests/fast/profiler/profiling-from-a-nested-location.html</a></li>
<li><a href="#trunkLayoutTestsfastprofilersimpleeventcallhtml">trunk/LayoutTests/fast/profiler/simple-event-call.html</a></li>
<li><a href="#trunkLayoutTestsfastprofilersimplenolevelchangehtml">trunk/LayoutTests/fast/profiler/simple-no-level-change.html</a></li>
<li><a href="#trunkLayoutTestsfastprofilerstartandstopprofilermultipletimeshtml">trunk/LayoutTests/fast/profiler/start-and-stop-profiler-multiple-times.html</a></li>
<li><a href="#trunkLayoutTestsfastprofilerstartandstopprofilinginthesamefunctionhtml">trunk/LayoutTests/fast/profiler/start-and-stop-profiling-in-the-same-function.html</a></li>
<li><a href="#trunkLayoutTestsfastprofilerstartbutdontstopprofilinghtml">trunk/LayoutTests/fast/profiler/start-but-dont-stop-profiling.html</a></li>
<li><a href="#trunkLayoutTestsfastprofilerstopprofilingaftersetTimeouthtml">trunk/LayoutTests/fast/profiler/stop-profiling-after-setTimeout.html</a></li>
<li><a href="#trunkLayoutTestsfastprofilerstopthenfunctioncallhtml">trunk/LayoutTests/fast/profiler/stop-then-function-call.html</a></li>
<li><a href="#trunkLayoutTestsfastprofilerthrowexceptionfromevalhtmldisabled">trunk/LayoutTests/fast/profiler/throw-exception-from-eval.html-disabled</a></li>
<li><a href="#trunkLayoutTestsfastprofilertwoexecutioncontextshtml">trunk/LayoutTests/fast/profiler/two-execution-contexts.html</a></li>
<li><a href="#trunkLayoutTestsfastprofileruserdefinedfunctioncallsbuiltinfunctionshtml">trunk/LayoutTests/fast/profiler/user-defined-function-calls-built-in-functions.html</a></li>
<li><a href="#trunkLayoutTestsfastprofilerwindowdotevalhtml">trunk/LayoutTests/fast/profiler/window-dot-eval.html</a></li>
<li><a href="#trunkLayoutTestsinspectorsamplingprofilerevalsourceurlhtml">trunk/LayoutTests/inspector/sampling-profiler/eval-source-url.html</a></li>
<li><a href="#trunkSourceJavaScriptCoreChangeLog">trunk/Source/JavaScriptCore/ChangeLog</a></li>
<li><a href="#trunkSourceJavaScriptCorejsccpp">trunk/Source/JavaScriptCore/jsc.cpp</a></li>
<li><a href="#trunkSourceJavaScriptCoreruntimeExecutablecpp">trunk/Source/JavaScriptCore/runtime/Executable.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="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</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="#trunkSourceWebCoreinspectorInspectorControllercpp">trunk/Source/WebCore/inspector/InspectorController.cpp</a></li>
<li><a href="#trunkSourceWebCoreinspectorInspectorControllerh">trunk/Source/WebCore/inspector/InspectorController.h</a></li>
<li><a href="#trunkSourceWebCoreinspectorInspectorTimelineAgentcpp">trunk/Source/WebCore/inspector/InspectorTimelineAgent.cpp</a></li>
<li><a href="#trunkSourceWebCorepagePageConsoleClientcpp">trunk/Source/WebCore/page/PageConsoleClient.cpp</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="#trunkSourceWebKitwinWebInspectorcpp">trunk/Source/WebKit/win/WebInspector.cpp</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (195915 => 195916)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog 2016-01-31 00:24:23 UTC (rev 195915)
+++ trunk/LayoutTests/ChangeLog 2016-01-31 00:41:57 UTC (rev 195916)
</span><span class="lines">@@ -1,3 +1,21 @@
</span><ins>+2016-01-30 Commit Queue <commit-queue@webkit.org>
+
+ Unreviewed, rolling out r195799 and r195828.
+ https://bugs.webkit.org/show_bug.cgi?id=153722
+
+ Caused assertion failures, severely affecting EWS (Requested
+ by ap on #webkit).
+
+ Reverted changesets:
+
+ "Web Inspector: InspectorTimelineAgent doesn't need to
+ recompile functions because it now uses the sampling profiler"
+ https://bugs.webkit.org/show_bug.cgi?id=153500
+ http://trac.webkit.org/changeset/195799
+
+ "Attempt to fix the Windows build after r195799"
+ http://trac.webkit.org/changeset/195828
+
</ins><span class="cx"> 2016-01-30 Brady Eidson <beidson@apple.com>
</span><span class="cx">
</span><span class="cx"> Modern IDB: Some tests crash with specific odd database names.
</span></span></pre></div>
<a id="trunkLayoutTestsfastprofileranonymouseventhandlerhtml"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/fast/profiler/anonymous-event-handler.html (195915 => 195916)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/profiler/anonymous-event-handler.html 2016-01-31 00:24:23 UTC (rev 195915)
+++ trunk/LayoutTests/fast/profiler/anonymous-event-handler.html 2016-01-31 00:41:57 UTC (rev 195916)
</span><span class="lines">@@ -5,7 +5,7 @@
</span><span class="cx"> if (window.testRunner)
</span><span class="cx"> testRunner.dumpAsText();
</span><span class="cx"> if (window.internals)
</span><del>- internals.setLegacyJavaScriptProfilingEnabled(true);
</del><ins>+ internals.setJavaScriptProfilingEnabled(true);
</ins><span class="cx">
</span><span class="cx"> function startTest()
</span><span class="cx"> {
</span></span></pre></div>
<a id="trunkLayoutTestsfastprofileranonymousfunctioncalledfromdifferentcontextshtml"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/fast/profiler/anonymous-function-called-from-different-contexts.html (195915 => 195916)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/profiler/anonymous-function-called-from-different-contexts.html 2016-01-31 00:24:23 UTC (rev 195915)
+++ trunk/LayoutTests/fast/profiler/anonymous-function-called-from-different-contexts.html 2016-01-31 00:41:57 UTC (rev 195916)
</span><span class="lines">@@ -5,7 +5,7 @@
</span><span class="cx"> if (window.testRunner)
</span><span class="cx"> testRunner.dumpAsText();
</span><span class="cx"> if (window.internals)
</span><del>- internals.setLegacyJavaScriptProfilingEnabled(true);
</del><ins>+ internals.setJavaScriptProfilingEnabled(true);
</ins><span class="cx">
</span><span class="cx"> function startTest()
</span><span class="cx"> {
</span></span></pre></div>
<a id="trunkLayoutTestsfastprofileranonymousfunctioncallsbuiltinfunctionshtml"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/fast/profiler/anonymous-function-calls-built-in-functions.html (195915 => 195916)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/profiler/anonymous-function-calls-built-in-functions.html 2016-01-31 00:24:23 UTC (rev 195915)
+++ trunk/LayoutTests/fast/profiler/anonymous-function-calls-built-in-functions.html 2016-01-31 00:41:57 UTC (rev 195916)
</span><span class="lines">@@ -5,7 +5,7 @@
</span><span class="cx"> if (window.testRunner)
</span><span class="cx"> testRunner.dumpAsText();
</span><span class="cx"> if (window.internals)
</span><del>- internals.setLegacyJavaScriptProfilingEnabled(true);
</del><ins>+ internals.setJavaScriptProfilingEnabled(true);
</ins><span class="cx">
</span><span class="cx"> function startTest()
</span><span class="cx"> {
</span></span></pre></div>
<a id="trunkLayoutTestsfastprofileranonymousfunctioncallsevalhtml"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/fast/profiler/anonymous-function-calls-eval.html (195915 => 195916)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/profiler/anonymous-function-calls-eval.html 2016-01-31 00:24:23 UTC (rev 195915)
+++ trunk/LayoutTests/fast/profiler/anonymous-function-calls-eval.html 2016-01-31 00:41:57 UTC (rev 195916)
</span><span class="lines">@@ -5,7 +5,7 @@
</span><span class="cx"> if (window.testRunner)
</span><span class="cx"> testRunner.dumpAsText();
</span><span class="cx"> if (window.internals)
</span><del>- internals.setLegacyJavaScriptProfilingEnabled(true);
</del><ins>+ internals.setJavaScriptProfilingEnabled(true);
</ins><span class="cx">
</span><span class="cx"> function startTest()
</span><span class="cx"> {
</span></span></pre></div>
<a id="trunkLayoutTestsfastprofileranonymousfunctionswithdisplaynameshtml"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/fast/profiler/anonymous-functions-with-display-names.html (195915 => 195916)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/profiler/anonymous-functions-with-display-names.html 2016-01-31 00:24:23 UTC (rev 195915)
+++ trunk/LayoutTests/fast/profiler/anonymous-functions-with-display-names.html 2016-01-31 00:41:57 UTC (rev 195916)
</span><span class="lines">@@ -5,7 +5,7 @@
</span><span class="cx"> if (window.testRunner)
</span><span class="cx"> testRunner.dumpAsText();
</span><span class="cx"> if (window.internals)
</span><del>- internals.setLegacyJavaScriptProfilingEnabled(true);
</del><ins>+ internals.setJavaScriptProfilingEnabled(true);
</ins><span class="cx">
</span><span class="cx"> function anonymousFunctionGenerator(iterations)
</span><span class="cx"> {
</span></span></pre></div>
<a id="trunkLayoutTestsfastprofilerapplyhtml"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/fast/profiler/apply.html (195915 => 195916)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/profiler/apply.html 2016-01-31 00:24:23 UTC (rev 195915)
+++ trunk/LayoutTests/fast/profiler/apply.html 2016-01-31 00:41:57 UTC (rev 195916)
</span><span class="lines">@@ -5,7 +5,7 @@
</span><span class="cx"> if (window.testRunner)
</span><span class="cx"> testRunner.dumpAsText();
</span><span class="cx"> if (window.internals)
</span><del>- internals.setLegacyJavaScriptProfilingEnabled(true);
</del><ins>+ internals.setJavaScriptProfilingEnabled(true);
</ins><span class="cx">
</span><span class="cx"> function startTest()
</span><span class="cx"> {
</span></span></pre></div>
<a id="trunkLayoutTestsfastprofilerbuiltinfunctioncallsanonymoushtml"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/fast/profiler/built-in-function-calls-anonymous.html (195915 => 195916)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/profiler/built-in-function-calls-anonymous.html 2016-01-31 00:24:23 UTC (rev 195915)
+++ trunk/LayoutTests/fast/profiler/built-in-function-calls-anonymous.html 2016-01-31 00:41:57 UTC (rev 195916)
</span><span class="lines">@@ -5,7 +5,7 @@
</span><span class="cx"> if (window.testRunner)
</span><span class="cx"> testRunner.dumpAsText();
</span><span class="cx"> if (window.internals)
</span><del>- internals.setLegacyJavaScriptProfilingEnabled(true);
</del><ins>+ internals.setJavaScriptProfilingEnabled(true);
</ins><span class="cx">
</span><span class="cx"> function startTest()
</span><span class="cx"> {
</span></span></pre></div>
<a id="trunkLayoutTestsfastprofilerbuiltinfunctioncallsuserdefinedfunctionhtml"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/fast/profiler/built-in-function-calls-user-defined-function.html (195915 => 195916)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/profiler/built-in-function-calls-user-defined-function.html 2016-01-31 00:24:23 UTC (rev 195915)
+++ trunk/LayoutTests/fast/profiler/built-in-function-calls-user-defined-function.html 2016-01-31 00:41:57 UTC (rev 195916)
</span><span class="lines">@@ -5,7 +5,7 @@
</span><span class="cx"> if (window.testRunner)
</span><span class="cx"> testRunner.dumpAsText();
</span><span class="cx"> if (window.internals)
</span><del>- internals.setLegacyJavaScriptProfilingEnabled(true);
</del><ins>+ internals.setJavaScriptProfilingEnabled(true);
</ins><span class="cx">
</span><span class="cx"> function startTest()
</span><span class="cx"> {
</span></span></pre></div>
<a id="trunkLayoutTestsfastprofilercallregisterleakhtml"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/fast/profiler/call-register-leak.html (195915 => 195916)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/profiler/call-register-leak.html 2016-01-31 00:24:23 UTC (rev 195915)
+++ trunk/LayoutTests/fast/profiler/call-register-leak.html 2016-01-31 00:41:57 UTC (rev 195916)
</span><span class="lines">@@ -4,7 +4,7 @@
</span><span class="cx"> if (window.testRunner)
</span><span class="cx"> testRunner.dumpAsText();
</span><span class="cx"> if (window.internals)
</span><del>- internals.setLegacyJavaScriptProfilingEnabled(true);
</del><ins>+ internals.setJavaScriptProfilingEnabled(true);
</ins><span class="cx">
</span><span class="cx"> function log(s)
</span><span class="cx"> {
</span></span></pre></div>
<a id="trunkLayoutTestsfastprofilercallhtml"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/fast/profiler/call.html (195915 => 195916)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/profiler/call.html 2016-01-31 00:24:23 UTC (rev 195915)
+++ trunk/LayoutTests/fast/profiler/call.html 2016-01-31 00:41:57 UTC (rev 195916)
</span><span class="lines">@@ -5,7 +5,7 @@
</span><span class="cx"> if (window.testRunner)
</span><span class="cx"> testRunner.dumpAsText();
</span><span class="cx"> if (window.internals)
</span><del>- internals.setLegacyJavaScriptProfilingEnabled(true);
</del><ins>+ internals.setJavaScriptProfilingEnabled(true);
</ins><span class="cx">
</span><span class="cx"> function startTest()
</span><span class="cx"> {
</span></span></pre></div>
<a id="trunkLayoutTestsfastprofilercallingthefunctionthatstartedtheprofilerfromanotherscopehtml"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/fast/profiler/calling-the-function-that-started-the-profiler-from-another-scope.html (195915 => 195916)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/profiler/calling-the-function-that-started-the-profiler-from-another-scope.html 2016-01-31 00:24:23 UTC (rev 195915)
+++ trunk/LayoutTests/fast/profiler/calling-the-function-that-started-the-profiler-from-another-scope.html 2016-01-31 00:41:57 UTC (rev 195916)
</span><span class="lines">@@ -5,7 +5,7 @@
</span><span class="cx"> if (window.testRunner)
</span><span class="cx"> testRunner.dumpAsText();
</span><span class="cx"> if (window.internals)
</span><del>- internals.setLegacyJavaScriptProfilingEnabled(true);
</del><ins>+ internals.setJavaScriptProfilingEnabled(true);
</ins><span class="cx">
</span><span class="cx"> function startTest()
</span><span class="cx"> {
</span></span></pre></div>
<a id="trunkLayoutTestsfastprofilercomparemultipleprofileshtml"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/fast/profiler/compare-multiple-profiles.html (195915 => 195916)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/profiler/compare-multiple-profiles.html 2016-01-31 00:24:23 UTC (rev 195915)
+++ trunk/LayoutTests/fast/profiler/compare-multiple-profiles.html 2016-01-31 00:41:57 UTC (rev 195916)
</span><span class="lines">@@ -5,7 +5,7 @@
</span><span class="cx"> if (window.testRunner)
</span><span class="cx"> testRunner.dumpAsText();
</span><span class="cx"> if (window.internals)
</span><del>- internals.setLegacyJavaScriptProfilingEnabled(true);
</del><ins>+ internals.setJavaScriptProfilingEnabled(true);
</ins><span class="cx">
</span><span class="cx"> var j = 0;
</span><span class="cx"> function test(len) {
</span></span></pre></div>
<a id="trunkLayoutTestsfastprofilerconstructorhtml"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/fast/profiler/constructor.html (195915 => 195916)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/profiler/constructor.html 2016-01-31 00:24:23 UTC (rev 195915)
+++ trunk/LayoutTests/fast/profiler/constructor.html 2016-01-31 00:41:57 UTC (rev 195916)
</span><span class="lines">@@ -5,7 +5,7 @@
</span><span class="cx"> if (window.testRunner)
</span><span class="cx"> testRunner.dumpAsText();
</span><span class="cx"> if (window.internals)
</span><del>- internals.setLegacyJavaScriptProfilingEnabled(true);
</del><ins>+ internals.setJavaScriptProfilingEnabled(true);
</ins><span class="cx">
</span><span class="cx"> function startTest()
</span><span class="cx"> {
</span></span></pre></div>
<a id="trunkLayoutTestsfastprofilerdeadtimehtml"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/fast/profiler/dead-time.html (195915 => 195916)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/profiler/dead-time.html 2016-01-31 00:24:23 UTC (rev 195915)
+++ trunk/LayoutTests/fast/profiler/dead-time.html 2016-01-31 00:41:57 UTC (rev 195916)
</span><span class="lines">@@ -7,7 +7,7 @@
</span><span class="cx"> testRunner.waitUntilDone();
</span><span class="cx"> }
</span><span class="cx"> if (window.internals)
</span><del>- internals.setLegacyJavaScriptProfilingEnabled(true);
</del><ins>+ internals.setJavaScriptProfilingEnabled(true);
</ins><span class="cx">
</span><span class="cx"> function startTest()
</span><span class="cx"> {
</span></span></pre></div>
<a id="trunkLayoutTestsfastprofilerdocumentdotwritehtml"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/fast/profiler/document-dot-write.html (195915 => 195916)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/profiler/document-dot-write.html 2016-01-31 00:24:23 UTC (rev 195915)
+++ trunk/LayoutTests/fast/profiler/document-dot-write.html 2016-01-31 00:41:57 UTC (rev 195916)
</span><span class="lines">@@ -5,7 +5,7 @@
</span><span class="cx"> if (window.testRunner)
</span><span class="cx"> testRunner.dumpAsText();
</span><span class="cx"> if (window.internals)
</span><del>- internals.setLegacyJavaScriptProfilingEnabled(true);
</del><ins>+ internals.setJavaScriptProfilingEnabled(true);
</ins><span class="cx">
</span><span class="cx"> function startTest()
</span><span class="cx"> {
</span></span></pre></div>
<a id="trunkLayoutTestsfastprofilereventhandlerhtml"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/fast/profiler/event-handler.html (195915 => 195916)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/profiler/event-handler.html 2016-01-31 00:24:23 UTC (rev 195915)
+++ trunk/LayoutTests/fast/profiler/event-handler.html 2016-01-31 00:41:57 UTC (rev 195916)
</span><span class="lines">@@ -5,7 +5,7 @@
</span><span class="cx"> if (window.testRunner)
</span><span class="cx"> testRunner.dumpAsText();
</span><span class="cx"> if (window.internals)
</span><del>- internals.setLegacyJavaScriptProfilingEnabled(true);
</del><ins>+ internals.setJavaScriptProfilingEnabled(true);
</ins><span class="cx">
</span><span class="cx"> function startTest()
</span><span class="cx"> {
</span></span></pre></div>
<a id="trunkLayoutTestsfastprofilerexecutioncontextandevalonsamelinehtml"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/fast/profiler/execution-context-and-eval-on-same-line.html (195915 => 195916)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/profiler/execution-context-and-eval-on-same-line.html 2016-01-31 00:24:23 UTC (rev 195915)
+++ trunk/LayoutTests/fast/profiler/execution-context-and-eval-on-same-line.html 2016-01-31 00:41:57 UTC (rev 195916)
</span><span class="lines">@@ -5,7 +5,7 @@
</span><span class="cx"> if (window.testRunner)
</span><span class="cx"> testRunner.dumpAsText();
</span><span class="cx"> if (window.internals)
</span><del>- internals.setLegacyJavaScriptProfilingEnabled(true);
</del><ins>+ internals.setJavaScriptProfilingEnabled(true);
</ins><span class="cx">
</span><span class="cx"> function startTest()
</span><span class="cx"> {
</span></span></pre></div>
<a id="trunkLayoutTestsfastprofilerinlineeventhandlerhtml"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/fast/profiler/inline-event-handler.html (195915 => 195916)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/profiler/inline-event-handler.html 2016-01-31 00:24:23 UTC (rev 195915)
+++ trunk/LayoutTests/fast/profiler/inline-event-handler.html 2016-01-31 00:41:57 UTC (rev 195916)
</span><span class="lines">@@ -5,7 +5,7 @@
</span><span class="cx"> if (window.testRunner)
</span><span class="cx"> testRunner.dumpAsText();
</span><span class="cx"> if (window.internals)
</span><del>- internals.setLegacyJavaScriptProfilingEnabled(true);
</del><ins>+ internals.setJavaScriptProfilingEnabled(true);
</ins><span class="cx">
</span><span class="cx"> function startTest()
</span><span class="cx"> {
</span></span></pre></div>
<a id="trunkLayoutTestsfastprofilermanycallsinthesamescopehtml"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/fast/profiler/many-calls-in-the-same-scope.html (195915 => 195916)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/profiler/many-calls-in-the-same-scope.html 2016-01-31 00:24:23 UTC (rev 195915)
+++ trunk/LayoutTests/fast/profiler/many-calls-in-the-same-scope.html 2016-01-31 00:41:57 UTC (rev 195916)
</span><span class="lines">@@ -5,7 +5,7 @@
</span><span class="cx"> if (window.testRunner)
</span><span class="cx"> testRunner.dumpAsText();
</span><span class="cx"> if (window.internals)
</span><del>- internals.setLegacyJavaScriptProfilingEnabled(true);
</del><ins>+ internals.setJavaScriptProfilingEnabled(true);
</ins><span class="cx">
</span><span class="cx"> function startTest()
</span><span class="cx"> {
</span></span></pre></div>
<a id="trunkLayoutTestsfastprofilermultipleanddifferentscopedanonymousfunctioncallshtml"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/fast/profiler/multiple-and-different-scoped-anonymous-function-calls.html (195915 => 195916)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/profiler/multiple-and-different-scoped-anonymous-function-calls.html 2016-01-31 00:24:23 UTC (rev 195915)
+++ trunk/LayoutTests/fast/profiler/multiple-and-different-scoped-anonymous-function-calls.html 2016-01-31 00:41:57 UTC (rev 195916)
</span><span class="lines">@@ -5,7 +5,7 @@
</span><span class="cx"> if (window.testRunner)
</span><span class="cx"> testRunner.dumpAsText();
</span><span class="cx"> if (window.internals)
</span><del>- internals.setLegacyJavaScriptProfilingEnabled(true);
</del><ins>+ internals.setJavaScriptProfilingEnabled(true);
</ins><span class="cx">
</span><span class="cx"> function startTest()
</span><span class="cx"> {
</span></span></pre></div>
<a id="trunkLayoutTestsfastprofilermultipleanddifferentscopedfunctioncallshtml"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/fast/profiler/multiple-and-different-scoped-function-calls.html (195915 => 195916)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/profiler/multiple-and-different-scoped-function-calls.html 2016-01-31 00:24:23 UTC (rev 195915)
+++ trunk/LayoutTests/fast/profiler/multiple-and-different-scoped-function-calls.html 2016-01-31 00:41:57 UTC (rev 195916)
</span><span class="lines">@@ -5,7 +5,7 @@
</span><span class="cx"> if (window.testRunner)
</span><span class="cx"> testRunner.dumpAsText();
</span><span class="cx"> if (window.internals)
</span><del>- internals.setLegacyJavaScriptProfilingEnabled(true);
</del><ins>+ internals.setJavaScriptProfilingEnabled(true);
</ins><span class="cx">
</span><span class="cx"> function startTest()
</span><span class="cx"> {
</span></span></pre></div>
<a id="trunkLayoutTestsfastprofilermultipleanonymousfunctionscalledfromthesamefunctionhtml"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/fast/profiler/multiple-anonymous-functions-called-from-the-same-function.html (195915 => 195916)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/profiler/multiple-anonymous-functions-called-from-the-same-function.html 2016-01-31 00:24:23 UTC (rev 195915)
+++ trunk/LayoutTests/fast/profiler/multiple-anonymous-functions-called-from-the-same-function.html 2016-01-31 00:41:57 UTC (rev 195916)
</span><span class="lines">@@ -5,7 +5,7 @@
</span><span class="cx"> if (window.testRunner)
</span><span class="cx"> testRunner.dumpAsText();
</span><span class="cx"> if (window.internals)
</span><del>- internals.setLegacyJavaScriptProfilingEnabled(true);
</del><ins>+ internals.setJavaScriptProfilingEnabled(true);
</ins><span class="cx">
</span><span class="cx"> function startTest()
</span><span class="cx"> {
</span></span></pre></div>
<a id="trunkLayoutTestsfastprofilermultipleframeshtml"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/fast/profiler/multiple-frames.html (195915 => 195916)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/profiler/multiple-frames.html 2016-01-31 00:24:23 UTC (rev 195915)
+++ trunk/LayoutTests/fast/profiler/multiple-frames.html 2016-01-31 00:41:57 UTC (rev 195916)
</span><span class="lines">@@ -5,7 +5,7 @@
</span><span class="cx"> if (window.testRunner)
</span><span class="cx"> testRunner.dumpAsText();
</span><span class="cx"> if (window.internals)
</span><del>- internals.setLegacyJavaScriptProfilingEnabled(true);
</del><ins>+ internals.setJavaScriptProfilingEnabled(true);
</ins><span class="cx">
</span><span class="cx"> function startTest()
</span><span class="cx"> {
</span></span></pre></div>
<a id="trunkLayoutTestsfastprofilernamedfunctionswithdisplaynameshtml"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/fast/profiler/named-functions-with-display-names.html (195915 => 195916)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/profiler/named-functions-with-display-names.html 2016-01-31 00:24:23 UTC (rev 195915)
+++ trunk/LayoutTests/fast/profiler/named-functions-with-display-names.html 2016-01-31 00:41:57 UTC (rev 195916)
</span><span class="lines">@@ -5,7 +5,7 @@
</span><span class="cx"> if (window.testRunner)
</span><span class="cx"> testRunner.dumpAsText();
</span><span class="cx"> if (window.internals)
</span><del>- internals.setLegacyJavaScriptProfilingEnabled(true);
</del><ins>+ internals.setJavaScriptProfilingEnabled(true);
</ins><span class="cx">
</span><span class="cx"> function function0()
</span><span class="cx"> {
</span></span></pre></div>
<a id="trunkLayoutTestsfastprofilernestedanonymousfunctonhtml"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/fast/profiler/nested-anonymous-functon.html (195915 => 195916)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/profiler/nested-anonymous-functon.html 2016-01-31 00:24:23 UTC (rev 195915)
+++ trunk/LayoutTests/fast/profiler/nested-anonymous-functon.html 2016-01-31 00:41:57 UTC (rev 195916)
</span><span class="lines">@@ -5,7 +5,7 @@
</span><span class="cx"> if (window.testRunner)
</span><span class="cx"> testRunner.dumpAsText();
</span><span class="cx"> if (window.internals)
</span><del>- internals.setLegacyJavaScriptProfilingEnabled(true);
</del><ins>+ internals.setJavaScriptProfilingEnabled(true);
</ins><span class="cx">
</span><span class="cx"> function startTest()
</span><span class="cx"> {
</span></span></pre></div>
<a id="trunkLayoutTestsfastprofilernestedstartandstopprofilerhtml"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/fast/profiler/nested-start-and-stop-profiler.html (195915 => 195916)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/profiler/nested-start-and-stop-profiler.html 2016-01-31 00:24:23 UTC (rev 195915)
+++ trunk/LayoutTests/fast/profiler/nested-start-and-stop-profiler.html 2016-01-31 00:41:57 UTC (rev 195916)
</span><span class="lines">@@ -5,7 +5,7 @@
</span><span class="cx"> if (window.testRunner)
</span><span class="cx"> testRunner.dumpAsText();
</span><span class="cx"> if (window.internals)
</span><del>- internals.setLegacyJavaScriptProfilingEnabled(true);
</del><ins>+ internals.setJavaScriptProfilingEnabled(true);
</ins><span class="cx">
</span><span class="cx"> function startTest()
</span><span class="cx"> {
</span></span></pre></div>
<a id="trunkLayoutTestsfastprofilernoexecutioncontexthtml"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/fast/profiler/no-execution-context.html (195915 => 195916)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/profiler/no-execution-context.html 2016-01-31 00:24:23 UTC (rev 195915)
+++ trunk/LayoutTests/fast/profiler/no-execution-context.html 2016-01-31 00:41:57 UTC (rev 195916)
</span><span class="lines">@@ -5,7 +5,7 @@
</span><span class="cx"> if (window.testRunner)
</span><span class="cx"> testRunner.dumpAsText();
</span><span class="cx"> if (window.internals)
</span><del>- internals.setLegacyJavaScriptProfilingEnabled(true);
</del><ins>+ internals.setJavaScriptProfilingEnabled(true);
</ins><span class="cx"> </script>
</span><span class="cx"> </head>
</span><span class="cx">
</span></span></pre></div>
<a id="trunkLayoutTestsfastprofileroneexecutioncontexthtml"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/fast/profiler/one-execution-context.html (195915 => 195916)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/profiler/one-execution-context.html 2016-01-31 00:24:23 UTC (rev 195915)
+++ trunk/LayoutTests/fast/profiler/one-execution-context.html 2016-01-31 00:41:57 UTC (rev 195916)
</span><span class="lines">@@ -5,7 +5,7 @@
</span><span class="cx"> if (window.testRunner)
</span><span class="cx"> testRunner.dumpAsText();
</span><span class="cx"> if (window.internals)
</span><del>- internals.setLegacyJavaScriptProfilingEnabled(true);
</del><ins>+ internals.setJavaScriptProfilingEnabled(true);
</ins><span class="cx">
</span><span class="cx"> function startTest()
</span><span class="cx"> {
</span></span></pre></div>
<a id="trunkLayoutTestsfastprofilerprofilecallsinincludedfilehtml"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/fast/profiler/profile-calls-in-included-file.html (195915 => 195916)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/profiler/profile-calls-in-included-file.html 2016-01-31 00:24:23 UTC (rev 195915)
+++ trunk/LayoutTests/fast/profiler/profile-calls-in-included-file.html 2016-01-31 00:41:57 UTC (rev 195916)
</span><span class="lines">@@ -5,7 +5,7 @@
</span><span class="cx"> if (window.testRunner)
</span><span class="cx"> testRunner.dumpAsText();
</span><span class="cx"> if (window.internals)
</span><del>- internals.setLegacyJavaScriptProfilingEnabled(true);
</del><ins>+ internals.setJavaScriptProfilingEnabled(true);
</ins><span class="cx">
</span><span class="cx"> function startTest()
</span><span class="cx"> {
</span></span></pre></div>
<a id="trunkLayoutTestsfastprofilerprofilewithnotitlehtml"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/fast/profiler/profile-with-no-title.html (195915 => 195916)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/profiler/profile-with-no-title.html 2016-01-31 00:24:23 UTC (rev 195915)
+++ trunk/LayoutTests/fast/profiler/profile-with-no-title.html 2016-01-31 00:41:57 UTC (rev 195916)
</span><span class="lines">@@ -5,7 +5,7 @@
</span><span class="cx"> if (window.testRunner)
</span><span class="cx"> testRunner.dumpAsText();
</span><span class="cx"> if (window.internals)
</span><del>- internals.setLegacyJavaScriptProfilingEnabled(true);
</del><ins>+ internals.setJavaScriptProfilingEnabled(true);
</ins><span class="cx">
</span><span class="cx"> function startTest()
</span><span class="cx"> {
</span></span></pre></div>
<a id="trunkLayoutTestsfastprofilerprofilingfromanestedlocationbutstopprofilingoutsidethenestinghtml"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/fast/profiler/profiling-from-a-nested-location-but-stop-profiling-outside-the-nesting.html (195915 => 195916)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/profiler/profiling-from-a-nested-location-but-stop-profiling-outside-the-nesting.html 2016-01-31 00:24:23 UTC (rev 195915)
+++ trunk/LayoutTests/fast/profiler/profiling-from-a-nested-location-but-stop-profiling-outside-the-nesting.html 2016-01-31 00:41:57 UTC (rev 195916)
</span><span class="lines">@@ -5,7 +5,7 @@
</span><span class="cx"> if (window.testRunner)
</span><span class="cx"> testRunner.dumpAsText();
</span><span class="cx"> if (window.internals)
</span><del>- internals.setLegacyJavaScriptProfilingEnabled(true);
</del><ins>+ internals.setJavaScriptProfilingEnabled(true);
</ins><span class="cx">
</span><span class="cx"> function startTest()
</span><span class="cx"> {
</span></span></pre></div>
<a id="trunkLayoutTestsfastprofilerprofilingfromanestedlocationhtml"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/fast/profiler/profiling-from-a-nested-location.html (195915 => 195916)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/profiler/profiling-from-a-nested-location.html 2016-01-31 00:24:23 UTC (rev 195915)
+++ trunk/LayoutTests/fast/profiler/profiling-from-a-nested-location.html 2016-01-31 00:41:57 UTC (rev 195916)
</span><span class="lines">@@ -5,7 +5,7 @@
</span><span class="cx"> if (window.testRunner)
</span><span class="cx"> testRunner.dumpAsText();
</span><span class="cx"> if (window.internals)
</span><del>- internals.setLegacyJavaScriptProfilingEnabled(true);
</del><ins>+ internals.setJavaScriptProfilingEnabled(true);
</ins><span class="cx">
</span><span class="cx"> function startTest()
</span><span class="cx"> {
</span></span></pre></div>
<a id="trunkLayoutTestsfastprofilersimpleeventcallhtml"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/fast/profiler/simple-event-call.html (195915 => 195916)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/profiler/simple-event-call.html 2016-01-31 00:24:23 UTC (rev 195915)
+++ trunk/LayoutTests/fast/profiler/simple-event-call.html 2016-01-31 00:41:57 UTC (rev 195916)
</span><span class="lines">@@ -5,7 +5,7 @@
</span><span class="cx"> if (window.testRunner)
</span><span class="cx"> testRunner.dumpAsText();
</span><span class="cx"> if (window.internals)
</span><del>- internals.setLegacyJavaScriptProfilingEnabled(true);
</del><ins>+ internals.setJavaScriptProfilingEnabled(true);
</ins><span class="cx">
</span><span class="cx"> function startTest()
</span><span class="cx"> {
</span></span></pre></div>
<a id="trunkLayoutTestsfastprofilersimplenolevelchangehtml"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/fast/profiler/simple-no-level-change.html (195915 => 195916)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/profiler/simple-no-level-change.html 2016-01-31 00:24:23 UTC (rev 195915)
+++ trunk/LayoutTests/fast/profiler/simple-no-level-change.html 2016-01-31 00:41:57 UTC (rev 195916)
</span><span class="lines">@@ -5,7 +5,7 @@
</span><span class="cx"> if (window.testRunner)
</span><span class="cx"> testRunner.dumpAsText();
</span><span class="cx"> if (window.internals)
</span><del>- internals.setLegacyJavaScriptProfilingEnabled(true);
</del><ins>+ internals.setJavaScriptProfilingEnabled(true);
</ins><span class="cx">
</span><span class="cx"> function startTest()
</span><span class="cx"> {
</span></span></pre></div>
<a id="trunkLayoutTestsfastprofilerstartandstopprofilermultipletimeshtml"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/fast/profiler/start-and-stop-profiler-multiple-times.html (195915 => 195916)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/profiler/start-and-stop-profiler-multiple-times.html 2016-01-31 00:24:23 UTC (rev 195915)
+++ trunk/LayoutTests/fast/profiler/start-and-stop-profiler-multiple-times.html 2016-01-31 00:41:57 UTC (rev 195916)
</span><span class="lines">@@ -5,7 +5,7 @@
</span><span class="cx"> if (window.testRunner)
</span><span class="cx"> testRunner.dumpAsText();
</span><span class="cx"> if (window.internals)
</span><del>- internals.setLegacyJavaScriptProfilingEnabled(true);
</del><ins>+ internals.setJavaScriptProfilingEnabled(true);
</ins><span class="cx">
</span><span class="cx"> function startTest()
</span><span class="cx"> {
</span></span></pre></div>
<a id="trunkLayoutTestsfastprofilerstartandstopprofilinginthesamefunctionhtml"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/fast/profiler/start-and-stop-profiling-in-the-same-function.html (195915 => 195916)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/profiler/start-and-stop-profiling-in-the-same-function.html 2016-01-31 00:24:23 UTC (rev 195915)
+++ trunk/LayoutTests/fast/profiler/start-and-stop-profiling-in-the-same-function.html 2016-01-31 00:41:57 UTC (rev 195916)
</span><span class="lines">@@ -5,7 +5,7 @@
</span><span class="cx"> if (window.testRunner)
</span><span class="cx"> testRunner.dumpAsText();
</span><span class="cx"> if (window.internals)
</span><del>- internals.setLegacyJavaScriptProfilingEnabled(true);
</del><ins>+ internals.setJavaScriptProfilingEnabled(true);
</ins><span class="cx">
</span><span class="cx"> function startTest()
</span><span class="cx"> {
</span></span></pre></div>
<a id="trunkLayoutTestsfastprofilerstartbutdontstopprofilinghtml"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/fast/profiler/start-but-dont-stop-profiling.html (195915 => 195916)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/profiler/start-but-dont-stop-profiling.html 2016-01-31 00:24:23 UTC (rev 195915)
+++ trunk/LayoutTests/fast/profiler/start-but-dont-stop-profiling.html 2016-01-31 00:41:57 UTC (rev 195916)
</span><span class="lines">@@ -5,7 +5,7 @@
</span><span class="cx"> if (window.testRunner)
</span><span class="cx"> testRunner.dumpAsText();
</span><span class="cx"> if (window.internals)
</span><del>- internals.setLegacyJavaScriptProfilingEnabled(true);
</del><ins>+ internals.setJavaScriptProfilingEnabled(true);
</ins><span class="cx">
</span><span class="cx"> function startTest()
</span><span class="cx"> {
</span></span></pre></div>
<a id="trunkLayoutTestsfastprofilerstopprofilingaftersetTimeouthtml"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/fast/profiler/stop-profiling-after-setTimeout.html (195915 => 195916)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/profiler/stop-profiling-after-setTimeout.html 2016-01-31 00:24:23 UTC (rev 195915)
+++ trunk/LayoutTests/fast/profiler/stop-profiling-after-setTimeout.html 2016-01-31 00:41:57 UTC (rev 195916)
</span><span class="lines">@@ -7,7 +7,7 @@
</span><span class="cx"> testRunner.waitUntilDone();
</span><span class="cx"> }
</span><span class="cx"> if (window.internals)
</span><del>- internals.setLegacyJavaScriptProfilingEnabled(true);
</del><ins>+ internals.setJavaScriptProfilingEnabled(true);
</ins><span class="cx">
</span><span class="cx"> function startTest()
</span><span class="cx"> {
</span></span></pre></div>
<a id="trunkLayoutTestsfastprofilerstopthenfunctioncallhtml"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/fast/profiler/stop-then-function-call.html (195915 => 195916)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/profiler/stop-then-function-call.html 2016-01-31 00:24:23 UTC (rev 195915)
+++ trunk/LayoutTests/fast/profiler/stop-then-function-call.html 2016-01-31 00:41:57 UTC (rev 195916)
</span><span class="lines">@@ -5,7 +5,7 @@
</span><span class="cx"> if (window.testRunner)
</span><span class="cx"> testRunner.dumpAsText();
</span><span class="cx"> if (window.internals)
</span><del>- internals.setLegacyJavaScriptProfilingEnabled(true);
</del><ins>+ internals.setJavaScriptProfilingEnabled(true);
</ins><span class="cx">
</span><span class="cx"> var j = 0;
</span><span class="cx"> function test(len) {
</span></span></pre></div>
<a id="trunkLayoutTestsfastprofilerthrowexceptionfromevalhtmldisabled"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/fast/profiler/throw-exception-from-eval.html-disabled (195915 => 195916)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/profiler/throw-exception-from-eval.html-disabled 2016-01-31 00:24:23 UTC (rev 195915)
+++ trunk/LayoutTests/fast/profiler/throw-exception-from-eval.html-disabled 2016-01-31 00:41:57 UTC (rev 195916)
</span><span class="lines">@@ -5,7 +5,7 @@
</span><span class="cx"> if (window.testRunner)
</span><span class="cx"> testRunner.dumpAsText();
</span><span class="cx"> if (window.internals)
</span><del>- internals.settings.setLegacyJavaScriptProfilingEnabled(true);
</del><ins>+ internals.settings.setJavaScriptProfilingEnabled(true);
</ins><span class="cx">
</span><span class="cx"> console.profile("Throw within an eval.");
</span><span class="cx">
</span></span></pre></div>
<a id="trunkLayoutTestsfastprofilertwoexecutioncontextshtml"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/fast/profiler/two-execution-contexts.html (195915 => 195916)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/profiler/two-execution-contexts.html 2016-01-31 00:24:23 UTC (rev 195915)
+++ trunk/LayoutTests/fast/profiler/two-execution-contexts.html 2016-01-31 00:41:57 UTC (rev 195916)
</span><span class="lines">@@ -5,7 +5,7 @@
</span><span class="cx"> if (window.testRunner)
</span><span class="cx"> testRunner.dumpAsText();
</span><span class="cx"> if (window.internals)
</span><del>- internals.setLegacyJavaScriptProfilingEnabled(true);
</del><ins>+ internals.setJavaScriptProfilingEnabled(true);
</ins><span class="cx">
</span><span class="cx"> function startTest()
</span><span class="cx"> {
</span></span></pre></div>
<a id="trunkLayoutTestsfastprofileruserdefinedfunctioncallsbuiltinfunctionshtml"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/fast/profiler/user-defined-function-calls-built-in-functions.html (195915 => 195916)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/profiler/user-defined-function-calls-built-in-functions.html 2016-01-31 00:24:23 UTC (rev 195915)
+++ trunk/LayoutTests/fast/profiler/user-defined-function-calls-built-in-functions.html 2016-01-31 00:41:57 UTC (rev 195916)
</span><span class="lines">@@ -5,7 +5,7 @@
</span><span class="cx"> if (window.testRunner)
</span><span class="cx"> testRunner.dumpAsText();
</span><span class="cx"> if (window.internals)
</span><del>- internals.setLegacyJavaScriptProfilingEnabled(true);
</del><ins>+ internals.setJavaScriptProfilingEnabled(true);
</ins><span class="cx">
</span><span class="cx"> function startTest()
</span><span class="cx"> {
</span></span></pre></div>
<a id="trunkLayoutTestsfastprofilerwindowdotevalhtml"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/fast/profiler/window-dot-eval.html (195915 => 195916)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/profiler/window-dot-eval.html 2016-01-31 00:24:23 UTC (rev 195915)
+++ trunk/LayoutTests/fast/profiler/window-dot-eval.html 2016-01-31 00:41:57 UTC (rev 195916)
</span><span class="lines">@@ -5,7 +5,7 @@
</span><span class="cx"> if (window.testRunner)
</span><span class="cx"> testRunner.dumpAsText();
</span><span class="cx"> if (window.internals)
</span><del>- internals.setLegacyJavaScriptProfilingEnabled(true);
</del><ins>+ internals.setJavaScriptProfilingEnabled(true);
</ins><span class="cx">
</span><span class="cx"> function startTest()
</span><span class="cx"> {
</span></span></pre></div>
<a id="trunkLayoutTestsinspectorsamplingprofilerevalsourceurlhtml"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/inspector/sampling-profiler/eval-source-url.html (195915 => 195916)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/inspector/sampling-profiler/eval-source-url.html 2016-01-31 00:24:23 UTC (rev 195915)
+++ trunk/LayoutTests/inspector/sampling-profiler/eval-source-url.html 2016-01-31 00:41:57 UTC (rev 195916)
</span><span class="lines">@@ -21,7 +21,8 @@
</span><span class="cx"> noInline(foo);
</span><span class="cx">
</span><span class="cx"> function bar() {
</span><del>- eval("//# sourceURL=eval.js\nfoo();");
</del><ins>+ for (let i = 0; i < 2; i++)
+ eval("//# sourceURL=eval.js\nfoo();");
</ins><span class="cx"> }
</span><span class="cx"> noInline(bar);
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/ChangeLog (195915 => 195916)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/ChangeLog 2016-01-31 00:24:23 UTC (rev 195915)
+++ trunk/Source/JavaScriptCore/ChangeLog 2016-01-31 00:41:57 UTC (rev 195916)
</span><span class="lines">@@ -1,3 +1,21 @@
</span><ins>+2016-01-30 Commit Queue <commit-queue@webkit.org>
+
+ Unreviewed, rolling out r195799 and r195828.
+ https://bugs.webkit.org/show_bug.cgi?id=153722
+
+ Caused assertion failures, severely affecting EWS (Requested
+ by ap on #webkit).
+
+ Reverted changesets:
+
+ "Web Inspector: InspectorTimelineAgent doesn't need to
+ recompile functions because it now uses the sampling profiler"
+ https://bugs.webkit.org/show_bug.cgi?id=153500
+ http://trac.webkit.org/changeset/195799
+
+ "Attempt to fix the Windows build after r195799"
+ http://trac.webkit.org/changeset/195828
+
</ins><span class="cx"> 2016-01-30 Yusuke Suzuki <utatane.tea@gmail.com>
</span><span class="cx">
</span><span class="cx"> [B3] JetStream/quicksort.c fails/hangs on Linux with GCC
</span></span></pre></div>
<a id="trunkSourceJavaScriptCorejsccpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/jsc.cpp (195915 => 195916)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/jsc.cpp 2016-01-31 00:24:23 UTC (rev 195915)
+++ trunk/Source/JavaScriptCore/jsc.cpp 2016-01-31 00:41:57 UTC (rev 195916)
</span><span class="lines">@@ -777,7 +777,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 };
</del><ins>+const GlobalObjectMethodTable GlobalObject::s_globalObjectMethodTable = { &allowsAccessFrom, &supportsProfiling, &supportsRichSourceInfo, &shouldInterruptScript, &javaScriptRuntimeFlags, 0, &shouldInterruptScriptBeforeTimeout, &moduleLoaderResolve, &moduleLoaderFetch, 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="trunkSourceJavaScriptCoreruntimeExecutablecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/runtime/Executable.cpp (195915 => 195916)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/runtime/Executable.cpp 2016-01-31 00:24:23 UTC (rev 195915)
+++ trunk/Source/JavaScriptCore/runtime/Executable.cpp 2016-01-31 00:41:57 UTC (rev 195916)
</span><span class="lines">@@ -298,7 +298,7 @@
</span><span class="cx"> JSGlobalObject* globalObject = scope->globalObject();
</span><span class="cx"> ParserError error;
</span><span class="cx"> DebuggerMode debuggerMode = globalObject->hasDebugger() ? DebuggerOn : DebuggerOff;
</span><del>- ProfilerMode profilerMode = globalObject->hasLegacyProfiler() ? ProfilerOn : ProfilerOff;
</del><ins>+ ProfilerMode profilerMode = globalObject->hasProfiler() ? ProfilerOn : ProfilerOff;
</ins><span class="cx"> UnlinkedFunctionCodeBlock* unlinkedCodeBlock =
</span><span class="cx"> executable->m_unlinkedExecutable->unlinkedCodeBlockFor(
</span><span class="cx"> *vm, executable->m_source, kind, debuggerMode, profilerMode, error,
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreruntimeJSGlobalObjectcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/runtime/JSGlobalObject.cpp (195915 => 195916)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/runtime/JSGlobalObject.cpp 2016-01-31 00:24:23 UTC (rev 195915)
+++ trunk/Source/JavaScriptCore/runtime/JSGlobalObject.cpp 2016-01-31 00:41:57 UTC (rev 195916)
</span><span class="lines">@@ -173,7 +173,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 };
</del><ins>+const GlobalObjectMethodTable JSGlobalObject::s_globalObjectMethodTable = { &allowsAccessFrom, &supportsProfiling, &supportsRichSourceInfo, &shouldInterruptScript, &javaScriptRuntimeFlags, nullptr, &shouldInterruptScriptBeforeTimeout, 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">@@ -612,9 +612,12 @@
</span><span class="cx"> resetPrototype(vm, prototype());
</span><span class="cx"> }
</span><span class="cx">
</span><del>-bool JSGlobalObject::hasLegacyProfiler() const
</del><ins>+bool JSGlobalObject::hasProfiler() const
</ins><span class="cx"> {
</span><del>- return globalObjectMethodTable()->supportsLegacyProfiling(this);
</del><ins>+ if (m_debugger && m_debugger->hasProfilingClient())
+ return true;
+
+ return globalObjectMethodTable()->supportsProfiling(this);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void JSGlobalObject::put(JSCell* cell, ExecState* exec, PropertyName propertyName, JSValue value, PutPropertySlot& slot)
</span><span class="lines">@@ -976,7 +979,7 @@
</span><span class="cx"> ParserError error;
</span><span class="cx"> JSParserStrictMode strictMode = executable->isStrictMode() ? JSParserStrictMode::Strict : JSParserStrictMode::NotStrict;
</span><span class="cx"> DebuggerMode debuggerMode = hasDebugger() ? DebuggerOn : DebuggerOff;
</span><del>- ProfilerMode profilerMode = hasLegacyProfiler() ? ProfilerOn : ProfilerOff;
</del><ins>+ ProfilerMode profilerMode = hasProfiler() ? ProfilerOn : ProfilerOff;
</ins><span class="cx"> UnlinkedProgramCodeBlock* unlinkedCodeBlock = vm().codeCache()->getProgramCodeBlock(
</span><span class="cx"> vm(), executable, executable->source(), JSParserBuiltinMode::NotBuiltin, strictMode,
</span><span class="cx"> debuggerMode, profilerMode, error);
</span><span class="lines">@@ -997,7 +1000,7 @@
</span><span class="cx"> ParserError error;
</span><span class="cx"> JSParserStrictMode strictMode = executable->isStrictMode() ? JSParserStrictMode::Strict : JSParserStrictMode::NotStrict;
</span><span class="cx"> DebuggerMode debuggerMode = hasDebugger() ? DebuggerOn : DebuggerOff;
</span><del>- ProfilerMode profilerMode = hasLegacyProfiler() ? ProfilerOn : ProfilerOff;
</del><ins>+ ProfilerMode profilerMode = hasProfiler() ? ProfilerOn : ProfilerOff;
</ins><span class="cx"> UnlinkedEvalCodeBlock* unlinkedCodeBlock = vm().codeCache()->getEvalCodeBlock(
</span><span class="cx"> vm(), executable, executable->source(), JSParserBuiltinMode::NotBuiltin, strictMode, thisTDZMode, isArrowFunctionContext, debuggerMode, profilerMode, error, variablesUnderTDZ);
</span><span class="cx">
</span><span class="lines">@@ -1016,7 +1019,7 @@
</span><span class="cx"> {
</span><span class="cx"> ParserError error;
</span><span class="cx"> DebuggerMode debuggerMode = hasDebugger() ? DebuggerOn : DebuggerOff;
</span><del>- ProfilerMode profilerMode = hasLegacyProfiler() ? ProfilerOn : ProfilerOff;
</del><ins>+ ProfilerMode profilerMode = hasProfiler() ? ProfilerOn : ProfilerOff;
</ins><span class="cx"> UnlinkedModuleProgramCodeBlock* unlinkedCodeBlock = vm().codeCache()->getModuleProgramCodeBlock(
</span><span class="cx"> vm(), executable, executable->source(), JSParserBuiltinMode::NotBuiltin, debuggerMode, profilerMode, error);
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreruntimeJSGlobalObjecth"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/runtime/JSGlobalObject.h (195915 => 195916)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/runtime/JSGlobalObject.h 2016-01-31 00:24:23 UTC (rev 195915)
+++ trunk/Source/JavaScriptCore/runtime/JSGlobalObject.h 2016-01-31 00:41:57 UTC (rev 195916)
</span><span class="lines">@@ -141,8 +141,8 @@
</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><ins>+ typedef bool (*SupportsProfilingFunctionPtr)(const JSGlobalObject*);
+ SupportsProfilingFunctionPtr supportsProfiling;
</ins><span class="cx">
</span><span class="cx"> typedef bool (*SupportsRichSourceInfoFunctionPtr)(const JSGlobalObject*);
</span><span class="cx"> SupportsRichSourceInfoFunctionPtr supportsRichSourceInfo;
</span><span class="lines">@@ -360,7 +360,7 @@
</span><span class="cx"> DECLARE_EXPORT_INFO;
</span><span class="cx">
</span><span class="cx"> bool hasDebugger() const { return m_debugger; }
</span><del>- bool hasLegacyProfiler() const;
</del><ins>+ bool hasProfiler() const;
</ins><span class="cx"> const RuntimeFlags& runtimeFlags() const { return m_runtimeFlags; }
</span><span class="cx">
</span><span class="cx"> protected:
</span><span class="lines">@@ -619,7 +619,7 @@
</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><ins>+ static bool supportsProfiling(const JSGlobalObject*) { return false; }
</ins><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="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (195915 => 195916)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2016-01-31 00:24:23 UTC (rev 195915)
+++ trunk/Source/WebCore/ChangeLog 2016-01-31 00:41:57 UTC (rev 195916)
</span><span class="lines">@@ -1,3 +1,21 @@
</span><ins>+2016-01-30 Commit Queue <commit-queue@webkit.org>
+
+ Unreviewed, rolling out r195799 and r195828.
+ https://bugs.webkit.org/show_bug.cgi?id=153722
+
+ Caused assertion failures, severely affecting EWS (Requested
+ by ap on #webkit).
+
+ Reverted changesets:
+
+ "Web Inspector: InspectorTimelineAgent doesn't need to
+ recompile functions because it now uses the sampling profiler"
+ https://bugs.webkit.org/show_bug.cgi?id=153500
+ http://trac.webkit.org/changeset/195799
+
+ "Attempt to fix the Windows build after r195799"
+ http://trac.webkit.org/changeset/195828
+
</ins><span class="cx"> 2016-01-30 Brady Eidson <beidson@apple.com>
</span><span class="cx">
</span><span class="cx"> Modern IDB: Some tests crash with specific odd database names.
</span></span></pre></div>
<a id="trunkSourceWebCorebindingsjsJSDOMWindowBasecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/bindings/js/JSDOMWindowBase.cpp (195915 => 195916)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/bindings/js/JSDOMWindowBase.cpp 2016-01-31 00:24:23 UTC (rev 195915)
+++ trunk/Source/WebCore/bindings/js/JSDOMWindowBase.cpp 2016-01-31 00:41:57 UTC (rev 195916)
</span><span class="lines">@@ -63,7 +63,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 };
</del><ins>+const GlobalObjectMethodTable JSDOMWindowBase::s_globalObjectMethodTable = { &shouldAllowAccessFrom, &supportsProfiling, &supportsRichSourceInfo, &shouldInterruptScript, &javaScriptRuntimeFlags, &queueTaskToEventLoop, &shouldInterruptScriptBeforeTimeout, &moduleLoaderResolve, &moduleLoaderFetch, nullptr, nullptr, &moduleLoaderEvaluate };
</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">@@ -115,7 +115,7 @@
</span><span class="cx"> printErrorMessageForFrame(wrapped().frame(), message);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-bool JSDOMWindowBase::supportsLegacyProfiling(const JSGlobalObject* object)
</del><ins>+bool JSDOMWindowBase::supportsProfiling(const JSGlobalObject* object)
</ins><span class="cx"> {
</span><span class="cx"> const JSDOMWindowBase* thisObject = static_cast<const JSDOMWindowBase*>(object);
</span><span class="cx"> Frame* frame = thisObject->wrapped().frame();
</span><span class="lines">@@ -126,7 +126,7 @@
</span><span class="cx"> if (!page)
</span><span class="cx"> return false;
</span><span class="cx">
</span><del>- return page->inspectorController().legacyProfilerEnabled();
</del><ins>+ return page->inspectorController().profilerEnabled();
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> bool JSDOMWindowBase::supportsRichSourceInfo(const JSGlobalObject* object)
</span><span class="lines">@@ -142,7 +142,7 @@
</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><ins>+ ASSERT(enabled || !supportsProfiling(thisObject));
</ins><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 (195915 => 195916)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/bindings/js/JSDOMWindowBase.h 2016-01-31 00:24:23 UTC (rev 195915)
+++ trunk/Source/WebCore/bindings/js/JSDOMWindowBase.h 2016-01-31 00:41:57 UTC (rev 195916)
</span><span class="lines">@@ -60,7 +60,7 @@
</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><ins>+ static bool supportsProfiling(const JSC::JSGlobalObject*);
</ins><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 (195915 => 195916)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/bindings/js/JSWorkerGlobalScopeBase.cpp 2016-01-31 00:24:23 UTC (rev 195915)
+++ trunk/Source/WebCore/bindings/js/JSWorkerGlobalScopeBase.cpp 2016-01-31 00:41:57 UTC (rev 195916)
</span><span class="lines">@@ -43,7 +43,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 };
</del><ins>+const GlobalObjectMethodTable JSWorkerGlobalScopeBase::s_globalObjectMethodTable = { &allowsAccessFrom, &supportsProfiling, &supportsRichSourceInfo, &shouldInterruptScript, &javaScriptRuntimeFlags, &queueTaskToEventLoop, &shouldInterruptScriptBeforeTimeout, nullptr, nullptr, nullptr, nullptr, nullptr };
</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">@@ -72,9 +72,9 @@
</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)
</del><ins>+bool JSWorkerGlobalScopeBase::supportsProfiling(const JSGlobalObject* object)
</ins><span class="cx"> {
</span><del>- return JSGlobalObject::supportsLegacyProfiling(object);
</del><ins>+ return JSGlobalObject::supportsProfiling(object);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> bool JSWorkerGlobalScopeBase::supportsRichSourceInfo(const JSGlobalObject* object)
</span></span></pre></div>
<a id="trunkSourceWebCorebindingsjsJSWorkerGlobalScopeBaseh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/bindings/js/JSWorkerGlobalScopeBase.h (195915 => 195916)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/bindings/js/JSWorkerGlobalScopeBase.h 2016-01-31 00:24:23 UTC (rev 195915)
+++ trunk/Source/WebCore/bindings/js/JSWorkerGlobalScopeBase.h 2016-01-31 00:41:57 UTC (rev 195916)
</span><span class="lines">@@ -53,7 +53,7 @@
</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><ins>+ static bool supportsProfiling(const JSC::JSGlobalObject*);
</ins><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="trunkSourceWebCoreinspectorInspectorControllercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/inspector/InspectorController.cpp (195915 => 195916)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/inspector/InspectorController.cpp 2016-01-31 00:24:23 UTC (rev 195915)
+++ trunk/Source/WebCore/inspector/InspectorController.cpp 2016-01-31 00:41:57 UTC (rev 195916)
</span><span class="lines">@@ -403,17 +403,22 @@
</span><span class="cx"> #endif
</span><span class="cx"> }
</span><span class="cx">
</span><del>-bool InspectorController::legacyProfilerEnabled() const
</del><ins>+bool InspectorController::profilerEnabled() const
</ins><span class="cx"> {
</span><del>- return m_legacyProfilerEnabled;
</del><ins>+ return m_instrumentingAgents->persistentInspectorTimelineAgent();
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-void InspectorController::setLegacyProfilerEnabled(bool enable)
</del><ins>+void InspectorController::setProfilerEnabled(bool enable)
</ins><span class="cx"> {
</span><del>- m_legacyProfilerEnabled = enable;
</del><ins>+ ErrorString unused;
</ins><span class="cx">
</span><del>- m_instrumentingAgents->setPersistentInspectorTimelineAgent(enable ? m_timelineAgent : nullptr);
- m_scriptDebugServer.recompileAllJSFunctions();
</del><ins>+ if (enable) {
+ m_instrumentingAgents->setPersistentInspectorTimelineAgent(m_timelineAgent);
+ m_timelineAgent->start(unused);
+ } else {
+ m_instrumentingAgents->setPersistentInspectorTimelineAgent(nullptr);
+ m_timelineAgent->stop(unused);
+ }
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> bool InspectorController::developerExtrasEnabled() const
</span></span></pre></div>
<a id="trunkSourceWebCoreinspectorInspectorControllerh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/inspector/InspectorController.h (195915 => 195916)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/inspector/InspectorController.h 2016-01-31 00:24:23 UTC (rev 195915)
+++ trunk/Source/WebCore/inspector/InspectorController.h 2016-01-31 00:41:57 UTC (rev 195916)
</span><span class="lines">@@ -111,8 +111,8 @@
</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><ins>+ WEBCORE_EXPORT bool profilerEnabled() const;
+ WEBCORE_EXPORT void setProfilerEnabled(bool);
</ins><span class="cx">
</span><span class="cx"> InspectorClient* inspectorClient() const { return m_inspectorClient; }
</span><span class="cx"> InspectorPageAgent* pageAgent() const { return m_pageAgent; }
</span><span class="lines">@@ -151,7 +151,6 @@
</span><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="trunkSourceWebCoreinspectorInspectorTimelineAgentcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/inspector/InspectorTimelineAgent.cpp (195915 => 195916)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/inspector/InspectorTimelineAgent.cpp 2016-01-31 00:24:23 UTC (rev 195915)
+++ trunk/Source/WebCore/inspector/InspectorTimelineAgent.cpp 2016-01-31 00:41:57 UTC (rev 195916)
</span><span class="lines">@@ -84,12 +84,19 @@
</span><span class="cx"> void InspectorTimelineAgent::didCreateFrontendAndBackend(Inspector::FrontendRouter*, Inspector::BackendDispatcher*)
</span><span class="cx"> {
</span><span class="cx"> m_instrumentingAgents.setPersistentInspectorTimelineAgent(this);
</span><ins>+
+ // Recompile to include profiling information.
+ // FIXME: This doesn't seem like the most appropriate place.
+ m_environment.scriptDebugServer().recompileAllJSFunctions();
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-void InspectorTimelineAgent::willDestroyFrontendAndBackend(Inspector::DisconnectReason)
</del><ins>+void InspectorTimelineAgent::willDestroyFrontendAndBackend(Inspector::DisconnectReason reason)
</ins><span class="cx"> {
</span><span class="cx"> m_instrumentingAgents.setPersistentInspectorTimelineAgent(nullptr);
</span><span class="cx">
</span><ins>+ if (reason != Inspector::DisconnectReason::InspectedTargetDestroyed)
+ m_environment.scriptDebugServer().recompileAllJSFunctions();
+
</ins><span class="cx"> ErrorString unused;
</span><span class="cx"> stop(unused);
</span><span class="cx"> }
</span><span class="lines">@@ -196,10 +203,18 @@
</span><span class="cx"> return m_environment.executionStopwatch()->elapsedTime();
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+static inline void startProfiling(JSC::ExecState* exec, const String& title, RefPtr<Stopwatch>&& stopwatch)
+{
+ JSC::LegacyProfiler::profiler()->startProfiling(exec, title, WTFMove(stopwatch));
+}
+
+static inline RefPtr<JSC::Profile> stopProfiling(JSC::ExecState* exec, const String& title)
+{
+ return JSC::LegacyProfiler::profiler()->stopProfiling(exec, title);
+}
+
</ins><span class="cx"> void InspectorTimelineAgent::startFromConsole(JSC::ExecState* exec, const String &title)
</span><span class="cx"> {
</span><del>- // FIXME: <https://webkit.org/b/153499> Web Inspector: console.profile should use the new Sampling Profiler
-
</del><span class="cx"> // Only allow recording of a profile if it is anonymous (empty title) or does not match
</span><span class="cx"> // the title of an already recording profile.
</span><span class="cx"> if (!title.isEmpty()) {
</span><span class="lines">@@ -214,15 +229,13 @@
</span><span class="cx"> if (!m_enabled && m_pendingConsoleProfileRecords.isEmpty())
</span><span class="cx"> internalStart();
</span><span class="cx">
</span><del>- JSC::LegacyProfiler::profiler()->startProfiling(exec, title, m_environment.executionStopwatch());
</del><ins>+ startProfiling(exec, title, m_environment.executionStopwatch());
</ins><span class="cx">
</span><span class="cx"> m_pendingConsoleProfileRecords.append(createRecordEntry(TimelineRecordFactory::createConsoleProfileData(title), TimelineRecordType::ConsoleProfile, true, frameFromExecState(exec)));
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> RefPtr<JSC::Profile> InspectorTimelineAgent::stopFromConsole(JSC::ExecState* exec, const String& title)
</span><span class="cx"> {
</span><del>- // FIXME: <https://webkit.org/b/153499> Web Inspector: console.profile should use the new Sampling Profiler
-
</del><span class="cx"> // Stop profiles in reverse order. If the title is empty, then stop the last profile.
</span><span class="cx"> // Otherwise, match the title of the profile to stop.
</span><span class="cx"> for (ptrdiff_t i = m_pendingConsoleProfileRecords.size() - 1; i >= 0; --i) {
</span><span class="lines">@@ -232,7 +245,7 @@
</span><span class="cx"> record.data->getString(ASCIILiteral("title"), recordTitle);
</span><span class="cx">
</span><span class="cx"> if (title.isEmpty() || recordTitle == title) {
</span><del>- RefPtr<JSC::Profile> profile = JSC::LegacyProfiler::profiler()->stopProfiling(exec, title);
</del><ins>+ RefPtr<JSC::Profile> profile = stopProfiling(exec, title);
</ins><span class="cx"> if (profile)
</span><span class="cx"> TimelineRecordFactory::appendProfile(record.data.get(), profile.copyRef());
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCorepagePageConsoleClientcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/page/PageConsoleClient.cpp (195915 => 195916)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/page/PageConsoleClient.cpp 2016-01-31 00:24:23 UTC (rev 195915)
+++ trunk/Source/WebCore/page/PageConsoleClient.cpp 2016-01-31 00:41:57 UTC (rev 195916)
</span><span class="lines">@@ -184,13 +184,11 @@
</span><span class="cx">
</span><span class="cx"> void PageConsoleClient::profile(JSC::ExecState* exec, const String& title)
</span><span class="cx"> {
</span><del>- // FIXME: <https://webkit.org/b/153499> Web Inspector: console.profile should use the new Sampling Profiler
</del><span class="cx"> InspectorInstrumentation::startProfiling(m_page, exec, title);
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void PageConsoleClient::profileEnd(JSC::ExecState* exec, const String& title)
</span><span class="cx"> {
</span><del>- // FIXME: <https://webkit.org/b/153499> Web Inspector: console.profile should use the new Sampling Profiler
</del><span class="cx"> if (RefPtr<JSC::Profile> profile = InspectorInstrumentation::stopProfiling(m_page, exec, title))
</span><span class="cx"> m_profiles.append(WTFMove(profile));
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebCoretestingInternalscpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/testing/Internals.cpp (195915 => 195916)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/testing/Internals.cpp 2016-01-31 00:24:23 UTC (rev 195915)
+++ trunk/Source/WebCore/testing/Internals.cpp 2016-01-31 00:41:57 UTC (rev 195916)
</span><span class="lines">@@ -372,7 +372,7 @@
</span><span class="cx">
</span><span class="cx"> WebCore::overrideUserPreferredLanguages(Vector<String>());
</span><span class="cx"> WebCore::Settings::setUsesOverlayScrollbars(false);
</span><del>- page->inspectorController().setLegacyProfilerEnabled(false);
</del><ins>+ page->inspectorController().setProfilerEnabled(false);
</ins><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">@@ -1839,7 +1839,7 @@
</span><span class="cx"> m_inspectorFrontend = nullptr;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void Internals::setLegacyJavaScriptProfilingEnabled(bool enabled, ExceptionCode& ec)
</del><ins>+void Internals::setJavaScriptProfilingEnabled(bool enabled, ExceptionCode& ec)
</ins><span class="cx"> {
</span><span class="cx"> Page* page = contextDocument()->frame()->page();
</span><span class="cx"> if (!page) {
</span><span class="lines">@@ -1847,7 +1847,7 @@
</span><span class="cx"> return;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- page->inspectorController().setLegacyProfilerEnabled(enabled);
</del><ins>+ page->inspectorController().setProfilerEnabled(enabled);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void Internals::setInspectorIsUnderTest(bool isUnderTest, ExceptionCode& ec)
</span></span></pre></div>
<a id="trunkSourceWebCoretestingInternalsh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/testing/Internals.h (195915 => 195916)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/testing/Internals.h 2016-01-31 00:24:23 UTC (rev 195915)
+++ trunk/Source/WebCore/testing/Internals.h 2016-01-31 00:41:57 UTC (rev 195916)
</span><span class="lines">@@ -278,7 +278,7 @@
</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><ins>+ void setJavaScriptProfilingEnabled(bool enabled, ExceptionCode&);
</ins><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 (195915 => 195916)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/testing/Internals.idl 2016-01-31 00:24:23 UTC (rev 195915)
+++ trunk/Source/WebCore/testing/Internals.idl 2016-01-31 00:41:57 UTC (rev 195916)
</span><span class="lines">@@ -263,7 +263,7 @@
</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><ins>+ [RaisesException] void setJavaScriptProfilingEnabled(boolean creates);
</ins><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 (195915 => 195916)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/win/ChangeLog 2016-01-31 00:24:23 UTC (rev 195915)
+++ trunk/Source/WebKit/win/ChangeLog 2016-01-31 00:41:57 UTC (rev 195916)
</span><span class="lines">@@ -1,3 +1,21 @@
</span><ins>+2016-01-30 Commit Queue <commit-queue@webkit.org>
+
+ Unreviewed, rolling out r195799 and r195828.
+ https://bugs.webkit.org/show_bug.cgi?id=153722
+
+ Caused assertion failures, severely affecting EWS (Requested
+ by ap on #webkit).
+
+ Reverted changesets:
+
+ "Web Inspector: InspectorTimelineAgent doesn't need to
+ recompile functions because it now uses the sampling profiler"
+ https://bugs.webkit.org/show_bug.cgi?id=153500
+ http://trac.webkit.org/changeset/195799
+
+ "Attempt to fix the Windows build after r195799"
+ http://trac.webkit.org/changeset/195828
+
</ins><span class="cx"> 2016-01-30 Darin Adler <darin@apple.com>
</span><span class="cx">
</span><span class="cx"> Replace CaseFoldingHash with ASCIICaseInsensitiveHash
</span></span></pre></div>
<a id="trunkSourceWebKitwinWebInspectorcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/win/WebInspector.cpp (195915 => 195916)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/win/WebInspector.cpp 2016-01-31 00:24:23 UTC (rev 195915)
+++ trunk/Source/WebKit/win/WebInspector.cpp 2016-01-31 00:41:57 UTC (rev 195916)
</span><span class="lines">@@ -216,7 +216,7 @@
</span><span class="cx"> if (!inspectedPage)
</span><span class="cx"> return S_OK;
</span><span class="cx">
</span><del>- *isProfilingEnabled = inspectedPage->inspectorController().legacyProfilerEnabled();
</del><ins>+ *isProfilingEnabled = inspectedPage->inspectorController().profilerEnabled();
</ins><span class="cx"> return S_OK;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -229,7 +229,7 @@
</span><span class="cx"> if (!inspectedPage)
</span><span class="cx"> return S_OK;
</span><span class="cx">
</span><del>- inspectedPage->inspectorController().setLegacyProfilerEnabled(enabled);
</del><ins>+ inspectedPage->inspectorController().setProfilerEnabled(enabled);
</ins><span class="cx">
</span><span class="cx"> return S_OK;
</span><span class="cx"> }
</span></span></pre>
</div>
</div>
</body>
</html>