Diff
Modified: trunk/LayoutTests/ChangeLog (222029 => 222030)
--- trunk/LayoutTests/ChangeLog 2017-09-14 16:56:14 UTC (rev 222029)
+++ trunk/LayoutTests/ChangeLog 2017-09-14 17:17:13 UTC (rev 222030)
@@ -1,3 +1,16 @@
+2017-09-14 Ryan Haddad <ryanhad...@apple.com>
+
+ Unreviewed, rolling out r222015.
+
+ The LayoutTests added with this change are flaky.
+
+ Reverted changeset:
+
+ "Web Inspector: Timeline should show when events
+ preventDefault() was called on an event or not"
+ https://bugs.webkit.org/show_bug.cgi?id=176824
+ http://trac.webkit.org/changeset/222015
+
2017-09-14 Ms2ger <ms2...@igalia.com>
Allow passing sequences to various WebGL2 methods.
Deleted: trunk/LayoutTests/inspector/timeline/resources/timeline-event-utilities.js (222029 => 222030)
--- trunk/LayoutTests/inspector/timeline/resources/timeline-event-utilities.js 2017-09-14 16:56:14 UTC (rev 222029)
+++ trunk/LayoutTests/inspector/timeline/resources/timeline-event-utilities.js 2017-09-14 17:17:13 UTC (rev 222030)
@@ -1,23 +0,0 @@
-TestPage.registerInitializer(() => {
- window.pageRecordingData = null;
-
- window.captureTimelineWithScript = function(_expression_) {
- pageRecordingData = null;
-
- InspectorTest.log("Starting Capture...");
- const newRecording = true;
- WI.timelineManager.startCapturing(newRecording);
- InspectorTest.evaluateInPage(_expression_);
- InspectorTest.awaitEvent("FinishRecording").then((event) => {
- InspectorTest.log("Stopping Capture...");
- pageRecordingData = event.data;
- WI.timelineManager.stopCapturing();
- });
-
- return WI.timelineManager.awaitEvent(WI.TimelineManager.Event.CapturingStopped);
- }
-});
-
-function finishRecording(data) {
- TestPage.dispatchEventToFrontend("FinishRecording", data);
-}
Deleted: trunk/LayoutTests/inspector/timeline/timeline-event-CancelAnimationFrame-expected.txt (222029 => 222030)
--- trunk/LayoutTests/inspector/timeline/timeline-event-CancelAnimationFrame-expected.txt 2017-09-14 16:56:14 UTC (rev 222029)
+++ trunk/LayoutTests/inspector/timeline/timeline-event-CancelAnimationFrame-expected.txt 2017-09-14 17:17:13 UTC (rev 222030)
@@ -1,11 +0,0 @@
-Tests 'CancelAnimationFrame' Timeline event records.
-
-
-== Running test suite: TimelineEvent.CancelAnimationFrame
--- Running test case: TimelineEvent.CancelAnimationFrame.requestAnimationFrame
-Starting Capture...
-Stopping Capture...
-PASS: Should be 1 AnimationFrameCanceled record.
-DETAILS: number
-PASS: ScriptTimelineRecord details should be the requestAnimationFrame identifier.
-
Deleted: trunk/LayoutTests/inspector/timeline/timeline-event-CancelAnimationFrame.html (222029 => 222030)
--- trunk/LayoutTests/inspector/timeline/timeline-event-CancelAnimationFrame.html 2017-09-14 16:56:14 UTC (rev 222029)
+++ trunk/LayoutTests/inspector/timeline/timeline-event-CancelAnimationFrame.html 2017-09-14 17:17:13 UTC (rev 222030)
@@ -1,42 +0,0 @@
-<!DOCTYPE html>
-<html>
-<head>
-<script src=""
-<script src=""
-<script>
-function testRequestAnimationFrame() {
- let requestAnimationFrameIdentifier = requestAnimationFrame(() => { TestPage.addResult("FAIL: requestAnimationFrame fired"); });
- cancelAnimationFrame(requestAnimationFrameIdentifier);
- setTimeout(() => { finishRecording({requestAnimationFrameIdentifier}); }); // Delay a bit to ensure we get the clear animation frame.
-}
-
-function test()
-{
- let suite = InspectorTest.createAsyncSuite("TimelineEvent.CancelAnimationFrame");
-
- suite.addTestCase({
- name: "TimelineEvent.CancelAnimationFrame.requestAnimationFrame",
- test(resolve, reject) {
- captureTimelineWithScript(`testRequestAnimationFrame()`).then(() => {
- InspectorTest.assert(typeof pageRecordingData.requestAnimationFrameIdentifier === "number");
-
- let recording = WI.timelineManager.activeRecording;
- let scriptTimeline = recording.timelines.get(WI.TimelineRecord.Type.Script);
- let records = scriptTimeline.records.filter((x) => x.eventType === WI.ScriptTimelineRecord.EventType.AnimationFrameCanceled);
- InspectorTest.expectEqual(records.length, 1, "Should be 1 AnimationFrameCanceled record.");
- for (let record of records) {
- InspectorTest.log("DETAILS: " + typeof record.details);
- InspectorTest.expectEqual(record.details, pageRecordingData.requestAnimationFrameIdentifier, "ScriptTimelineRecord details should be the requestAnimationFrame identifier.");
- }
- }).then(resolve, reject);
- }
- });
-
- suite.runTestCasesAndFinish();
-}
-</script>
-</head>
-<body _onload_="runTest()">
-<p>Tests 'CancelAnimationFrame' Timeline event records.</p>
-</body>
-</html>
Deleted: trunk/LayoutTests/inspector/timeline/timeline-event-EventDispatch-expected.txt (222029 => 222030)
--- trunk/LayoutTests/inspector/timeline/timeline-event-EventDispatch-expected.txt 2017-09-14 16:56:14 UTC (rev 222029)
+++ trunk/LayoutTests/inspector/timeline/timeline-event-EventDispatch-expected.txt 2017-09-14 17:17:13 UTC (rev 222030)
@@ -1,37 +0,0 @@
-Tests 'EventDispatch' Timeline event records.
-
-
-
-== Running test suite: TimelineEvent.EventDispatch
--- Running test case: TimelineEvent.EventDispatch.Handler.Regular
-Starting Capture...
-click handler fired
-Stopping Capture...
-PASS: Should be 1 EventDispatched record.
-DETAILS: {"type":"click","defaultPrevented":false}
-PASS: ScriptTimelineRecord extraDetails should show default was not prevented.
-
--- Running test case: TimelineEvent.EventDispatch.Handler.DefaultPrevented
-Starting Capture...
-click handler fired, will prevent default
-Stopping Capture...
-PASS: Should be 1 EventDispatched record.
-DETAILS: {"type":"click","defaultPrevented":true}
-PASS: ScriptTimelineRecord extraDetails should show default was prevented.
-
--- Running test case: TimelineEvent.EventDispatch.AttributeHandler.Regular
-Starting Capture...
-b1 onclick attribute handler fired
-Stopping Capture...
-PASS: Should be 1 EventDispatched record.
-DETAILS: {"type":"click","defaultPrevented":false}
-PASS: ScriptTimelineRecord extraDetails should show default was not prevented.
-
--- Running test case: TimelineEvent.EventDispatch.AttributeHandler.DefaultPrevented
-Starting Capture...
-b2 onclick attribute handler fired, will prevent default
-Stopping Capture...
-PASS: Should be 1 EventDispatched record.
-DETAILS: {"type":"click","defaultPrevented":true}
-PASS: ScriptTimelineRecord extraDetails should show default was prevented.
-
Deleted: trunk/LayoutTests/inspector/timeline/timeline-event-EventDispatch.html (222029 => 222030)
--- trunk/LayoutTests/inspector/timeline/timeline-event-EventDispatch.html 2017-09-14 16:56:14 UTC (rev 222029)
+++ trunk/LayoutTests/inspector/timeline/timeline-event-EventDispatch.html 2017-09-14 17:17:13 UTC (rev 222030)
@@ -1,110 +0,0 @@
-<!DOCTYPE html>
-<html>
-<head>
-<script src=""
-<script src=""
-<script>
-function testClickEventHandler({preventDefault}) {
- let button = document.body.appendChild(document.createElement("button"));
- button.addEventListener("click", (event) => {
- TestPage.addResult("click handler fired" + (preventDefault ? ", will prevent default" : ""));
- setTimeout(() => { finishRecording({preventDefault}); });
- if (preventDefault)
- event.preventDefault();
- });
-
- button.dispatchEvent(new MouseEvent("click", {bubbles: true, cancelable: true}));
-}
-
-function testClickEventAttributeHandler(id, {preventDefault}) {
- let button = document.getElementById(id);
- button.dispatchEvent(new MouseEvent("click", {bubbles: true, cancelable: true}));
- setTimeout(() => { finishRecording({preventDefault}); });
-}
-
-function test()
-{
- let suite = InspectorTest.createAsyncSuite("TimelineEvent.EventDispatch");
-
- suite.addTestCase({
- name: "TimelineEvent.EventDispatch.Handler.Regular",
- test(resolve, reject) {
- captureTimelineWithScript(`testClickEventHandler({preventDefault: false})`).then(() => {
- InspectorTest.assert(typeof pageRecordingData.preventDefault === "boolean");
-
- let recording = WI.timelineManager.activeRecording;
- let scriptTimeline = recording.timelines.get(WI.TimelineRecord.Type.Script);
- let records = scriptTimeline.records.filter((x) => x.eventType === WI.ScriptTimelineRecord.EventType.EventDispatched);
- InspectorTest.expectEqual(records.length, 1, "Should be 1 EventDispatched record.");
- for (let record of records) {
- InspectorTest.log("DETAILS: " + JSON.stringify(record.extraDetails));
- InspectorTest.expectEqual(record.extraDetails.defaultPrevented, pageRecordingData.preventDefault, "ScriptTimelineRecord extraDetails should show default was not prevented.");
- }
- }).then(resolve, reject);
- }
- });
-
- suite.addTestCase({
- name: "TimelineEvent.EventDispatch.Handler.DefaultPrevented",
- test(resolve, reject) {
- captureTimelineWithScript(`testClickEventHandler({preventDefault: true})`).then(() => {
- InspectorTest.assert(typeof pageRecordingData.preventDefault === "boolean");
-
- let recording = WI.timelineManager.activeRecording;
- let scriptTimeline = recording.timelines.get(WI.TimelineRecord.Type.Script);
- let records = scriptTimeline.records.filter((x) => x.eventType === WI.ScriptTimelineRecord.EventType.EventDispatched);
- InspectorTest.expectEqual(records.length, 1, "Should be 1 EventDispatched record.");
- for (let record of records) {
- InspectorTest.log("DETAILS: " + JSON.stringify(record.extraDetails));
- InspectorTest.expectEqual(record.extraDetails.defaultPrevented, pageRecordingData.preventDefault, "ScriptTimelineRecord extraDetails should show default was prevented.");
- }
- }).then(resolve, reject);
- }
- });
-
- suite.addTestCase({
- name: "TimelineEvent.EventDispatch.AttributeHandler.Regular",
- test(resolve, reject) {
- captureTimelineWithScript(`testClickEventAttributeHandler("b1", {preventDefault: false})`).then(() => {
- InspectorTest.assert(typeof pageRecordingData.preventDefault === "boolean");
-
- let recording = WI.timelineManager.activeRecording;
- let scriptTimeline = recording.timelines.get(WI.TimelineRecord.Type.Script);
- let records = scriptTimeline.records.filter((x) => x.eventType === WI.ScriptTimelineRecord.EventType.EventDispatched);
- InspectorTest.expectEqual(records.length, 1, "Should be 1 EventDispatched record.");
- for (let record of records) {
- InspectorTest.log("DETAILS: " + JSON.stringify(record.extraDetails));
- InspectorTest.expectEqual(record.extraDetails.defaultPrevented, pageRecordingData.preventDefault, "ScriptTimelineRecord extraDetails should show default was not prevented.");
- }
- }).then(resolve, reject);
- }
- });
-
- suite.addTestCase({
- name: "TimelineEvent.EventDispatch.AttributeHandler.DefaultPrevented",
- test(resolve, reject) {
- captureTimelineWithScript(`testClickEventAttributeHandler("b2", {preventDefault: true})`).then(() => {
- InspectorTest.assert(typeof pageRecordingData.preventDefault === "boolean");
-
- let recording = WI.timelineManager.activeRecording;
- let scriptTimeline = recording.timelines.get(WI.TimelineRecord.Type.Script);
- let records = scriptTimeline.records.filter((x) => x.eventType === WI.ScriptTimelineRecord.EventType.EventDispatched);
- InspectorTest.expectEqual(records.length, 1, "Should be 1 EventDispatched record.");
- for (let record of records) {
- InspectorTest.log("DETAILS: " + JSON.stringify(record.extraDetails));
- InspectorTest.expectEqual(record.extraDetails.defaultPrevented, pageRecordingData.preventDefault, "ScriptTimelineRecord extraDetails should show default was prevented.");
- }
- }).then(resolve, reject);
- }
- });
-
- suite.runTestCasesAndFinish();
-}
-</script>
-</head>
-<body _onload_="runTest()">
-<p>Tests 'EventDispatch' Timeline event records.</p>
-<button id="b1" _onclick_="TestPage.addResult('b1 onclick attribute handler fired'); return true"></button>
-<button id="b2" _onclick_="TestPage.addResult('b2 onclick attribute handler fired, will prevent default'); return false"></button>
-</body>
-</html>
Deleted: trunk/LayoutTests/inspector/timeline/timeline-event-FireAnimationFrame-expected.txt (222029 => 222030)
--- trunk/LayoutTests/inspector/timeline/timeline-event-FireAnimationFrame-expected.txt 2017-09-14 16:56:14 UTC (rev 222029)
+++ trunk/LayoutTests/inspector/timeline/timeline-event-FireAnimationFrame-expected.txt 2017-09-14 17:17:13 UTC (rev 222030)
@@ -1,12 +0,0 @@
-Tests 'FireAnimationFrame' Timeline event records.
-
-
-== Running test suite: TimelineEvent.FireAnimationFrame
--- Running test case: TimelineEvent.FireAnimationFrame.requestAnimationFrame
-Starting Capture...
-requestAnimationFrame fired
-Stopping Capture...
-PASS: Should be 1 AnimationFrameFired record.
-DETAILS: number
-PASS: ScriptTimelineRecord details should be the requestAnimationFrame identifier.
-
Deleted: trunk/LayoutTests/inspector/timeline/timeline-event-FireAnimationFrame.html (222029 => 222030)
--- trunk/LayoutTests/inspector/timeline/timeline-event-FireAnimationFrame.html 2017-09-14 16:56:14 UTC (rev 222029)
+++ trunk/LayoutTests/inspector/timeline/timeline-event-FireAnimationFrame.html 2017-09-14 17:17:13 UTC (rev 222030)
@@ -1,43 +0,0 @@
-<!DOCTYPE html>
-<html>
-<head>
-<script src=""
-<script src=""
-<script>
-function testRequestAnimationFrame() {
- let requestAnimationFrameIdentifier = requestAnimationFrame(() => {
- TestPage.addResult("requestAnimationFrame fired");
- finishRecording({requestAnimationFrameIdentifier});
- });
-}
-
-function test()
-{
- let suite = InspectorTest.createAsyncSuite("TimelineEvent.FireAnimationFrame");
-
- suite.addTestCase({
- name: "TimelineEvent.FireAnimationFrame.requestAnimationFrame",
- test(resolve, reject) {
- captureTimelineWithScript(`testRequestAnimationFrame()`).then(() => {
- InspectorTest.assert(typeof pageRecordingData.requestAnimationFrameIdentifier === "number");
-
- let recording = WI.timelineManager.activeRecording;
- let scriptTimeline = recording.timelines.get(WI.TimelineRecord.Type.Script);
- let records = scriptTimeline.records.filter((x) => x.eventType === WI.ScriptTimelineRecord.EventType.AnimationFrameFired);
- InspectorTest.expectEqual(records.length, 1, "Should be 1 AnimationFrameFired record.");
- for (let record of records) {
- InspectorTest.log("DETAILS: " + typeof record.details);
- InspectorTest.expectEqual(record.details, pageRecordingData.requestAnimationFrameIdentifier, "ScriptTimelineRecord details should be the requestAnimationFrame identifier.");
- }
- }).then(resolve, reject);
- }
- });
-
- suite.runTestCasesAndFinish();
-}
-</script>
-</head>
-<body _onload_="runTest()">
-<p>Tests 'FireAnimationFrame' Timeline event records.</p>
-</body>
-</html>
Deleted: trunk/LayoutTests/inspector/timeline/timeline-event-RequestAnimationFrame-expected.txt (222029 => 222030)
--- trunk/LayoutTests/inspector/timeline/timeline-event-RequestAnimationFrame-expected.txt 2017-09-14 16:56:14 UTC (rev 222029)
+++ trunk/LayoutTests/inspector/timeline/timeline-event-RequestAnimationFrame-expected.txt 2017-09-14 17:17:13 UTC (rev 222030)
@@ -1,12 +0,0 @@
-Tests 'RequestAnimationFrame' Timeline event records.
-
-
-== Running test suite: TimelineEvent.RequestAnimationFrame
--- Running test case: TimelineEvent.RequestAnimationFrame.requestAnimationFrame
-Starting Capture...
-requestAnimationFrame fired
-Stopping Capture...
-PASS: Should be 1 AnimationFrameRequested record.
-DETAILS: number
-PASS: ScriptTimelineRecord details should be the requestAnimationFrame identifier.
-
Deleted: trunk/LayoutTests/inspector/timeline/timeline-event-RequestAnimationFrame.html (222029 => 222030)
--- trunk/LayoutTests/inspector/timeline/timeline-event-RequestAnimationFrame.html 2017-09-14 16:56:14 UTC (rev 222029)
+++ trunk/LayoutTests/inspector/timeline/timeline-event-RequestAnimationFrame.html 2017-09-14 17:17:13 UTC (rev 222030)
@@ -1,43 +0,0 @@
-<!DOCTYPE html>
-<html>
-<head>
-<script src=""
-<script src=""
-<script>
-function testRequestAnimationFrame() {
- let requestAnimationFrameIdentifier = requestAnimationFrame(() => {
- TestPage.addResult("requestAnimationFrame fired");
- finishRecording({requestAnimationFrameIdentifier});
- });
-}
-
-function test()
-{
- let suite = InspectorTest.createAsyncSuite("TimelineEvent.RequestAnimationFrame");
-
- suite.addTestCase({
- name: "TimelineEvent.RequestAnimationFrame.requestAnimationFrame",
- test(resolve, reject) {
- captureTimelineWithScript(`testRequestAnimationFrame()`).then(() => {
- InspectorTest.assert(typeof pageRecordingData.requestAnimationFrameIdentifier === "number");
-
- let recording = WI.timelineManager.activeRecording;
- let scriptTimeline = recording.timelines.get(WI.TimelineRecord.Type.Script);
- let records = scriptTimeline.records.filter((x) => x.eventType === WI.ScriptTimelineRecord.EventType.AnimationFrameRequested);
- InspectorTest.expectEqual(records.length, 1, "Should be 1 AnimationFrameRequested record.");
- for (let record of records) {
- InspectorTest.log("DETAILS: " + typeof record.details);
- InspectorTest.expectEqual(record.details, pageRecordingData.requestAnimationFrameIdentifier, "ScriptTimelineRecord details should be the requestAnimationFrame identifier.");
- }
- }).then(resolve, reject);
- }
- });
-
- suite.runTestCasesAndFinish();
-}
-</script>
-</head>
-<body _onload_="runTest()">
-<p>Tests 'RequestAnimationFrame' Timeline event records.</p>
-</body>
-</html>
Deleted: trunk/LayoutTests/inspector/timeline/timeline-event-TimerFire-expected.txt (222029 => 222030)
--- trunk/LayoutTests/inspector/timeline/timeline-event-TimerFire-expected.txt 2017-09-14 16:56:14 UTC (rev 222029)
+++ trunk/LayoutTests/inspector/timeline/timeline-event-TimerFire-expected.txt 2017-09-14 17:17:13 UTC (rev 222030)
@@ -1,29 +0,0 @@
-Tests 'TimerFire' Timeline event records.
-
-
-== Running test suite: TimelineEvent.TimerFire
--- Running test case: TimelineEvent.TimerFire.setTimeout
-Starting Capture...
-setTimeout fired
-Stopping Capture...
-PASS: Should be 1 TimerFired record.
-DETAILS: number
-PASS: ScriptTimelineRecord details should be the setTimeout identifier.
-
--- Running test case: TimelineEvent.TimerFire.setInterval
-Starting Capture...
-setInterval fired: 1
-setInterval fired: 2
-setInterval fired: 3
-Stopping Capture...
-PASS: Should be 3 TimerFired records.
-DETAILS: number
-PASS: ScriptTimelineRecord details should be the setInterval identifier.
-DETAILS: number
-PASS: ScriptTimelineRecord details should be the setInterval identifier.
-DETAILS: number
-PASS: ScriptTimelineRecord details should be the setInterval identifier.
-
--- Running test case: SanityCheck
-PASS: The setTimeout identifier and setInterval identifiers should be different.
-
Deleted: trunk/LayoutTests/inspector/timeline/timeline-event-TimerFire.html (222029 => 222030)
--- trunk/LayoutTests/inspector/timeline/timeline-event-TimerFire.html 2017-09-14 16:56:14 UTC (rev 222029)
+++ trunk/LayoutTests/inspector/timeline/timeline-event-TimerFire.html 2017-09-14 17:17:13 UTC (rev 222030)
@@ -1,86 +0,0 @@
-<!DOCTYPE html>
-<html>
-<head>
-<script src=""
-<script src=""
-<script>
-function testSetTimeout() {
- let setTimeoutIdentifier = setTimeout(() => {
- TestPage.addResult("setTimeout fired");
- finishRecording({setTimeoutIdentifier});
- });
-}
-
-function testSetInterval() {
- let count = 0;
- let setIntervalIdentifier = setInterval(() => {
- count++;
- TestPage.addResult("setInterval fired: " + count);
- if (count === 3) {
- clearInterval(setIntervalIdentifier);
- finishRecording({setIntervalIdentifier});
- }
- });
-}
-
-function test()
-{
- let suite = InspectorTest.createAsyncSuite("TimelineEvent.TimerFire");
-
- let timeoutIdentifier;
- let intervalIdentifier;
-
- suite.addTestCase({
- name: "TimelineEvent.TimerFire.setTimeout",
- test(resolve, reject) {
- captureTimelineWithScript(`testSetTimeout()`).then(() => {
- InspectorTest.assert(typeof pageRecordingData.setTimeoutIdentifier === "number");
- timeoutIdentifier = pageRecordingData.setTimeoutIdentifier;
-
- let recording = WI.timelineManager.activeRecording;
- let scriptTimeline = recording.timelines.get(WI.TimelineRecord.Type.Script);
- let records = scriptTimeline.records.filter((x) => x.eventType === WI.ScriptTimelineRecord.EventType.TimerFired);
- InspectorTest.expectEqual(records.length, 1, "Should be 1 TimerFired record.");
- for (let record of records) {
- InspectorTest.log("DETAILS: " + typeof record.details);
- InspectorTest.expectEqual(record.details, timeoutIdentifier, "ScriptTimelineRecord details should be the setTimeout identifier.");
- }
- }).then(resolve, reject);
- }
- });
-
- suite.addTestCase({
- name: "TimelineEvent.TimerFire.setInterval",
- test(resolve, reject) {
- captureTimelineWithScript(`testSetInterval()`).then(() => {
- InspectorTest.assert(typeof pageRecordingData.setIntervalIdentifier === "number");
- intervalIdentifier = pageRecordingData.setIntervalIdentifier;
-
- let recording = WI.timelineManager.activeRecording;
- let scriptTimeline = recording.timelines.get(WI.TimelineRecord.Type.Script);
- let records = scriptTimeline.records.filter((x) => x.eventType === WI.ScriptTimelineRecord.EventType.TimerFired);
- InspectorTest.expectEqual(records.length, 3, "Should be 3 TimerFired records.");
- for (let record of records) {
- InspectorTest.log("DETAILS: " + typeof record.details);
- InspectorTest.expectEqual(record.details, pageRecordingData.setIntervalIdentifier, "ScriptTimelineRecord details should be the setInterval identifier.");
- }
- }).then(resolve, reject);
- }
- });
-
- suite.addTestCase({
- name: "SanityCheck",
- test(resolve, reject) {
- InspectorTest.expectThat(timeoutIdentifier !== intervalIdentifier, "The setTimeout identifier and setInterval identifiers should be different.");
- resolve();
- }
- });
-
- suite.runTestCasesAndFinish();
-}
-</script>
-</head>
-<body _onload_="runTest()">
-<p>Tests 'TimerFire' Timeline event records.</p>
-</body>
-</html>
Deleted: trunk/LayoutTests/inspector/timeline/timeline-event-TimerInstall-expected.txt (222029 => 222030)
--- trunk/LayoutTests/inspector/timeline/timeline-event-TimerInstall-expected.txt 2017-09-14 16:56:14 UTC (rev 222029)
+++ trunk/LayoutTests/inspector/timeline/timeline-event-TimerInstall-expected.txt 2017-09-14 17:17:13 UTC (rev 222030)
@@ -1,25 +0,0 @@
-Tests 'TimerInstall' Timeline event records.
-
-
-== Running test suite: TimelineEvent.TimerInstall
--- Running test case: TimelineEvent.TimerInstall.setTimeout
-Starting Capture...
-setTimeout fired
-Stopping Capture...
-PASS: Should be 1 TimerInstalled record.
-DETAILS: {"timerId":"<filtered>","timeout":10,"repeating":false}
-PASS: ScriptTimelineRecord details should be the setTimeout identifier.
-
--- Running test case: TimelineEvent.TimerInstall.setInterval
-Starting Capture...
-setInterval fired: 1
-setInterval fired: 2
-setInterval fired: 3
-Stopping Capture...
-PASS: Should be 1 TimerInstalled record.
-DETAILS: {"timerId":"<filtered>","timeout":5,"repeating":true}
-PASS: ScriptTimelineRecord details should be the setInterval identifier.
-
--- Running test case: SanityCheck
-PASS: The setTimeout identifier and setInterval identifiers should be different.
-
Deleted: trunk/LayoutTests/inspector/timeline/timeline-event-TimerInstall.html (222029 => 222030)
--- trunk/LayoutTests/inspector/timeline/timeline-event-TimerInstall.html 2017-09-14 16:56:14 UTC (rev 222029)
+++ trunk/LayoutTests/inspector/timeline/timeline-event-TimerInstall.html 2017-09-14 17:17:13 UTC (rev 222030)
@@ -1,92 +0,0 @@
-<!DOCTYPE html>
-<html>
-<head>
-<script src=""
-<script src=""
-<script>
-function testSetTimeout() {
- let setTimeoutIdentifier = setTimeout(() => {
- TestPage.addResult("setTimeout fired");
- finishRecording({setTimeoutIdentifier});
- }, 10);
-}
-
-function testSetInterval() {
- let count = 0;
- let setIntervalIdentifier = setInterval(() => {
- count++;
- TestPage.addResult("setInterval fired: " + count);
- if (count === 3) {
- clearInterval(setIntervalIdentifier);
- finishRecording({setIntervalIdentifier});
- }
- }, 5);
-}
-
-function test()
-{
- let suite = InspectorTest.createAsyncSuite("TimelineEvent.TimerInstall");
-
- let timeoutIdentifier;
- let intervalIdentifier;
-
- function jsonFilter(key, value) {
- if (key === "timerId")
- return "<filtered>";
- return value;
- }
-
- suite.addTestCase({
- name: "TimelineEvent.TimerInstall.setTimeout",
- test(resolve, reject) {
- captureTimelineWithScript(`testSetTimeout()`).then(() => {
- InspectorTest.assert(typeof pageRecordingData.setTimeoutIdentifier === "number");
- timeoutIdentifier = pageRecordingData.setTimeoutIdentifier;
-
- let recording = WI.timelineManager.activeRecording;
- let scriptTimeline = recording.timelines.get(WI.TimelineRecord.Type.Script);
- let records = scriptTimeline.records.filter((x) => x.eventType === WI.ScriptTimelineRecord.EventType.TimerInstalled);
- InspectorTest.expectEqual(records.length, 1, "Should be 1 TimerInstalled record.");
- for (let record of records) {
- InspectorTest.log("DETAILS: " + JSON.stringify(record.details, jsonFilter));
- InspectorTest.expectEqual(record.details.timerId, timeoutIdentifier, "ScriptTimelineRecord details should be the setTimeout identifier.");
- }
- }).then(resolve, reject);
- }
- });
-
- suite.addTestCase({
- name: "TimelineEvent.TimerInstall.setInterval",
- test(resolve, reject) {
- captureTimelineWithScript(`testSetInterval()`).then(() => {
- InspectorTest.assert(typeof pageRecordingData.setIntervalIdentifier === "number");
- intervalIdentifier = pageRecordingData.setIntervalIdentifier;
-
- let recording = WI.timelineManager.activeRecording;
- let scriptTimeline = recording.timelines.get(WI.TimelineRecord.Type.Script);
- let records = scriptTimeline.records.filter((x) => x.eventType === WI.ScriptTimelineRecord.EventType.TimerInstalled);
- InspectorTest.expectEqual(records.length, 1, "Should be 1 TimerInstalled record.");
- for (let record of records) {
- InspectorTest.log("DETAILS: " + JSON.stringify(record.details, jsonFilter));
- InspectorTest.expectEqual(record.details.timerId, pageRecordingData.setIntervalIdentifier, "ScriptTimelineRecord details should be the setInterval identifier.");
- }
- }).then(resolve, reject);
- }
- });
-
- suite.addTestCase({
- name: "SanityCheck",
- test(resolve, reject) {
- InspectorTest.expectThat(timeoutIdentifier !== intervalIdentifier, "The setTimeout identifier and setInterval identifiers should be different.");
- resolve();
- }
- });
-
- suite.runTestCasesAndFinish();
-}
-</script>
-</head>
-<body _onload_="runTest()">
-<p>Tests 'TimerInstall' Timeline event records.</p>
-</body>
-</html>
Deleted: trunk/LayoutTests/inspector/timeline/timeline-event-TimerRemove-expected.txt (222029 => 222030)
--- trunk/LayoutTests/inspector/timeline/timeline-event-TimerRemove-expected.txt 2017-09-14 16:56:14 UTC (rev 222029)
+++ trunk/LayoutTests/inspector/timeline/timeline-event-TimerRemove-expected.txt 2017-09-14 17:17:13 UTC (rev 222030)
@@ -1,24 +0,0 @@
-Tests 'TimerRemove' Timeline event records.
-
-
-== Running test suite: TimelineEvent.TimerRemove
--- Running test case: TimelineEvent.TimerRemove.setTimeout
-Starting Capture...
-Stopping Capture...
-PASS: Should be 1 TimerRemoved record.
-DETAILS: number
-PASS: ScriptTimelineRecord details should be the setTimeout identifier.
-
--- Running test case: TimelineEvent.TimerRemove.setInterval
-Starting Capture...
-setInterval fired: 1
-setInterval fired: 2
-setInterval fired: 3
-Stopping Capture...
-PASS: Should be 1 TimerRemoved record.
-DETAILS: number
-PASS: ScriptTimelineRecord details should be the setInterval identifier.
-
--- Running test case: SanityCheck
-PASS: The setTimeout identifier and setInterval identifiers should be different.
-
Deleted: trunk/LayoutTests/inspector/timeline/timeline-event-TimerRemove.html (222029 => 222030)
--- trunk/LayoutTests/inspector/timeline/timeline-event-TimerRemove.html 2017-09-14 16:56:14 UTC (rev 222029)
+++ trunk/LayoutTests/inspector/timeline/timeline-event-TimerRemove.html 2017-09-14 17:17:13 UTC (rev 222030)
@@ -1,85 +0,0 @@
-<!DOCTYPE html>
-<html>
-<head>
-<script src=""
-<script src=""
-<script>
-function testSetTimeout() {
- let setTimeoutIdentifier = setTimeout(() => { TestPage.addResult("FAIL: setTimeout fired"); });
- clearTimeout(setTimeoutIdentifier);
- requestAnimationFrame(() => { finishRecording({setTimeoutIdentifier}); }); // Delay a bit to ensure we get the clear timeout.
-}
-
-function testSetInterval() {
- let count = 0;
- let setIntervalIdentifier = setInterval(() => {
- count++;
- TestPage.addResult("setInterval fired: " + count);
- if (count === 3) {
- clearInterval(setIntervalIdentifier);
- requestAnimationFrame(() => { finishRecording({setIntervalIdentifier}); }); // Delay a bit to ensure we get the clear timeout.
- }
- });
-}
-
-function test()
-{
- let suite = InspectorTest.createAsyncSuite("TimelineEvent.TimerRemove");
-
- let timeoutIdentifier;
- let intervalIdentifier;
-
- suite.addTestCase({
- name: "TimelineEvent.TimerRemove.setTimeout",
- test(resolve, reject) {
- captureTimelineWithScript(`testSetTimeout()`).then(() => {
- InspectorTest.assert(typeof pageRecordingData.setTimeoutIdentifier === "number");
- timeoutIdentifier = pageRecordingData.setTimeoutIdentifier;
-
- let recording = WI.timelineManager.activeRecording;
- let scriptTimeline = recording.timelines.get(WI.TimelineRecord.Type.Script);
- let records = scriptTimeline.records.filter((x) => x.eventType === WI.ScriptTimelineRecord.EventType.TimerRemoved);
- InspectorTest.expectEqual(records.length, 1, "Should be 1 TimerRemoved record.");
- for (let record of records) {
- InspectorTest.log("DETAILS: " + typeof record.details);
- InspectorTest.expectEqual(record.details, timeoutIdentifier, "ScriptTimelineRecord details should be the setTimeout identifier.");
- }
- }).then(resolve, reject);
- }
- });
-
- suite.addTestCase({
- name: "TimelineEvent.TimerRemove.setInterval",
- test(resolve, reject) {
- captureTimelineWithScript(`testSetInterval()`).then(() => {
- InspectorTest.assert(typeof pageRecordingData.setIntervalIdentifier === "number");
- intervalIdentifier = pageRecordingData.setIntervalIdentifier;
-
- let recording = WI.timelineManager.activeRecording;
- let scriptTimeline = recording.timelines.get(WI.TimelineRecord.Type.Script);
- let records = scriptTimeline.records.filter((x) => x.eventType === WI.ScriptTimelineRecord.EventType.TimerRemoved);
- InspectorTest.expectEqual(records.length, 1, "Should be 1 TimerRemoved record.");
- for (let record of records) {
- InspectorTest.log("DETAILS: " + typeof record.details);
- InspectorTest.expectEqual(record.details, pageRecordingData.setIntervalIdentifier, "ScriptTimelineRecord details should be the setInterval identifier.");
- }
- }).then(resolve, reject);
- }
- });
-
- suite.addTestCase({
- name: "SanityCheck",
- test(resolve, reject) {
- InspectorTest.expectThat(timeoutIdentifier !== intervalIdentifier, "The setTimeout identifier and setInterval identifiers should be different.");
- resolve();
- }
- });
-
- suite.runTestCasesAndFinish();
-}
-</script>
-</head>
-<body _onload_="runTest()">
-<p>Tests 'TimerRemove' Timeline event records.</p>
-</body>
-</html>
Modified: trunk/Source/WebCore/ChangeLog (222029 => 222030)
--- trunk/Source/WebCore/ChangeLog 2017-09-14 16:56:14 UTC (rev 222029)
+++ trunk/Source/WebCore/ChangeLog 2017-09-14 17:17:13 UTC (rev 222030)
@@ -1,3 +1,16 @@
+2017-09-14 Ryan Haddad <ryanhad...@apple.com>
+
+ Unreviewed, rolling out r222015.
+
+ The LayoutTests added with this change are flaky.
+
+ Reverted changeset:
+
+ "Web Inspector: Timeline should show when events
+ preventDefault() was called on an event or not"
+ https://bugs.webkit.org/show_bug.cgi?id=176824
+ http://trac.webkit.org/changeset/222015
+
2017-09-14 Ms2ger <ms2...@igalia.com>
Allow passing sequences to various WebGL2 methods.
Modified: trunk/Source/WebCore/dom/EventTarget.cpp (222029 => 222030)
--- trunk/Source/WebCore/dom/EventTarget.cpp 2017-09-14 16:56:14 UTC (rev 222029)
+++ trunk/Source/WebCore/dom/EventTarget.cpp 2017-09-14 17:17:13 UTC (rev 222030)
@@ -299,7 +299,7 @@
}
if (contextIsDocument)
- InspectorInstrumentation::didDispatchEvent(willDispatchEventCookie, event.defaultPrevented());
+ InspectorInstrumentation::didDispatchEvent(willDispatchEventCookie);
}
const EventListenerVector& EventTarget::eventListeners(const AtomicString& eventType)
Modified: trunk/Source/WebCore/inspector/InspectorInstrumentation.cpp (222029 => 222030)
--- trunk/Source/WebCore/inspector/InspectorInstrumentation.cpp 2017-09-14 16:56:14 UTC (rev 222029)
+++ trunk/Source/WebCore/inspector/InspectorInstrumentation.cpp 2017-09-14 17:17:13 UTC (rev 222030)
@@ -433,10 +433,10 @@
debuggerAgent->didDispatchAsyncCall();
}
-void InspectorInstrumentation::didDispatchEventImpl(const InspectorInstrumentationCookie& cookie, bool defaultPrevented)
+void InspectorInstrumentation::didDispatchEventImpl(const InspectorInstrumentationCookie& cookie)
{
if (InspectorTimelineAgent* timelineAgent = retrieveTimelineAgent(cookie))
- timelineAgent->didDispatchEvent(defaultPrevented);
+ timelineAgent->didDispatchEvent();
}
InspectorInstrumentationCookie InspectorInstrumentation::willDispatchEventOnWindowImpl(InstrumentingAgents& instrumentingAgents, const Event& event, DOMWindow& window)
@@ -451,10 +451,10 @@
return InspectorInstrumentationCookie(instrumentingAgents, timelineAgentId);
}
-void InspectorInstrumentation::didDispatchEventOnWindowImpl(const InspectorInstrumentationCookie& cookie, bool defaultPrevented)
+void InspectorInstrumentation::didDispatchEventOnWindowImpl(const InspectorInstrumentationCookie& cookie)
{
if (InspectorTimelineAgent* timelineAgent = retrieveTimelineAgent(cookie))
- timelineAgent->didDispatchEvent(defaultPrevented);
+ timelineAgent->didDispatchEvent();
}
InspectorInstrumentationCookie InspectorInstrumentation::willEvaluateScriptImpl(InstrumentingAgents& instrumentingAgents, Frame& frame, const String& url, int lineNumber)
Modified: trunk/Source/WebCore/inspector/InspectorInstrumentation.h (222029 => 222030)
--- trunk/Source/WebCore/inspector/InspectorInstrumentation.h 2017-09-14 16:56:14 UTC (rev 222029)
+++ trunk/Source/WebCore/inspector/InspectorInstrumentation.h 2017-09-14 17:17:13 UTC (rev 222030)
@@ -147,11 +147,11 @@
static void didAddEventListener(EventTarget&, const AtomicString& eventType);
static void willRemoveEventListener(EventTarget&, const AtomicString& eventType, EventListener&, bool capture);
static InspectorInstrumentationCookie willDispatchEvent(Document&, const Event&, bool hasEventListeners);
- static void didDispatchEvent(const InspectorInstrumentationCookie&, bool defaultPrevented);
+ static void didDispatchEvent(const InspectorInstrumentationCookie&);
static void willHandleEvent(ScriptExecutionContext&, const Event&, const RegisteredEventListener&);
static void didHandleEvent(ScriptExecutionContext&);
static InspectorInstrumentationCookie willDispatchEventOnWindow(Frame*, const Event&, DOMWindow&);
- static void didDispatchEventOnWindow(const InspectorInstrumentationCookie&, bool defaultPrevented);
+ static void didDispatchEventOnWindow(const InspectorInstrumentationCookie&);
static InspectorInstrumentationCookie willEvaluateScript(Frame&, const String& url, int lineNumber);
static void didEvaluateScript(const InspectorInstrumentationCookie&, Frame&);
static InspectorInstrumentationCookie willFireTimer(ScriptExecutionContext&, int timerId);
@@ -321,9 +321,9 @@
static InspectorInstrumentationCookie willDispatchEventImpl(InstrumentingAgents&, Document&, const Event&, bool hasEventListeners);
static void willHandleEventImpl(InstrumentingAgents&, const Event&, const RegisteredEventListener&);
static void didHandleEventImpl(InstrumentingAgents&);
- static void didDispatchEventImpl(const InspectorInstrumentationCookie&, bool defaultPrevented);
+ static void didDispatchEventImpl(const InspectorInstrumentationCookie&);
static InspectorInstrumentationCookie willDispatchEventOnWindowImpl(InstrumentingAgents&, const Event&, DOMWindow&);
- static void didDispatchEventOnWindowImpl(const InspectorInstrumentationCookie&, bool defaultPrevented);
+ static void didDispatchEventOnWindowImpl(const InspectorInstrumentationCookie&);
static InspectorInstrumentationCookie willEvaluateScriptImpl(InstrumentingAgents&, Frame&, const String& url, int lineNumber);
static void didEvaluateScriptImpl(const InspectorInstrumentationCookie&, Frame&);
static InspectorInstrumentationCookie willFireTimerImpl(InstrumentingAgents&, int timerId, ScriptExecutionContext&);
@@ -733,11 +733,11 @@
return InspectorInstrumentationCookie();
}
-inline void InspectorInstrumentation::didDispatchEvent(const InspectorInstrumentationCookie& cookie, bool defaultPrevented)
+inline void InspectorInstrumentation::didDispatchEvent(const InspectorInstrumentationCookie& cookie)
{
FAST_RETURN_IF_NO_FRONTENDS(void());
if (cookie.isValid())
- didDispatchEventImpl(cookie, defaultPrevented);
+ didDispatchEventImpl(cookie);
}
inline void InspectorInstrumentation::willHandleEvent(ScriptExecutionContext& context, const Event& event, const RegisteredEventListener& listener)
@@ -762,11 +762,11 @@
return InspectorInstrumentationCookie();
}
-inline void InspectorInstrumentation::didDispatchEventOnWindow(const InspectorInstrumentationCookie& cookie, bool defaultPrevented)
+inline void InspectorInstrumentation::didDispatchEventOnWindow(const InspectorInstrumentationCookie& cookie)
{
FAST_RETURN_IF_NO_FRONTENDS(void());
if (cookie.isValid())
- didDispatchEventOnWindowImpl(cookie, defaultPrevented);
+ didDispatchEventOnWindowImpl(cookie);
}
inline InspectorInstrumentationCookie InspectorInstrumentation::willEvaluateScript(Frame& frame, const String& url, int lineNumber)
Modified: trunk/Source/WebCore/inspector/InspectorTimelineAgent.cpp (222029 => 222030)
--- trunk/Source/WebCore/inspector/InspectorTimelineAgent.cpp 2017-09-14 16:56:14 UTC (rev 222029)
+++ trunk/Source/WebCore/inspector/InspectorTimelineAgent.cpp 2017-09-14 17:17:13 UTC (rev 222030)
@@ -311,12 +311,8 @@
pushCurrentRecord(TimelineRecordFactory::createEventDispatchData(event), TimelineRecordType::EventDispatch, false, frame);
}
-void InspectorTimelineAgent::didDispatchEvent(bool defaultPrevented)
+void InspectorTimelineAgent::didDispatchEvent()
{
- TimelineRecordEntry& entry = m_recordStack.last();
- ASSERT(entry.type == TimelineRecordType::EventDispatch);
- TimelineRecordFactory::appendDidDispatchEventData(*entry.data.get(), defaultPrevented);
-
didCompleteCurrentRecord(TimelineRecordType::EventDispatch);
}
@@ -339,10 +335,9 @@
Vector<FloatQuad> quads;
root.absoluteQuads(quads);
if (quads.size() >= 1)
- TimelineRecordFactory::appendLayoutRoot(*entry.data.get(), quads[0]);
+ TimelineRecordFactory::appendLayoutRoot(entry.data.get(), quads[0]);
else
ASSERT_NOT_REACHED();
-
didCompleteCurrentRecord(TimelineRecordType::Layout);
}
@@ -387,7 +382,6 @@
FloatQuad quad;
localToPageQuad(renderer, clipRect, &quad);
entry.data = ""
-
didCompleteCurrentRecord(TimelineRecordType::Paint);
}
Modified: trunk/Source/WebCore/inspector/InspectorTimelineAgent.h (222029 => 222030)
--- trunk/Source/WebCore/inspector/InspectorTimelineAgent.h 2017-09-14 16:56:14 UTC (rev 222029)
+++ trunk/Source/WebCore/inspector/InspectorTimelineAgent.h 2017-09-14 17:17:13 UTC (rev 222030)
@@ -119,7 +119,7 @@
void willCallFunction(const String& scriptName, int scriptLine, Frame*);
void didCallFunction(Frame*);
void willDispatchEvent(const Event&, Frame*);
- void didDispatchEvent(bool defaultPrevented);
+ void didDispatchEvent();
void willEvaluateScript(const String&, int, Frame&);
void didEvaluateScript(Frame&);
void didInvalidateLayout(Frame&);
Modified: trunk/Source/WebCore/inspector/TimelineRecordFactory.cpp (222029 => 222030)
--- trunk/Source/WebCore/inspector/TimelineRecordFactory.cpp 2017-09-14 16:56:14 UTC (rev 222029)
+++ trunk/Source/WebCore/inspector/TimelineRecordFactory.cpp 2017-09-14 17:17:13 UTC (rev 222030)
@@ -146,14 +146,9 @@
return data;
}
-void TimelineRecordFactory::appendLayoutRoot(InspectorObject& data, const FloatQuad& quad)
+void TimelineRecordFactory::appendLayoutRoot(InspectorObject* data, const FloatQuad& quad)
{
- data.setArray(ASCIILiteral("root"), createQuad(quad));
+ data->setArray(ASCIILiteral("root"), createQuad(quad));
}
-void TimelineRecordFactory::appendDidDispatchEventData(InspectorObject& data, bool defaultPrevented)
-{
- data.setBoolean(ASCIILiteral("defaultPrevented"), defaultPrevented);
-}
-
} // namespace WebCore
Modified: trunk/Source/WebCore/inspector/TimelineRecordFactory.h (222029 => 222030)
--- trunk/Source/WebCore/inspector/TimelineRecordFactory.h 2017-09-14 16:56:14 UTC (rev 222029)
+++ trunk/Source/WebCore/inspector/TimelineRecordFactory.h 2017-09-14 17:17:13 UTC (rev 222030)
@@ -60,8 +60,7 @@
static Ref<Inspector::InspectorObject> createAnimationFrameData(int callbackId);
static Ref<Inspector::InspectorObject> createPaintData(const FloatQuad&);
- static void appendLayoutRoot(Inspector::InspectorObject& data, const FloatQuad&);
- static void appendDidDispatchEventData(Inspector::InspectorObject& data, bool defaultPrevented);
+ static void appendLayoutRoot(Inspector::InspectorObject* data, const FloatQuad&);
private:
TimelineRecordFactory() { }
Modified: trunk/Source/WebCore/page/DOMWindow.cpp (222029 => 222030)
--- trunk/Source/WebCore/page/DOMWindow.cpp 2017-09-14 16:56:14 UTC (rev 222029)
+++ trunk/Source/WebCore/page/DOMWindow.cpp 2017-09-14 17:17:13 UTC (rev 222030)
@@ -2002,7 +2002,7 @@
bool result = fireEventListeners(event);
- InspectorInstrumentation::didDispatchEventOnWindow(cookie, event.defaultPrevented());
+ InspectorInstrumentation::didDispatchEventOnWindow(cookie);
return result;
}
Modified: trunk/Source/WebInspectorUI/ChangeLog (222029 => 222030)
--- trunk/Source/WebInspectorUI/ChangeLog 2017-09-14 16:56:14 UTC (rev 222029)
+++ trunk/Source/WebInspectorUI/ChangeLog 2017-09-14 17:17:13 UTC (rev 222030)
@@ -1,3 +1,16 @@
+2017-09-14 Ryan Haddad <ryanhad...@apple.com>
+
+ Unreviewed, rolling out r222015.
+
+ The LayoutTests added with this change are flaky.
+
+ Reverted changeset:
+
+ "Web Inspector: Timeline should show when events
+ preventDefault() was called on an event or not"
+ https://bugs.webkit.org/show_bug.cgi?id=176824
+ http://trac.webkit.org/changeset/222015
+
2017-09-14 Joseph Pecoraro <pecor...@apple.com>
Web Inspector: Timeline should show when events preventDefault() was called on an event or not
Modified: trunk/Source/WebInspectorUI/Localizations/en.lproj/localizedStrings.js (222029 => 222030)
--- trunk/Source/WebInspectorUI/Localizations/en.lproj/localizedStrings.js 2017-09-14 16:56:14 UTC (rev 222029)
+++ trunk/Source/WebInspectorUI/Localizations/en.lproj/localizedStrings.js 2017-09-14 17:17:13 UTC (rev 222030)
@@ -971,7 +971,6 @@
localizedStrings["Zoom:"] = "Zoom:";
localizedStrings["computed"] = "computed";
localizedStrings["default"] = "default";
-localizedStrings["default prevented"] = "default prevented";
localizedStrings["for changes to take effect"] = "for changes to take effect";
localizedStrings["key"] = "key";
localizedStrings["line "] = "line ";
Modified: trunk/Source/WebInspectorUI/UserInterface/Controllers/TimelineManager.js (222029 => 222030)
--- trunk/Source/WebInspectorUI/UserInterface/Controllers/TimelineManager.js 2017-09-14 16:56:14 UTC (rev 222029)
+++ trunk/Source/WebInspectorUI/UserInterface/Controllers/TimelineManager.js 2017-09-14 17:17:13 UTC (rev 222030)
@@ -563,7 +563,7 @@
record = new WI.ScriptTimelineRecord(WI.ScriptTimelineRecord.EventType.TimerFired, startTime, endTime, callFrames, sourceCodeLocation, parentRecordPayload.data.timerId, profileData);
break;
case TimelineAgent.EventType.EventDispatch:
- record = new WI.ScriptTimelineRecord(WI.ScriptTimelineRecord.EventType.EventDispatched, startTime, endTime, callFrames, sourceCodeLocation, parentRecordPayload.data.type, profileData, parentRecordPayload.data);
+ record = new WI.ScriptTimelineRecord(WI.ScriptTimelineRecord.EventType.EventDispatched, startTime, endTime, callFrames, sourceCodeLocation, parentRecordPayload.data.type, profileData);
break;
case TimelineAgent.EventType.FireAnimationFrame:
record = new WI.ScriptTimelineRecord(WI.ScriptTimelineRecord.EventType.AnimationFrameFired, startTime, endTime, callFrames, sourceCodeLocation, parentRecordPayload.data.id, profileData);
Modified: trunk/Source/WebInspectorUI/UserInterface/Models/ScriptTimelineRecord.js (222029 => 222030)
--- trunk/Source/WebInspectorUI/UserInterface/Models/ScriptTimelineRecord.js 2017-09-14 16:56:14 UTC (rev 222029)
+++ trunk/Source/WebInspectorUI/UserInterface/Models/ScriptTimelineRecord.js 2017-09-14 17:17:13 UTC (rev 222030)
@@ -25,7 +25,7 @@
WI.ScriptTimelineRecord = class ScriptTimelineRecord extends WI.TimelineRecord
{
- constructor(eventType, startTime, endTime, callFrames, sourceCodeLocation, details, profilePayload, extraDetails)
+ constructor(eventType, startTime, endTime, callFrames, sourceCodeLocation, details, profilePayload)
{
super(WI.TimelineRecord.Type.Script, startTime, endTime, callFrames, sourceCodeLocation);
@@ -38,7 +38,6 @@
this._details = details || "";
this._profilePayload = profilePayload || null;
this._profile = null;
- this._extraDetails = extraDetails || null;
// COMPATIBILITY(iOS 9): Before the ScriptProfilerAgent we did not have sample data. Return NaN to match old behavior.
if (!window.ScriptProfilerAgent)
@@ -51,11 +50,16 @@
// Public
- get eventType() { return this._eventType; }
- get details() { return this._details; }
- get extraDetails() { return this._extraDetails; }
- get callCountOrSamples() { return this._callCountOrSamples; }
+ get eventType()
+ {
+ return this._eventType;
+ }
+ get details()
+ {
+ return this._details;
+ }
+
get profile()
{
this._initializeProfileFromPayload();
@@ -62,6 +66,11 @@
return this._profile;
}
+ get callCountOrSamples()
+ {
+ return this._callCountOrSamples;
+ }
+
isGarbageCollection()
{
return this._eventType === WI.ScriptTimelineRecord.EventType.GarbageCollected;
Modified: trunk/Source/WebInspectorUI/UserInterface/Protocol/InspectorBackend.js (222029 => 222030)
--- trunk/Source/WebInspectorUI/UserInterface/Protocol/InspectorBackend.js 2017-09-14 16:56:14 UTC (rev 222029)
+++ trunk/Source/WebInspectorUI/UserInterface/Protocol/InspectorBackend.js 2017-09-14 17:17:13 UTC (rev 222030)
@@ -285,11 +285,6 @@
dispatchEvent(eventName, eventArguments)
{
- if (!this._dispatcher) {
- console.error("No domain dispatcher registered for domain '" + this._domainName + "'");
- return false;
- }
-
if (!(eventName in this._dispatcher)) {
console.error("Protocol Error: Attempted to dispatch an unimplemented method '" + this._domainName + "." + eventName + "'");
return false;
Modified: trunk/Source/WebInspectorUI/UserInterface/Test/Test.js (222029 => 222030)
--- trunk/Source/WebInspectorUI/UserInterface/Test/Test.js 2017-09-14 16:56:14 UTC (rev 222029)
+++ trunk/Source/WebInspectorUI/UserInterface/Test/Test.js 2017-09-14 17:17:13 UTC (rev 222030)
@@ -38,12 +38,11 @@
InspectorBackend.registerInspectorDispatcher(new WI.InspectorObserver);
InspectorBackend.registerPageDispatcher(new WI.PageObserver);
InspectorBackend.registerConsoleDispatcher(new WI.ConsoleObserver);
+ InspectorBackend.registerDOMDispatcher(new WI.DOMObserver);
InspectorBackend.registerNetworkDispatcher(new WI.NetworkObserver);
- InspectorBackend.registerDOMDispatcher(new WI.DOMObserver);
InspectorBackend.registerDebuggerDispatcher(new WI.DebuggerObserver);
InspectorBackend.registerHeapDispatcher(new WI.HeapObserver);
InspectorBackend.registerDOMStorageDispatcher(new WI.DOMStorageObserver);
- InspectorBackend.registerScriptProfilerDispatcher(new WI.ScriptProfilerObserver);
InspectorBackend.registerTimelineDispatcher(new WI.TimelineObserver);
InspectorBackend.registerCSSDispatcher(new WI.CSSObserver);
InspectorBackend.registerRuntimeDispatcher(new WI.RuntimeObserver);
Modified: trunk/Source/WebInspectorUI/UserInterface/Test.html (222029 => 222030)
--- trunk/Source/WebInspectorUI/UserInterface/Test.html 2017-09-14 16:56:14 UTC (rev 222029)
+++ trunk/Source/WebInspectorUI/UserInterface/Test.html 2017-09-14 17:17:13 UTC (rev 222030)
@@ -82,7 +82,6 @@
<script src=""
<script src=""
<script src=""
- <script src=""
<script src=""
<script src=""
Modified: trunk/Source/WebInspectorUI/UserInterface/Views/ScriptDetailsTimelineView.js (222029 => 222030)
--- trunk/Source/WebInspectorUI/UserInterface/Views/ScriptDetailsTimelineView.js 2017-09-14 16:56:14 UTC (rev 222029)
+++ trunk/Source/WebInspectorUI/UserInterface/Views/ScriptDetailsTimelineView.js 2017-09-14 17:17:13 UTC (rev 222030)
@@ -34,7 +34,7 @@
let columns = {name: {}, location: {}, callCount: {}, startTime: {}, totalTime: {}, selfTime: {}, averageTime: {}};
columns.name.title = WI.UIString("Name");
- columns.name.width = "30%";
+ columns.name.width = "10%";
columns.name.icon = true;
columns.name.disclosure = true;
columns.name.locked = true;
@@ -69,7 +69,7 @@
columns.averageTime.width = "10%";
columns.averageTime.aligned = "right";
- for (let column in columns)
+ for (var column in columns)
columns[column].sortable = true;
this._dataGrid = new WI.ScriptTimelineDataGrid(columns);
Modified: trunk/Source/WebInspectorUI/UserInterface/Views/ScriptTimelineDataGridNode.js (222029 => 222030)
--- trunk/Source/WebInspectorUI/UserInterface/Views/ScriptTimelineDataGridNode.js 2017-09-14 16:56:14 UTC (rev 222029)
+++ trunk/Source/WebInspectorUI/UserInterface/Views/ScriptTimelineDataGridNode.js 2017-09-14 17:17:13 UTC (rev 222030)
@@ -100,9 +100,6 @@
this._subtitle = WI.UIString("%s interval").format(timeoutString);
else
this._subtitle = WI.UIString("%s delay").format(timeoutString);
- } else if (this._record.eventType === WI.ScriptTimelineRecord.EventType.EventDispatched) {
- if (this._record.extraDetails && this._record.extraDetails.defaultPrevented)
- this._subtitle = WI.UIString("default prevented");
}
return this._subtitle;
