Diff
Modified: trunk/LayoutTests/ChangeLog (195915 => 195916)
--- trunk/LayoutTests/ChangeLog 2016-01-31 00:24:23 UTC (rev 195915)
+++ trunk/LayoutTests/ChangeLog 2016-01-31 00:41:57 UTC (rev 195916)
@@ -1,3 +1,21 @@
+2016-01-30 Commit Queue <[email protected]>
+
+ 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
+
2016-01-30 Brady Eidson <[email protected]>
Modern IDB: Some tests crash with specific odd database names.
Modified: trunk/LayoutTests/fast/profiler/anonymous-event-handler.html (195915 => 195916)
--- 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)
@@ -5,7 +5,7 @@
if (window.testRunner)
testRunner.dumpAsText();
if (window.internals)
- internals.setLegacyJavaScriptProfilingEnabled(true);
+ internals.setJavaScriptProfilingEnabled(true);
function startTest()
{
Modified: trunk/LayoutTests/fast/profiler/anonymous-function-called-from-different-contexts.html (195915 => 195916)
--- 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)
@@ -5,7 +5,7 @@
if (window.testRunner)
testRunner.dumpAsText();
if (window.internals)
- internals.setLegacyJavaScriptProfilingEnabled(true);
+ internals.setJavaScriptProfilingEnabled(true);
function startTest()
{
Modified: trunk/LayoutTests/fast/profiler/anonymous-function-calls-built-in-functions.html (195915 => 195916)
--- 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)
@@ -5,7 +5,7 @@
if (window.testRunner)
testRunner.dumpAsText();
if (window.internals)
- internals.setLegacyJavaScriptProfilingEnabled(true);
+ internals.setJavaScriptProfilingEnabled(true);
function startTest()
{
Modified: trunk/LayoutTests/fast/profiler/anonymous-function-calls-eval.html (195915 => 195916)
--- 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)
@@ -5,7 +5,7 @@
if (window.testRunner)
testRunner.dumpAsText();
if (window.internals)
- internals.setLegacyJavaScriptProfilingEnabled(true);
+ internals.setJavaScriptProfilingEnabled(true);
function startTest()
{
Modified: trunk/LayoutTests/fast/profiler/anonymous-functions-with-display-names.html (195915 => 195916)
--- 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)
@@ -5,7 +5,7 @@
if (window.testRunner)
testRunner.dumpAsText();
if (window.internals)
- internals.setLegacyJavaScriptProfilingEnabled(true);
+ internals.setJavaScriptProfilingEnabled(true);
function anonymousFunctionGenerator(iterations)
{
Modified: trunk/LayoutTests/fast/profiler/apply.html (195915 => 195916)
--- 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)
@@ -5,7 +5,7 @@
if (window.testRunner)
testRunner.dumpAsText();
if (window.internals)
- internals.setLegacyJavaScriptProfilingEnabled(true);
+ internals.setJavaScriptProfilingEnabled(true);
function startTest()
{
Modified: trunk/LayoutTests/fast/profiler/built-in-function-calls-anonymous.html (195915 => 195916)
--- 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)
@@ -5,7 +5,7 @@
if (window.testRunner)
testRunner.dumpAsText();
if (window.internals)
- internals.setLegacyJavaScriptProfilingEnabled(true);
+ internals.setJavaScriptProfilingEnabled(true);
function startTest()
{
Modified: trunk/LayoutTests/fast/profiler/built-in-function-calls-user-defined-function.html (195915 => 195916)
--- 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)
@@ -5,7 +5,7 @@
if (window.testRunner)
testRunner.dumpAsText();
if (window.internals)
- internals.setLegacyJavaScriptProfilingEnabled(true);
+ internals.setJavaScriptProfilingEnabled(true);
function startTest()
{
Modified: trunk/LayoutTests/fast/profiler/call-register-leak.html (195915 => 195916)
--- 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)
@@ -4,7 +4,7 @@
if (window.testRunner)
testRunner.dumpAsText();
if (window.internals)
- internals.setLegacyJavaScriptProfilingEnabled(true);
+ internals.setJavaScriptProfilingEnabled(true);
function log(s)
{
Modified: trunk/LayoutTests/fast/profiler/call.html (195915 => 195916)
--- 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)
@@ -5,7 +5,7 @@
if (window.testRunner)
testRunner.dumpAsText();
if (window.internals)
- internals.setLegacyJavaScriptProfilingEnabled(true);
+ internals.setJavaScriptProfilingEnabled(true);
function startTest()
{
Modified: trunk/LayoutTests/fast/profiler/calling-the-function-that-started-the-profiler-from-another-scope.html (195915 => 195916)
--- 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)
@@ -5,7 +5,7 @@
if (window.testRunner)
testRunner.dumpAsText();
if (window.internals)
- internals.setLegacyJavaScriptProfilingEnabled(true);
+ internals.setJavaScriptProfilingEnabled(true);
function startTest()
{
Modified: trunk/LayoutTests/fast/profiler/compare-multiple-profiles.html (195915 => 195916)
--- 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)
@@ -5,7 +5,7 @@
if (window.testRunner)
testRunner.dumpAsText();
if (window.internals)
- internals.setLegacyJavaScriptProfilingEnabled(true);
+ internals.setJavaScriptProfilingEnabled(true);
var j = 0;
function test(len) {
Modified: trunk/LayoutTests/fast/profiler/constructor.html (195915 => 195916)
--- 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)
@@ -5,7 +5,7 @@
if (window.testRunner)
testRunner.dumpAsText();
if (window.internals)
- internals.setLegacyJavaScriptProfilingEnabled(true);
+ internals.setJavaScriptProfilingEnabled(true);
function startTest()
{
Modified: trunk/LayoutTests/fast/profiler/dead-time.html (195915 => 195916)
--- 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)
@@ -7,7 +7,7 @@
testRunner.waitUntilDone();
}
if (window.internals)
- internals.setLegacyJavaScriptProfilingEnabled(true);
+ internals.setJavaScriptProfilingEnabled(true);
function startTest()
{
Modified: trunk/LayoutTests/fast/profiler/document-dot-write.html (195915 => 195916)
--- 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)
@@ -5,7 +5,7 @@
if (window.testRunner)
testRunner.dumpAsText();
if (window.internals)
- internals.setLegacyJavaScriptProfilingEnabled(true);
+ internals.setJavaScriptProfilingEnabled(true);
function startTest()
{
Modified: trunk/LayoutTests/fast/profiler/event-handler.html (195915 => 195916)
--- 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)
@@ -5,7 +5,7 @@
if (window.testRunner)
testRunner.dumpAsText();
if (window.internals)
- internals.setLegacyJavaScriptProfilingEnabled(true);
+ internals.setJavaScriptProfilingEnabled(true);
function startTest()
{
Modified: trunk/LayoutTests/fast/profiler/execution-context-and-eval-on-same-line.html (195915 => 195916)
--- 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)
@@ -5,7 +5,7 @@
if (window.testRunner)
testRunner.dumpAsText();
if (window.internals)
- internals.setLegacyJavaScriptProfilingEnabled(true);
+ internals.setJavaScriptProfilingEnabled(true);
function startTest()
{
Modified: trunk/LayoutTests/fast/profiler/inline-event-handler.html (195915 => 195916)
--- 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)
@@ -5,7 +5,7 @@
if (window.testRunner)
testRunner.dumpAsText();
if (window.internals)
- internals.setLegacyJavaScriptProfilingEnabled(true);
+ internals.setJavaScriptProfilingEnabled(true);
function startTest()
{
Modified: trunk/LayoutTests/fast/profiler/many-calls-in-the-same-scope.html (195915 => 195916)
--- 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)
@@ -5,7 +5,7 @@
if (window.testRunner)
testRunner.dumpAsText();
if (window.internals)
- internals.setLegacyJavaScriptProfilingEnabled(true);
+ internals.setJavaScriptProfilingEnabled(true);
function startTest()
{
Modified: trunk/LayoutTests/fast/profiler/multiple-and-different-scoped-anonymous-function-calls.html (195915 => 195916)
--- 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)
@@ -5,7 +5,7 @@
if (window.testRunner)
testRunner.dumpAsText();
if (window.internals)
- internals.setLegacyJavaScriptProfilingEnabled(true);
+ internals.setJavaScriptProfilingEnabled(true);
function startTest()
{
Modified: trunk/LayoutTests/fast/profiler/multiple-and-different-scoped-function-calls.html (195915 => 195916)
--- 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)
@@ -5,7 +5,7 @@
if (window.testRunner)
testRunner.dumpAsText();
if (window.internals)
- internals.setLegacyJavaScriptProfilingEnabled(true);
+ internals.setJavaScriptProfilingEnabled(true);
function startTest()
{
Modified: trunk/LayoutTests/fast/profiler/multiple-anonymous-functions-called-from-the-same-function.html (195915 => 195916)
--- 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)
@@ -5,7 +5,7 @@
if (window.testRunner)
testRunner.dumpAsText();
if (window.internals)
- internals.setLegacyJavaScriptProfilingEnabled(true);
+ internals.setJavaScriptProfilingEnabled(true);
function startTest()
{
Modified: trunk/LayoutTests/fast/profiler/multiple-frames.html (195915 => 195916)
--- 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)
@@ -5,7 +5,7 @@
if (window.testRunner)
testRunner.dumpAsText();
if (window.internals)
- internals.setLegacyJavaScriptProfilingEnabled(true);
+ internals.setJavaScriptProfilingEnabled(true);
function startTest()
{
Modified: trunk/LayoutTests/fast/profiler/named-functions-with-display-names.html (195915 => 195916)
--- 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)
@@ -5,7 +5,7 @@
if (window.testRunner)
testRunner.dumpAsText();
if (window.internals)
- internals.setLegacyJavaScriptProfilingEnabled(true);
+ internals.setJavaScriptProfilingEnabled(true);
function function0()
{
Modified: trunk/LayoutTests/fast/profiler/nested-anonymous-functon.html (195915 => 195916)
--- 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)
@@ -5,7 +5,7 @@
if (window.testRunner)
testRunner.dumpAsText();
if (window.internals)
- internals.setLegacyJavaScriptProfilingEnabled(true);
+ internals.setJavaScriptProfilingEnabled(true);
function startTest()
{
Modified: trunk/LayoutTests/fast/profiler/nested-start-and-stop-profiler.html (195915 => 195916)
--- 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)
@@ -5,7 +5,7 @@
if (window.testRunner)
testRunner.dumpAsText();
if (window.internals)
- internals.setLegacyJavaScriptProfilingEnabled(true);
+ internals.setJavaScriptProfilingEnabled(true);
function startTest()
{
Modified: trunk/LayoutTests/fast/profiler/no-execution-context.html (195915 => 195916)
--- 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)
@@ -5,7 +5,7 @@
if (window.testRunner)
testRunner.dumpAsText();
if (window.internals)
- internals.setLegacyJavaScriptProfilingEnabled(true);
+ internals.setJavaScriptProfilingEnabled(true);
</script>
</head>
Modified: trunk/LayoutTests/fast/profiler/one-execution-context.html (195915 => 195916)
--- 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)
@@ -5,7 +5,7 @@
if (window.testRunner)
testRunner.dumpAsText();
if (window.internals)
- internals.setLegacyJavaScriptProfilingEnabled(true);
+ internals.setJavaScriptProfilingEnabled(true);
function startTest()
{
Modified: trunk/LayoutTests/fast/profiler/profile-calls-in-included-file.html (195915 => 195916)
--- 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)
@@ -5,7 +5,7 @@
if (window.testRunner)
testRunner.dumpAsText();
if (window.internals)
- internals.setLegacyJavaScriptProfilingEnabled(true);
+ internals.setJavaScriptProfilingEnabled(true);
function startTest()
{
Modified: trunk/LayoutTests/fast/profiler/profile-with-no-title.html (195915 => 195916)
--- 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)
@@ -5,7 +5,7 @@
if (window.testRunner)
testRunner.dumpAsText();
if (window.internals)
- internals.setLegacyJavaScriptProfilingEnabled(true);
+ internals.setJavaScriptProfilingEnabled(true);
function startTest()
{
Modified: trunk/LayoutTests/fast/profiler/profiling-from-a-nested-location-but-stop-profiling-outside-the-nesting.html (195915 => 195916)
--- 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)
@@ -5,7 +5,7 @@
if (window.testRunner)
testRunner.dumpAsText();
if (window.internals)
- internals.setLegacyJavaScriptProfilingEnabled(true);
+ internals.setJavaScriptProfilingEnabled(true);
function startTest()
{
Modified: trunk/LayoutTests/fast/profiler/profiling-from-a-nested-location.html (195915 => 195916)
--- 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)
@@ -5,7 +5,7 @@
if (window.testRunner)
testRunner.dumpAsText();
if (window.internals)
- internals.setLegacyJavaScriptProfilingEnabled(true);
+ internals.setJavaScriptProfilingEnabled(true);
function startTest()
{
Modified: trunk/LayoutTests/fast/profiler/simple-event-call.html (195915 => 195916)
--- 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)
@@ -5,7 +5,7 @@
if (window.testRunner)
testRunner.dumpAsText();
if (window.internals)
- internals.setLegacyJavaScriptProfilingEnabled(true);
+ internals.setJavaScriptProfilingEnabled(true);
function startTest()
{
Modified: trunk/LayoutTests/fast/profiler/simple-no-level-change.html (195915 => 195916)
--- 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)
@@ -5,7 +5,7 @@
if (window.testRunner)
testRunner.dumpAsText();
if (window.internals)
- internals.setLegacyJavaScriptProfilingEnabled(true);
+ internals.setJavaScriptProfilingEnabled(true);
function startTest()
{
Modified: trunk/LayoutTests/fast/profiler/start-and-stop-profiler-multiple-times.html (195915 => 195916)
--- 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)
@@ -5,7 +5,7 @@
if (window.testRunner)
testRunner.dumpAsText();
if (window.internals)
- internals.setLegacyJavaScriptProfilingEnabled(true);
+ internals.setJavaScriptProfilingEnabled(true);
function startTest()
{
Modified: trunk/LayoutTests/fast/profiler/start-and-stop-profiling-in-the-same-function.html (195915 => 195916)
--- 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)
@@ -5,7 +5,7 @@
if (window.testRunner)
testRunner.dumpAsText();
if (window.internals)
- internals.setLegacyJavaScriptProfilingEnabled(true);
+ internals.setJavaScriptProfilingEnabled(true);
function startTest()
{
Modified: trunk/LayoutTests/fast/profiler/start-but-dont-stop-profiling.html (195915 => 195916)
--- 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)
@@ -5,7 +5,7 @@
if (window.testRunner)
testRunner.dumpAsText();
if (window.internals)
- internals.setLegacyJavaScriptProfilingEnabled(true);
+ internals.setJavaScriptProfilingEnabled(true);
function startTest()
{
Modified: trunk/LayoutTests/fast/profiler/stop-profiling-after-setTimeout.html (195915 => 195916)
--- 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)
@@ -7,7 +7,7 @@
testRunner.waitUntilDone();
}
if (window.internals)
- internals.setLegacyJavaScriptProfilingEnabled(true);
+ internals.setJavaScriptProfilingEnabled(true);
function startTest()
{
Modified: trunk/LayoutTests/fast/profiler/stop-then-function-call.html (195915 => 195916)
--- 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)
@@ -5,7 +5,7 @@
if (window.testRunner)
testRunner.dumpAsText();
if (window.internals)
- internals.setLegacyJavaScriptProfilingEnabled(true);
+ internals.setJavaScriptProfilingEnabled(true);
var j = 0;
function test(len) {
Modified: trunk/LayoutTests/fast/profiler/throw-exception-from-eval.html-disabled (195915 => 195916)
--- 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)
@@ -5,7 +5,7 @@
if (window.testRunner)
testRunner.dumpAsText();
if (window.internals)
- internals.settings.setLegacyJavaScriptProfilingEnabled(true);
+ internals.settings.setJavaScriptProfilingEnabled(true);
console.profile("Throw within an eval.");
Modified: trunk/LayoutTests/fast/profiler/two-execution-contexts.html (195915 => 195916)
--- 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)
@@ -5,7 +5,7 @@
if (window.testRunner)
testRunner.dumpAsText();
if (window.internals)
- internals.setLegacyJavaScriptProfilingEnabled(true);
+ internals.setJavaScriptProfilingEnabled(true);
function startTest()
{
Modified: trunk/LayoutTests/fast/profiler/user-defined-function-calls-built-in-functions.html (195915 => 195916)
--- 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)
@@ -5,7 +5,7 @@
if (window.testRunner)
testRunner.dumpAsText();
if (window.internals)
- internals.setLegacyJavaScriptProfilingEnabled(true);
+ internals.setJavaScriptProfilingEnabled(true);
function startTest()
{
Modified: trunk/LayoutTests/fast/profiler/window-dot-eval.html (195915 => 195916)
--- 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)
@@ -5,7 +5,7 @@
if (window.testRunner)
testRunner.dumpAsText();
if (window.internals)
- internals.setLegacyJavaScriptProfilingEnabled(true);
+ internals.setJavaScriptProfilingEnabled(true);
function startTest()
{
Modified: trunk/LayoutTests/inspector/sampling-profiler/eval-source-url.html (195915 => 195916)
--- 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)
@@ -21,7 +21,8 @@
noInline(foo);
function bar() {
- eval("//# sourceURL=eval.js\nfoo();");
+ for (let i = 0; i < 2; i++)
+ eval("//# sourceURL=eval.js\nfoo();");
}
noInline(bar);
Modified: trunk/Source/_javascript_Core/ChangeLog (195915 => 195916)
--- trunk/Source/_javascript_Core/ChangeLog 2016-01-31 00:24:23 UTC (rev 195915)
+++ trunk/Source/_javascript_Core/ChangeLog 2016-01-31 00:41:57 UTC (rev 195916)
@@ -1,3 +1,21 @@
+2016-01-30 Commit Queue <[email protected]>
+
+ 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
+
2016-01-30 Yusuke Suzuki <[email protected]>
[B3] JetStream/quicksort.c fails/hangs on Linux with GCC
Modified: trunk/Source/_javascript_Core/jsc.cpp (195915 => 195916)
--- trunk/Source/_javascript_Core/jsc.cpp 2016-01-31 00:24:23 UTC (rev 195915)
+++ trunk/Source/_javascript_Core/jsc.cpp 2016-01-31 00:41:57 UTC (rev 195916)
@@ -777,7 +777,7 @@
};
const ClassInfo GlobalObject::s_info = { "global", &JSGlobalObject::s_info, nullptr, CREATE_METHOD_TABLE(GlobalObject) };
-const GlobalObjectMethodTable GlobalObject::s_globalObjectMethodTable = { &allowsAccessFrom, &supportsLegacyProfiling, &supportsRichSourceInfo, &shouldInterruptScript, &_javascript_RuntimeFlags, 0, &shouldInterruptScriptBeforeTimeout, &moduleLoaderResolve, &moduleLoaderFetch, nullptr, nullptr, nullptr };
+const GlobalObjectMethodTable GlobalObject::s_globalObjectMethodTable = { &allowsAccessFrom, &supportsProfiling, &supportsRichSourceInfo, &shouldInterruptScript, &_javascript_RuntimeFlags, 0, &shouldInterruptScriptBeforeTimeout, &moduleLoaderResolve, &moduleLoaderFetch, nullptr, nullptr, nullptr };
GlobalObject::GlobalObject(VM& vm, Structure* structure)
Modified: trunk/Source/_javascript_Core/runtime/Executable.cpp (195915 => 195916)
--- trunk/Source/_javascript_Core/runtime/Executable.cpp 2016-01-31 00:24:23 UTC (rev 195915)
+++ trunk/Source/_javascript_Core/runtime/Executable.cpp 2016-01-31 00:41:57 UTC (rev 195916)
@@ -298,7 +298,7 @@
JSGlobalObject* globalObject = scope->globalObject();
ParserError error;
DebuggerMode debuggerMode = globalObject->hasDebugger() ? DebuggerOn : DebuggerOff;
- ProfilerMode profilerMode = globalObject->hasLegacyProfiler() ? ProfilerOn : ProfilerOff;
+ ProfilerMode profilerMode = globalObject->hasProfiler() ? ProfilerOn : ProfilerOff;
UnlinkedFunctionCodeBlock* unlinkedCodeBlock =
executable->m_unlinkedExecutable->unlinkedCodeBlockFor(
*vm, executable->m_source, kind, debuggerMode, profilerMode, error,
Modified: trunk/Source/_javascript_Core/runtime/JSGlobalObject.cpp (195915 => 195916)
--- trunk/Source/_javascript_Core/runtime/JSGlobalObject.cpp 2016-01-31 00:24:23 UTC (rev 195915)
+++ trunk/Source/_javascript_Core/runtime/JSGlobalObject.cpp 2016-01-31 00:41:57 UTC (rev 195916)
@@ -173,7 +173,7 @@
const ClassInfo JSGlobalObject::s_info = { "GlobalObject", &Base::s_info, &globalObjectTable, CREATE_METHOD_TABLE(JSGlobalObject) };
-const GlobalObjectMethodTable JSGlobalObject::s_globalObjectMethodTable = { &allowsAccessFrom, &supportsLegacyProfiling, &supportsRichSourceInfo, &shouldInterruptScript, &_javascript_RuntimeFlags, nullptr, &shouldInterruptScriptBeforeTimeout, nullptr, nullptr, nullptr, nullptr, nullptr };
+const GlobalObjectMethodTable JSGlobalObject::s_globalObjectMethodTable = { &allowsAccessFrom, &supportsProfiling, &supportsRichSourceInfo, &shouldInterruptScript, &_javascript_RuntimeFlags, nullptr, &shouldInterruptScriptBeforeTimeout, nullptr, nullptr, nullptr, nullptr, nullptr };
/* Source for JSGlobalObject.lut.h
@begin globalObjectTable
@@ -612,9 +612,12 @@
resetPrototype(vm, prototype());
}
-bool JSGlobalObject::hasLegacyProfiler() const
+bool JSGlobalObject::hasProfiler() const
{
- return globalObjectMethodTable()->supportsLegacyProfiling(this);
+ if (m_debugger && m_debugger->hasProfilingClient())
+ return true;
+
+ return globalObjectMethodTable()->supportsProfiling(this);
}
void JSGlobalObject::put(JSCell* cell, ExecState* exec, PropertyName propertyName, JSValue value, PutPropertySlot& slot)
@@ -976,7 +979,7 @@
ParserError error;
JSParserStrictMode strictMode = executable->isStrictMode() ? JSParserStrictMode::Strict : JSParserStrictMode::NotStrict;
DebuggerMode debuggerMode = hasDebugger() ? DebuggerOn : DebuggerOff;
- ProfilerMode profilerMode = hasLegacyProfiler() ? ProfilerOn : ProfilerOff;
+ ProfilerMode profilerMode = hasProfiler() ? ProfilerOn : ProfilerOff;
UnlinkedProgramCodeBlock* unlinkedCodeBlock = vm().codeCache()->getProgramCodeBlock(
vm(), executable, executable->source(), JSParserBuiltinMode::NotBuiltin, strictMode,
debuggerMode, profilerMode, error);
@@ -997,7 +1000,7 @@
ParserError error;
JSParserStrictMode strictMode = executable->isStrictMode() ? JSParserStrictMode::Strict : JSParserStrictMode::NotStrict;
DebuggerMode debuggerMode = hasDebugger() ? DebuggerOn : DebuggerOff;
- ProfilerMode profilerMode = hasLegacyProfiler() ? ProfilerOn : ProfilerOff;
+ ProfilerMode profilerMode = hasProfiler() ? ProfilerOn : ProfilerOff;
UnlinkedEvalCodeBlock* unlinkedCodeBlock = vm().codeCache()->getEvalCodeBlock(
vm(), executable, executable->source(), JSParserBuiltinMode::NotBuiltin, strictMode, thisTDZMode, isArrowFunctionContext, debuggerMode, profilerMode, error, variablesUnderTDZ);
@@ -1016,7 +1019,7 @@
{
ParserError error;
DebuggerMode debuggerMode = hasDebugger() ? DebuggerOn : DebuggerOff;
- ProfilerMode profilerMode = hasLegacyProfiler() ? ProfilerOn : ProfilerOff;
+ ProfilerMode profilerMode = hasProfiler() ? ProfilerOn : ProfilerOff;
UnlinkedModuleProgramCodeBlock* unlinkedCodeBlock = vm().codeCache()->getModuleProgramCodeBlock(
vm(), executable, executable->source(), JSParserBuiltinMode::NotBuiltin, debuggerMode, profilerMode, error);
Modified: trunk/Source/_javascript_Core/runtime/JSGlobalObject.h (195915 => 195916)
--- trunk/Source/_javascript_Core/runtime/JSGlobalObject.h 2016-01-31 00:24:23 UTC (rev 195915)
+++ trunk/Source/_javascript_Core/runtime/JSGlobalObject.h 2016-01-31 00:41:57 UTC (rev 195916)
@@ -141,8 +141,8 @@
typedef bool (*AllowsAccessFromFunctionPtr)(const JSGlobalObject*, ExecState*);
AllowsAccessFromFunctionPtr allowsAccessFrom;
- typedef bool (*SupportsLegacyProfilingFunctionPtr)(const JSGlobalObject*);
- SupportsLegacyProfilingFunctionPtr supportsLegacyProfiling;
+ typedef bool (*SupportsProfilingFunctionPtr)(const JSGlobalObject*);
+ SupportsProfilingFunctionPtr supportsProfiling;
typedef bool (*SupportsRichSourceInfoFunctionPtr)(const JSGlobalObject*);
SupportsRichSourceInfoFunctionPtr supportsRichSourceInfo;
@@ -360,7 +360,7 @@
DECLARE_EXPORT_INFO;
bool hasDebugger() const { return m_debugger; }
- bool hasLegacyProfiler() const;
+ bool hasProfiler() const;
const RuntimeFlags& runtimeFlags() const { return m_runtimeFlags; }
protected:
@@ -619,7 +619,7 @@
const GlobalObjectMethodTable* globalObjectMethodTable() const { return m_globalObjectMethodTable; }
static bool allowsAccessFrom(const JSGlobalObject*, ExecState*) { return true; }
- static bool supportsLegacyProfiling(const JSGlobalObject*) { return false; }
+ static bool supportsProfiling(const JSGlobalObject*) { return false; }
static bool supportsRichSourceInfo(const JSGlobalObject*) { return true; }
JS_EXPORT_PRIVATE ExecState* globalExec();
Modified: trunk/Source/WebCore/ChangeLog (195915 => 195916)
--- 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)
@@ -1,3 +1,21 @@
+2016-01-30 Commit Queue <[email protected]>
+
+ 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
+
2016-01-30 Brady Eidson <[email protected]>
Modern IDB: Some tests crash with specific odd database names.
Modified: trunk/Source/WebCore/bindings/js/JSDOMWindowBase.cpp (195915 => 195916)
--- 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)
@@ -63,7 +63,7 @@
const ClassInfo JSDOMWindowBase::s_info = { "Window", &JSDOMGlobalObject::s_info, 0, CREATE_METHOD_TABLE(JSDOMWindowBase) };
-const GlobalObjectMethodTable JSDOMWindowBase::s_globalObjectMethodTable = { &shouldAllowAccessFrom, &supportsLegacyProfiling, &supportsRichSourceInfo, &shouldInterruptScript, &_javascript_RuntimeFlags, &queueTaskToEventLoop, &shouldInterruptScriptBeforeTimeout, &moduleLoaderResolve, &moduleLoaderFetch, nullptr, nullptr, &moduleLoaderEvaluate };
+const GlobalObjectMethodTable JSDOMWindowBase::s_globalObjectMethodTable = { &shouldAllowAccessFrom, &supportsProfiling, &supportsRichSourceInfo, &shouldInterruptScript, &_javascript_RuntimeFlags, &queueTaskToEventLoop, &shouldInterruptScriptBeforeTimeout, &moduleLoaderResolve, &moduleLoaderFetch, nullptr, nullptr, &moduleLoaderEvaluate };
JSDOMWindowBase::JSDOMWindowBase(VM& vm, Structure* structure, PassRefPtr<DOMWindow> window, JSDOMWindowShell* shell)
: JSDOMGlobalObject(vm, structure, &shell->world(), &s_globalObjectMethodTable)
@@ -115,7 +115,7 @@
printErrorMessageForFrame(wrapped().frame(), message);
}
-bool JSDOMWindowBase::supportsLegacyProfiling(const JSGlobalObject* object)
+bool JSDOMWindowBase::supportsProfiling(const JSGlobalObject* object)
{
const JSDOMWindowBase* thisObject = static_cast<const JSDOMWindowBase*>(object);
Frame* frame = thisObject->wrapped().frame();
@@ -126,7 +126,7 @@
if (!page)
return false;
- return page->inspectorController().legacyProfilerEnabled();
+ return page->inspectorController().profilerEnabled();
}
bool JSDOMWindowBase::supportsRichSourceInfo(const JSGlobalObject* object)
@@ -142,7 +142,7 @@
bool enabled = page->inspectorController().enabled();
ASSERT(enabled || !thisObject->debugger());
- ASSERT(enabled || !supportsLegacyProfiling(thisObject));
+ ASSERT(enabled || !supportsProfiling(thisObject));
return enabled;
}
Modified: trunk/Source/WebCore/bindings/js/JSDOMWindowBase.h (195915 => 195916)
--- 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)
@@ -60,7 +60,7 @@
static const JSC::GlobalObjectMethodTable s_globalObjectMethodTable;
- static bool supportsLegacyProfiling(const JSC::JSGlobalObject*);
+ static bool supportsProfiling(const JSC::JSGlobalObject*);
static bool supportsRichSourceInfo(const JSC::JSGlobalObject*);
static bool shouldInterruptScript(const JSC::JSGlobalObject*);
static bool shouldInterruptScriptBeforeTimeout(const JSC::JSGlobalObject*);
Modified: trunk/Source/WebCore/bindings/js/JSWorkerGlobalScopeBase.cpp (195915 => 195916)
--- 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)
@@ -43,7 +43,7 @@
const ClassInfo JSWorkerGlobalScopeBase::s_info = { "WorkerGlobalScope", &JSDOMGlobalObject::s_info, 0, CREATE_METHOD_TABLE(JSWorkerGlobalScopeBase) };
-const GlobalObjectMethodTable JSWorkerGlobalScopeBase::s_globalObjectMethodTable = { &allowsAccessFrom, &supportsLegacyProfiling, &supportsRichSourceInfo, &shouldInterruptScript, &_javascript_RuntimeFlags, &queueTaskToEventLoop, &shouldInterruptScriptBeforeTimeout, nullptr, nullptr, nullptr, nullptr, nullptr };
+const GlobalObjectMethodTable JSWorkerGlobalScopeBase::s_globalObjectMethodTable = { &allowsAccessFrom, &supportsProfiling, &supportsRichSourceInfo, &shouldInterruptScript, &_javascript_RuntimeFlags, &queueTaskToEventLoop, &shouldInterruptScriptBeforeTimeout, nullptr, nullptr, nullptr, nullptr, nullptr };
JSWorkerGlobalScopeBase::JSWorkerGlobalScopeBase(JSC::VM& vm, JSC::Structure* structure, PassRefPtr<WorkerGlobalScope> impl)
: JSDOMGlobalObject(vm, structure, &normalWorld(vm), &s_globalObjectMethodTable)
@@ -72,9 +72,9 @@
return JSGlobalObject::allowsAccessFrom(object, exec);
}
-bool JSWorkerGlobalScopeBase::supportsLegacyProfiling(const JSGlobalObject* object)
+bool JSWorkerGlobalScopeBase::supportsProfiling(const JSGlobalObject* object)
{
- return JSGlobalObject::supportsLegacyProfiling(object);
+ return JSGlobalObject::supportsProfiling(object);
}
bool JSWorkerGlobalScopeBase::supportsRichSourceInfo(const JSGlobalObject* object)
Modified: trunk/Source/WebCore/bindings/js/JSWorkerGlobalScopeBase.h (195915 => 195916)
--- 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)
@@ -53,7 +53,7 @@
static const JSC::GlobalObjectMethodTable s_globalObjectMethodTable;
static bool allowsAccessFrom(const JSC::JSGlobalObject*, JSC::ExecState*);
- static bool supportsLegacyProfiling(const JSC::JSGlobalObject*);
+ static bool supportsProfiling(const JSC::JSGlobalObject*);
static bool supportsRichSourceInfo(const JSC::JSGlobalObject*);
static bool shouldInterruptScript(const JSC::JSGlobalObject*);
static bool shouldInterruptScriptBeforeTimeout(const JSC::JSGlobalObject*);
Modified: trunk/Source/WebCore/inspector/InspectorController.cpp (195915 => 195916)
--- 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)
@@ -403,17 +403,22 @@
#endif
}
-bool InspectorController::legacyProfilerEnabled() const
+bool InspectorController::profilerEnabled() const
{
- return m_legacyProfilerEnabled;
+ return m_instrumentingAgents->persistentInspectorTimelineAgent();
}
-void InspectorController::setLegacyProfilerEnabled(bool enable)
+void InspectorController::setProfilerEnabled(bool enable)
{
- m_legacyProfilerEnabled = enable;
+ ErrorString unused;
- m_instrumentingAgents->setPersistentInspectorTimelineAgent(enable ? m_timelineAgent : nullptr);
- m_scriptDebugServer.recompileAllJSFunctions();
+ if (enable) {
+ m_instrumentingAgents->setPersistentInspectorTimelineAgent(m_timelineAgent);
+ m_timelineAgent->start(unused);
+ } else {
+ m_instrumentingAgents->setPersistentInspectorTimelineAgent(nullptr);
+ m_timelineAgent->stop(unused);
+ }
}
bool InspectorController::developerExtrasEnabled() const
Modified: trunk/Source/WebCore/inspector/InspectorController.h (195915 => 195916)
--- 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)
@@ -111,8 +111,8 @@
void setIsUnderTest(bool isUnderTest) { m_isUnderTest = isUnderTest; }
WEBCORE_EXPORT void evaluateForTestInFrontend(const String& script);
- WEBCORE_EXPORT bool legacyProfilerEnabled() const;
- WEBCORE_EXPORT void setLegacyProfilerEnabled(bool);
+ WEBCORE_EXPORT bool profilerEnabled() const;
+ WEBCORE_EXPORT void setProfilerEnabled(bool);
InspectorClient* inspectorClient() const { return m_inspectorClient; }
InspectorPageAgent* pageAgent() const { return m_pageAgent; }
@@ -151,7 +151,6 @@
bool m_isUnderTest { false };
bool m_isAutomaticInspection { false };
- bool m_legacyProfilerEnabled { false };
};
} // namespace WebCore
Modified: trunk/Source/WebCore/inspector/InspectorTimelineAgent.cpp (195915 => 195916)
--- 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)
@@ -84,12 +84,19 @@
void InspectorTimelineAgent::didCreateFrontendAndBackend(Inspector::FrontendRouter*, Inspector::BackendDispatcher*)
{
m_instrumentingAgents.setPersistentInspectorTimelineAgent(this);
+
+ // Recompile to include profiling information.
+ // FIXME: This doesn't seem like the most appropriate place.
+ m_environment.scriptDebugServer().recompileAllJSFunctions();
}
-void InspectorTimelineAgent::willDestroyFrontendAndBackend(Inspector::DisconnectReason)
+void InspectorTimelineAgent::willDestroyFrontendAndBackend(Inspector::DisconnectReason reason)
{
m_instrumentingAgents.setPersistentInspectorTimelineAgent(nullptr);
+ if (reason != Inspector::DisconnectReason::InspectedTargetDestroyed)
+ m_environment.scriptDebugServer().recompileAllJSFunctions();
+
ErrorString unused;
stop(unused);
}
@@ -196,10 +203,18 @@
return m_environment.executionStopwatch()->elapsedTime();
}
+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);
+}
+
void InspectorTimelineAgent::startFromConsole(JSC::ExecState* exec, const String &title)
{
- // FIXME: <https://webkit.org/b/153499> Web Inspector: console.profile should use the new Sampling Profiler
-
// 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()) {
@@ -214,15 +229,13 @@
if (!m_enabled && m_pendingConsoleProfileRecords.isEmpty())
internalStart();
- JSC::LegacyProfiler::profiler()->startProfiling(exec, title, m_environment.executionStopwatch());
+ startProfiling(exec, title, m_environment.executionStopwatch());
m_pendingConsoleProfileRecords.append(createRecordEntry(TimelineRecordFactory::createConsoleProfileData(title), TimelineRecordType::ConsoleProfile, true, frameFromExecState(exec)));
}
RefPtr<JSC::Profile> InspectorTimelineAgent::stopFromConsole(JSC::ExecState* exec, const String& title)
{
- // FIXME: <https://webkit.org/b/153499> Web Inspector: console.profile should use the new Sampling Profiler
-
// 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) {
@@ -232,7 +245,7 @@
record.data->getString(ASCIILiteral("title"), recordTitle);
if (title.isEmpty() || recordTitle == title) {
- RefPtr<JSC::Profile> profile = "" title);
+ RefPtr<JSC::Profile> profile = "" title);
if (profile)
TimelineRecordFactory::appendProfile(record.data.get(), profile.copyRef());
Modified: trunk/Source/WebCore/page/PageConsoleClient.cpp (195915 => 195916)
--- 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)
@@ -184,13 +184,11 @@
void PageConsoleClient::profile(JSC::ExecState* exec, const String& title)
{
- // FIXME: <https://webkit.org/b/153499> Web Inspector: console.profile should use the new Sampling Profiler
InspectorInstrumentation::startProfiling(m_page, exec, title);
}
void PageConsoleClient::profileEnd(JSC::ExecState* exec, const String& title)
{
- // FIXME: <https://webkit.org/b/153499> Web Inspector: console.profile should use the new Sampling Profiler
if (RefPtr<JSC::Profile> profile = "" exec, title))
m_profiles.append(WTFMove(profile));
}
Modified: trunk/Source/WebCore/testing/Internals.cpp (195915 => 195916)
--- 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)
@@ -372,7 +372,7 @@
WebCore::overrideUserPreferredLanguages(Vector<String>());
WebCore::Settings::setUsesOverlayScrollbars(false);
- page->inspectorController().setLegacyProfilerEnabled(false);
+ page->inspectorController().setProfilerEnabled(false);
#if ENABLE(VIDEO_TRACK)
page->group().captionPreferences()->setCaptionsStyleSheetOverride(emptyString());
page->group().captionPreferences()->setTestingMode(false);
@@ -1839,7 +1839,7 @@
m_inspectorFrontend = nullptr;
}
-void Internals::setLegacyJavaScriptProfilingEnabled(bool enabled, ExceptionCode& ec)
+void Internals::setJavaScriptProfilingEnabled(bool enabled, ExceptionCode& ec)
{
Page* page = contextDocument()->frame()->page();
if (!page) {
@@ -1847,7 +1847,7 @@
return;
}
- page->inspectorController().setLegacyProfilerEnabled(enabled);
+ page->inspectorController().setProfilerEnabled(enabled);
}
void Internals::setInspectorIsUnderTest(bool isUnderTest, ExceptionCode& ec)
Modified: trunk/Source/WebCore/testing/Internals.h (195915 => 195916)
--- 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)
@@ -278,7 +278,7 @@
RefPtr<DOMWindow> openDummyInspectorFrontend(const String& url);
void closeDummyInspectorFrontend();
- void setLegacyJavaScriptProfilingEnabled(bool enabled, ExceptionCode&);
+ void setJavaScriptProfilingEnabled(bool enabled, ExceptionCode&);
void setInspectorIsUnderTest(bool isUnderTest, ExceptionCode&);
String counterValue(Element*);
Modified: trunk/Source/WebCore/testing/Internals.idl (195915 => 195916)
--- 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)
@@ -263,7 +263,7 @@
unsigned long numberOfLiveDocuments();
DOMWindow openDummyInspectorFrontend(DOMString url);
void closeDummyInspectorFrontend();
- [RaisesException] void setLegacyJavaScriptProfilingEnabled(boolean enabled);
+ [RaisesException] void setJavaScriptProfilingEnabled(boolean creates);
[RaisesException] void setInspectorIsUnderTest(boolean isUnderTest);
DOMString counterValue(Element element);
Modified: trunk/Source/WebKit/win/ChangeLog (195915 => 195916)
--- 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)
@@ -1,3 +1,21 @@
+2016-01-30 Commit Queue <[email protected]>
+
+ 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
+
2016-01-30 Darin Adler <[email protected]>
Replace CaseFoldingHash with ASCIICaseInsensitiveHash
Modified: trunk/Source/WebKit/win/WebInspector.cpp (195915 => 195916)
--- 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)
@@ -216,7 +216,7 @@
if (!inspectedPage)
return S_OK;
- *isProfilingEnabled = inspectedPage->inspectorController().legacyProfilerEnabled();
+ *isProfilingEnabled = inspectedPage->inspectorController().profilerEnabled();
return S_OK;
}
@@ -229,7 +229,7 @@
if (!inspectedPage)
return S_OK;
- inspectedPage->inspectorController().setLegacyProfilerEnabled(enabled);
+ inspectedPage->inspectorController().setProfilerEnabled(enabled);
return S_OK;
}
