summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--third_party/WebKit/LayoutTests/NeverFixTests12
-rw-r--r--third_party/WebKit/LayoutTests/TestExpectations2
-rw-r--r--third_party/WebKit/LayoutTests/VirtualTestSuites5
-rw-r--r--third_party/WebKit/LayoutTests/fast/dom/HTMLSelectElement/remove-element-from-within-focus-handler-crash.html9
-rw-r--r--third_party/WebKit/LayoutTests/fast/events/dispatch-synthetic-keyboardevent-no-action-expected.txt12
-rw-r--r--third_party/WebKit/LayoutTests/fast/events/dispatch-synthetic-keyboardevent-no-action.html19
-rw-r--r--third_party/WebKit/LayoutTests/fast/events/frame-tab-focus.html12
-rw-r--r--third_party/WebKit/LayoutTests/fast/events/option-tab.html14
-rw-r--r--third_party/WebKit/LayoutTests/fast/events/wheelevent-in-scrolling-div-expected.txt6
-rw-r--r--third_party/WebKit/LayoutTests/fast/events/wheelevent-in-scrolling-div.html21
-rw-r--r--third_party/WebKit/LayoutTests/fast/forms/listbox-onchange.html64
-rw-r--r--third_party/WebKit/LayoutTests/fast/forms/range/slider-transformed.html17
-rw-r--r--third_party/WebKit/LayoutTests/fast/forms/range/slider-zoomed.html17
-rw-r--r--third_party/WebKit/LayoutTests/fast/forms/select-list-box-mouse-focus.html13
-rw-r--r--third_party/WebKit/LayoutTests/virtual/trustedeventsdefaultaction/fast/events/README.txt2
-rw-r--r--third_party/WebKit/LayoutTests/virtual/trustedeventsdefaultaction/fast/events/dispatch-synthetic-keyboardevent-no-action-expected.txt12
-rw-r--r--third_party/WebKit/LayoutTests/virtual/trustedeventsdefaultaction/fast/events/simulated-key-state-expected.txt7
-rw-r--r--third_party/WebKit/Source/core/events/EventDispatcher.cpp6
-rw-r--r--third_party/WebKit/Source/platform/RuntimeEnabledFeatures.in1
19 files changed, 91 insertions, 160 deletions
diff --git a/third_party/WebKit/LayoutTests/NeverFixTests b/third_party/WebKit/LayoutTests/NeverFixTests
index 8ef4963..26e93f7 100644
--- a/third_party/WebKit/LayoutTests/NeverFixTests
+++ b/third_party/WebKit/LayoutTests/NeverFixTests
@@ -33,7 +33,6 @@ fast/harness/sample-fail-mismatch-reftest.html [ WontFix ]
# this test will always fail.
[ Linux Win ] fast/events/option-tab.html [ WontFix ]
[ Linux Win ] virtual/pointerevent/fast/events/option-tab.html [ WontFix ]
-[ Linux Win ] virtual/trustedeventsdefaultaction/fast/events/option-tab.html [ WontFix ]
# This test only applies to overlay scrollbar platforms.
[ SnowLeopard Win Linux ] fast/dom/partial-layout-overlay-scrollbars.html [ WontFix ]
@@ -79,14 +78,6 @@ fast/harness/sample-fail-mismatch-reftest.html [ WontFix ]
[ Linux Mac ] virtual/pointerevent/fast/events/panScroll-nested-divs.html [ WontFix ]
[ Linux Mac ] virtual/pointerevent/fast/events/panScroll-panIcon.html [ WontFix ]
[ Linux Mac ] virtual/pointerevent/fast/events/panScroll-nested-divs-forbidden.html [ WontFix ]
-[ Linux Mac ] virtual/trustedeventsdefaultaction/fast/events/panScroll-click.html [ WontFix ]
-[ Linux Mac ] virtual/trustedeventsdefaultaction/fast/events/panScroll-click-hyperlink.html [ WontFix ]
-[ Linux Mac ] virtual/trustedeventsdefaultaction/fast/events/panScroll-drag.html [ WontFix ]
-[ Linux Mac ] virtual/trustedeventsdefaultaction/fast/events/panScroll-event-fired.html [ WontFix ]
-[ Linux Mac ] virtual/trustedeventsdefaultaction/fast/events/panScroll-in-iframe.html [ WontFix ]
-[ Linux Mac ] virtual/trustedeventsdefaultaction/fast/events/panScroll-nested-divs.html [ WontFix ]
-[ Linux Mac ] virtual/trustedeventsdefaultaction/fast/events/panScroll-panIcon.html [ WontFix ]
-[ Linux Mac ] virtual/trustedeventsdefaultaction/fast/events/panScroll-nested-divs-forbidden.html [ WontFix ]
# These tests are specific to Windows and Linux.
[ Mac ] fast/forms/calendar-picker/date-open-picker-with-f4-key.html [ WontFix ]
@@ -102,9 +93,6 @@ fast/harness/sample-fail-mismatch-reftest.html [ WontFix ]
[ Mac ] virtual/pointerevent/fast/events/menu-key-context-menu-document.html [ WontFix ]
[ Mac ] virtual/pointerevent/fast/events/menu-key-context-menu.html [ WontFix ]
[ Mac ] virtual/pointerevent/fast/events/menu-key-context-menu-position.html [ WontFix ]
-[ Mac ] virtual/trustedeventsdefaultaction/fast/events/menu-key-context-menu-document.html [ WontFix ]
-[ Mac ] virtual/trustedeventsdefaultaction/fast/events/menu-key-context-menu.html [ WontFix ]
-[ Mac ] virtual/trustedeventsdefaultaction/fast/events/menu-key-context-menu-position.html [ WontFix ]
# Link Highlighting is only supported on Windows and Linux
[ Mac ] compositing/gestures [ WontFix ]
diff --git a/third_party/WebKit/LayoutTests/TestExpectations b/third_party/WebKit/LayoutTests/TestExpectations
index 261e667..aa89269 100644
--- a/third_party/WebKit/LayoutTests/TestExpectations
+++ b/third_party/WebKit/LayoutTests/TestExpectations
@@ -517,7 +517,6 @@ crbug.com/452018 [ Mac ] http/tests/navigation/anchor-basic.html [ Crash Timeout
# Disable KeyboardEvent key tests till https://codereview.chromium.org/929053004/ lands
crbug.com/227231 fast/events/keyboardevent-key.html [ Failure Pass ]
crbug.com/227231 virtual/pointerevent/fast/events/keyboardevent-key.html [ Failure Pass ]
-crbug.com/227231 virtual/trustedeventsdefaultaction/fast/events/keyboardevent-key.html [ Failure Pass ]
crbug.com/341435 http/tests/images/image-with-origin-header.html [ Pass Timeout ]
@@ -530,7 +529,6 @@ crbug.com/455879 [ Win ] webaudio/waveshaper-oversample-4x.html [ Crash Pass ]
crbug.com/489548 fast/events/stop-load-in-unload-handler-using-window-stop.html [ Pass Failure ]
crbug.com/489548 virtual/pointerevent/fast/events/stop-load-in-unload-handler-using-window-stop.html [ Pass Failure ]
-crbug.com/489548 virtual/trustedeventsdefaultaction/fast/events/stop-load-in-unload-handler-using-window-stop.html [ Pass Failure ]
crbug.com/489556 virtual/pointerevent/fast/events/domactivate-sets-underlying-click-event-as-handled.html [ Pass Failure ]
crbug.com/467649 webaudio/audionode-disconnect-audioparam.html [ Pass Failure ]
diff --git a/third_party/WebKit/LayoutTests/VirtualTestSuites b/third_party/WebKit/LayoutTests/VirtualTestSuites
index e14d43c..37af430 100644
--- a/third_party/WebKit/LayoutTests/VirtualTestSuites
+++ b/third_party/WebKit/LayoutTests/VirtualTestSuites
@@ -141,10 +141,5 @@
"base": "fast/workers",
"args": ["--js-flags=--harmony-sharedarraybuffer",
"--enable-blink-features=SharedArrayBuffer"]
- },
- {
- "prefix": "trustedeventsdefaultaction",
- "base": "fast/events",
- "args": ["--enable-blink-features=TrustedEventsDefaultAction"]
}
]
diff --git a/third_party/WebKit/LayoutTests/fast/dom/HTMLSelectElement/remove-element-from-within-focus-handler-crash.html b/third_party/WebKit/LayoutTests/fast/dom/HTMLSelectElement/remove-element-from-within-focus-handler-crash.html
index 9859547..5ea3a57 100644
--- a/third_party/WebKit/LayoutTests/fast/dom/HTMLSelectElement/remove-element-from-within-focus-handler-crash.html
+++ b/third_party/WebKit/LayoutTests/fast/dom/HTMLSelectElement/remove-element-from-within-focus-handler-crash.html
@@ -8,10 +8,7 @@
testRunner.dumpAsText();
var select = document.getElementById('bomb');
-
- var rect = select.getBoundingClientRect();
- if (window.eventSender) {
- eventSender.mouseMoveTo(rect.left + 1, rect.top + 1);
- eventSender.mouseDown(0);
- }
+ var mouseEvent = document.createEvent("MouseEvents");
+ mouseEvent.initMouseEvent("mousedown", true, true, document.defaultView, 1, select.offsetLeft + 1, select.offsetTop + 1, select.offsetLeft + 1, select.offsetTop + 1, false, false, false, false, 0, document);
+ select.dispatchEvent(mouseEvent);
</script>
diff --git a/third_party/WebKit/LayoutTests/fast/events/dispatch-synthetic-keyboardevent-no-action-expected.txt b/third_party/WebKit/LayoutTests/fast/events/dispatch-synthetic-keyboardevent-no-action-expected.txt
deleted file mode 100644
index 1cc9fe8..0000000
--- a/third_party/WebKit/LayoutTests/fast/events/dispatch-synthetic-keyboardevent-no-action-expected.txt
+++ /dev/null
@@ -1,12 +0,0 @@
-Tests to ensure that default action does not occur for untrusted events.
-
-On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
-
-
-
-FAIL document.getElementById('radio1').checked should be true. Was false.
-FAIL document.getElementById('radio2').checked should be false. Was true.
-PASS successfullyParsed is true
-
-TEST COMPLETE
-
diff --git a/third_party/WebKit/LayoutTests/fast/events/dispatch-synthetic-keyboardevent-no-action.html b/third_party/WebKit/LayoutTests/fast/events/dispatch-synthetic-keyboardevent-no-action.html
deleted file mode 100644
index c36d5d4..0000000
--- a/third_party/WebKit/LayoutTests/fast/events/dispatch-synthetic-keyboardevent-no-action.html
+++ /dev/null
@@ -1,19 +0,0 @@
-<!DOCTYPE html>
-<script src="../../resources/js-test.js"></script>
-<p id="description"></p>
-<form>
-<input type="radio" id="radio1" name="foo" value="A" checked/>
-<input type="radio" id="radio2" name="foo" value="B" />
-</form>
-<pre id="console"></pre>
-<script>
-description("Tests to ensure that default action does not occur for untrusted events.");
-
-var node = document.getElementById('radio1');
-node.getBoundingClientRect();
-
-var event = new KeyboardEvent('keydown', { keyIdentifier: 'Down' } );
-node.dispatchEvent(event);
-shouldBeTrue("document.getElementById('radio1').checked");
-shouldBeFalse("document.getElementById('radio2').checked");
-</script>
diff --git a/third_party/WebKit/LayoutTests/fast/events/frame-tab-focus.html b/third_party/WebKit/LayoutTests/fast/events/frame-tab-focus.html
index c97e26f..9fc7463 100644
--- a/third_party/WebKit/LayoutTests/fast/events/frame-tab-focus.html
+++ b/third_party/WebKit/LayoutTests/fast/events/frame-tab-focus.html
@@ -86,14 +86,10 @@ function setupWindow(win)
function dispatchTabPress(element, shiftKey, altKey)
{
- if (window.eventSender) {
- modifiers = [];
- if (shiftKey)
- modifiers.push("shiftKey");
- if (altKey)
- modifiers.push("altKey");
- eventSender.keyDown('\u0009', modifiers);
- }
+ var event = document.createEvent('KeyboardEvents');
+ var tabKeyIdentifier = 'U+0009';
+ event.initKeyboardEvent('keydown', true, true, document.defaultView, tabKeyIdentifier, 0, false, altKey, shiftKey, false, false);
+ element.dispatchEvent(event);
}
function test()
diff --git a/third_party/WebKit/LayoutTests/fast/events/option-tab.html b/third_party/WebKit/LayoutTests/fast/events/option-tab.html
index b2c5c10..f95ca80 100644
--- a/third_party/WebKit/LayoutTests/fast/events/option-tab.html
+++ b/third_party/WebKit/LayoutTests/fast/events/option-tab.html
@@ -13,10 +13,9 @@ function test(fieldId)
{
window.linkFocused = false;
document.getElementById(fieldId).focus();
-
- if (window.eventSender)
- eventSender.keyDown('\u0009', ["altKey"]);
-
+ var event = document.createEvent("KeyboardEvents");
+ event.initKeyboardEvent("keydown", true, true, document.defaultView, "U+0009", 0, false, true, false, false, false);
+ document.getElementById(fieldId).dispatchEvent(event);
if (window.linkFocused)
document.getElementById("console").innerHTML += "SUCCESS: Option-tab did tab to the link (" + fieldId + ").\n";
else
@@ -24,10 +23,9 @@ function test(fieldId)
window.linkFocused = false;
document.getElementById(fieldId).focus();
-
- if (window.eventSender)
- eventSender.keyDown('\u0009', []);
-
+ event = document.createEvent("KeyboardEvents");
+ event.initKeyboardEvent("keydown", true, true, document.defaultView, "U+0009", 0, false, false, false, false, false);
+ document.getElementById(fieldId).dispatchEvent(event);
if (window.linkFocused)
document.getElementById("console").innerHTML += "FAIL: Plain old tab did tab to the link (" + fieldId + ").\n";
else
diff --git a/third_party/WebKit/LayoutTests/fast/events/wheelevent-in-scrolling-div-expected.txt b/third_party/WebKit/LayoutTests/fast/events/wheelevent-in-scrolling-div-expected.txt
index 10e4fd0..f6ff29b 100644
--- a/third_party/WebKit/LayoutTests/fast/events/wheelevent-in-scrolling-div-expected.txt
+++ b/third_party/WebKit/LayoutTests/fast/events/wheelevent-in-scrolling-div-expected.txt
@@ -3,9 +3,9 @@ PASS successfullyParsed is true
TEST COMPLETE
PASS event.deltaY is window.expectedScrollTop
PASS event.deltaX is window.expectedScrollLeft
-PASS event.wheelDeltaY is -5*120
-PASS event.wheelDeltaX is -2.5*120
-PASS event.wheelDelta is -5*120
+PASS event.wheelDeltaY is window.expectedScrollTop*-120
+PASS event.wheelDeltaX is window.expectedScrollLeft*-120
+PASS event.wheelDelta is window.expectedScrollTop*-120
PASS div.scrollTop is window.expectedScrollTop
PASS div.scrollLeft is window.expectedScrollLeft
diff --git a/third_party/WebKit/LayoutTests/fast/events/wheelevent-in-scrolling-div.html b/third_party/WebKit/LayoutTests/fast/events/wheelevent-in-scrolling-div.html
index 2b935fb..e0cacc3 100644
--- a/third_party/WebKit/LayoutTests/fast/events/wheelevent-in-scrolling-div.html
+++ b/third_party/WebKit/LayoutTests/fast/events/wheelevent-in-scrolling-div.html
@@ -16,9 +16,16 @@
if (overflowElement) {
overflowElement.addEventListener("mousewheel", mousewheelHandler, false);
- // EventSender uses 40px per tick.
- eventSender.mouseMoveTo(overflowElement.offsetLeft + 5, overflowElement.offsetTop + 5);
- eventSender.mouseScrollBy(-2.5, -5);
+ var deltaX = window.expectedScrollLeft;
+ var deltaY = window.expectedScrollTop;
+ var eventInit = {
+ deltaX: deltaX,
+ deltaY: deltaY,
+ wheelDeltaX: -120 * deltaX,
+ wheelDeltaY: -120 * deltaY,
+ };
+ var event = new WheelEvent("mousewheel", eventInit);
+ overflowElement.dispatchEvent(event);
}
setTimeout('checkOffsets();', 100);
@@ -39,13 +46,13 @@
event = e;
shouldBe("event.deltaY", "window.expectedScrollTop");
shouldBe("event.deltaX", "window.expectedScrollLeft");
- shouldBe("event.wheelDeltaY", "-5*120");
- shouldBe("event.wheelDeltaX", "-2.5*120");
+ shouldBe("event.wheelDeltaY", "window.expectedScrollTop*-120");
+ shouldBe("event.wheelDeltaX", "window.expectedScrollLeft*-120");
if (e.wheelDeltaY)
- shouldBe("event.wheelDelta", "-5*120");
+ shouldBe("event.wheelDelta", "window.expectedScrollTop*-120");
else
- shouldBe("event.wheelDelta", "-2.5*120");
+ shouldBe("event.wheelDelta", "window.expectedScrollLeft*-120");
}
</script>
</head>
diff --git a/third_party/WebKit/LayoutTests/fast/forms/listbox-onchange.html b/third_party/WebKit/LayoutTests/fast/forms/listbox-onchange.html
index 19b50b0..ccb3d05 100644
--- a/third_party/WebKit/LayoutTests/fast/forms/listbox-onchange.html
+++ b/third_party/WebKit/LayoutTests/fast/forms/listbox-onchange.html
@@ -119,51 +119,53 @@
if (window.testRunner)
testRunner.notifyDone();
}
-
- function buildModifiers(shift, metaOrCtrl) {
- modifiers = [];
- if (shift)
- modifiers.push("shiftKey");
- if (metaOrCtrl)
- modifiers.push("addSelectionKey");
- return modifiers;
- }
function mouseDownOnSelect(selId, index, shift, metaOrCtrl)
{
- modifiers = buildModifiers(shift, metaOrCtrl);
- var sl = document.getElementById(selId);
- var rect = sl.options[index].getBoundingClientRect();
- if (window.eventSender) {
- eventSender.mouseMoveTo(rect.left + 1, rect.top + 1);
- eventSender.mouseDown(0, modifiers);
- } else {
- testFailed("This test requires window.eventSender.");
+ var meta = false;
+ var ctrl = false;
+ if (metaOrCtrl) {
+ if (navigator.userAgent.search(/\bMac OS X\b/) != -1)
+ meta = true;
+ else
+ ctrl = true;
}
+ var sl = document.getElementById(selId);
+ var event = document.createEvent("MouseEvent");
+ event.initMouseEvent("mousedown", true, true, document.defaultView, 1, 0, 0, 0, 0, ctrl, false, shift, meta, 0, document);
+ sl.options[index].dispatchEvent(event);
}
function mouseUpOnSelect(selId, index, shift, metaOrCtrl)
{
- modifiers = buildModifiers(shift, metaOrCtrl);
- var sl = document.getElementById(selId);
- var rect = sl.options[index].getBoundingClientRect();
- if (window.eventSender) {
- eventSender.mouseMoveTo(rect.left + 1, rect.top + 1);
- eventSender.mouseUp(0, modifiers);
- } else {
- testFailed("This test requires window.eventSender.");
+ var meta = false;
+ var ctrl = false;
+ if (metaOrCtrl) {
+ if (navigator.userAgent.search(/\bMac OS X\b/) != -1)
+ meta = true;
+ else
+ ctrl = true;
}
+ var sl = document.getElementById(selId);
+ var event = document.createEvent("MouseEvent");
+ event.initMouseEvent("mouseup", true, true, document.defaultView, 1, 0, 0, 0, 0, ctrl, false, shift, meta, 0, document);
+ sl.options[index].dispatchEvent(event);
}
function keyDownOnSelect(selId, identifier, shift, metaOrCtrl)
{
- modifiers = buildModifiers(shift, metaOrCtrl);
- document.getElementById(selId).focus();
- if (window.eventSender) {
- eventSender.keyDown(identifier, modifiers);
- } else {
- testFailed("This test requires window.eventSender.");
+ modifiers = [];
+ if (shift)
+ modifiers[0] = "shiftKey";
+ if (metaOrCtrl) {
+ if (navigator.userAgent.search(/\bMac OS X\b/) != -1)
+ modifiers[modifiers.length] = "metaKey";
+ else
+ modifiers[modifiers.length] = "controlKey";
}
+
+ document.getElementById(selId).focus();
+ eventSender.keyDown(identifier, modifiers);
}
function getSelectedOptions(selId)
diff --git a/third_party/WebKit/LayoutTests/fast/forms/range/slider-transformed.html b/third_party/WebKit/LayoutTests/fast/forms/range/slider-transformed.html
index de83171..03f6222 100644
--- a/third_party/WebKit/LayoutTests/fast/forms/range/slider-transformed.html
+++ b/third_party/WebKit/LayoutTests/fast/forms/range/slider-transformed.html
@@ -17,14 +17,19 @@
if (window.testRunner)
testRunner.dumpAsText();
+ function dispatchEvent(eventType, clientX, clientY)
+ {
+ var ev = document.createEvent("MouseEvent");
+ ev.initMouseEvent(eventType, true, true, window, 1, 1, 1, clientX, clientY, false, false, false, false, 0, document);
+ var target = document.elementFromPoint(ev.clientX, ev.clientY);
+ target.dispatchEvent(ev);
+ }
+
function test()
{
// For some reason the slider needs mouseup/mousedown, not just a "click"
- if (window.eventSender) {
- eventSender.mouseMoveTo(61, 71);
- eventSender.mouseDown(0);
- eventSender.mouseUp(0);
- }
+ dispatchEvent("mousedown", 61, 71);
+ dispatchEvent("mouseup", 61, 71);
const expectedValue = 39;
var val = document.getElementById('slider').value;
@@ -42,4 +47,4 @@
<div id="results">
</div>
</body>
-</html>
+</html> \ No newline at end of file
diff --git a/third_party/WebKit/LayoutTests/fast/forms/range/slider-zoomed.html b/third_party/WebKit/LayoutTests/fast/forms/range/slider-zoomed.html
index efa0aef..23a3681 100644
--- a/third_party/WebKit/LayoutTests/fast/forms/range/slider-zoomed.html
+++ b/third_party/WebKit/LayoutTests/fast/forms/range/slider-zoomed.html
@@ -18,14 +18,19 @@
if (window.testRunner)
testRunner.dumpAsText();
+ function dispatchEvent(eventType, clientX, clientY)
+ {
+ var ev = document.createEvent("MouseEvent");
+ ev.initMouseEvent(eventType, true, true, window, 1, 1, 1, clientX, clientY, false, false, false, false, 0, document);
+ var target = document.elementFromPoint(ev.clientX, ev.clientY);
+ target.dispatchEvent(ev);
+ }
+
function test()
{
// For some reason the slider needs mouseup/mousedown, not just a "click"
- if (window.eventSender) {
- eventSender.mouseMoveTo(150, 15);
- eventSender.mouseDown(0);
- eventSender.mouseUp(0);
- }
+ dispatchEvent("mousedown", 150, 15);
+ dispatchEvent("mouseup", 150, 15);
const expectedValue = 72;
var val = document.getElementById('slider').value;
@@ -43,4 +48,4 @@
<div id="results">
</div>
</body>
-</html>
+</html> \ No newline at end of file
diff --git a/third_party/WebKit/LayoutTests/fast/forms/select-list-box-mouse-focus.html b/third_party/WebKit/LayoutTests/fast/forms/select-list-box-mouse-focus.html
index 3c12014..5032650 100644
--- a/third_party/WebKit/LayoutTests/fast/forms/select-list-box-mouse-focus.html
+++ b/third_party/WebKit/LayoutTests/fast/forms/select-list-box-mouse-focus.html
@@ -4,14 +4,11 @@ function test()
if (window.testRunner)
testRunner.dumpAsText();
var select = document.getElementById("select");
- var rect = select.getBoundingClientRect();
- var x = rect.left + 10;
- var y = rect.top + 10;
-
- if (window.eventSender) {
- eventSender.mouseMoveTo(x, y);
- eventSender.mouseDown(0);
- }
+ var x = select.clientLeft + 10;
+ var y = select.clientTop + 10;
+ var event = document.createEvent("MouseEvent");
+ event.initMouseEvent("mousedown", true, true, document.defaultView, 1, x, y, x, y, false, false, false, false, 0, document);
+ select.dispatchEvent(event);
}
function reportFocus()
{
diff --git a/third_party/WebKit/LayoutTests/virtual/trustedeventsdefaultaction/fast/events/README.txt b/third_party/WebKit/LayoutTests/virtual/trustedeventsdefaultaction/fast/events/README.txt
deleted file mode 100644
index a97005a..0000000
--- a/third_party/WebKit/LayoutTests/virtual/trustedeventsdefaultaction/fast/events/README.txt
+++ /dev/null
@@ -1,2 +0,0 @@
-# This suite runs the tests in fast/events with
-# --enable-blink-features=TrustedEventsDefaultAction
diff --git a/third_party/WebKit/LayoutTests/virtual/trustedeventsdefaultaction/fast/events/dispatch-synthetic-keyboardevent-no-action-expected.txt b/third_party/WebKit/LayoutTests/virtual/trustedeventsdefaultaction/fast/events/dispatch-synthetic-keyboardevent-no-action-expected.txt
deleted file mode 100644
index 1f2be30..0000000
--- a/third_party/WebKit/LayoutTests/virtual/trustedeventsdefaultaction/fast/events/dispatch-synthetic-keyboardevent-no-action-expected.txt
+++ /dev/null
@@ -1,12 +0,0 @@
-Tests to ensure that default action does not occur for untrusted events.
-
-On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
-
-
-
-PASS document.getElementById('radio1').checked is true
-PASS document.getElementById('radio2').checked is false
-PASS successfullyParsed is true
-
-TEST COMPLETE
-
diff --git a/third_party/WebKit/LayoutTests/virtual/trustedeventsdefaultaction/fast/events/simulated-key-state-expected.txt b/third_party/WebKit/LayoutTests/virtual/trustedeventsdefaultaction/fast/events/simulated-key-state-expected.txt
deleted file mode 100644
index 7cf7805..0000000
--- a/third_party/WebKit/LayoutTests/virtual/trustedeventsdefaultaction/fast/events/simulated-key-state-expected.txt
+++ /dev/null
@@ -1,7 +0,0 @@
-This tests that modifier keys are propagated to the fake mouse event created when you press return and a link has focus.
-
-If the test succeeds, you should see six "PASS" messages below.
-
-This is the link used for testing.
-
-
diff --git a/third_party/WebKit/Source/core/events/EventDispatcher.cpp b/third_party/WebKit/Source/core/events/EventDispatcher.cpp
index 9bae231..1cd6cd6 100644
--- a/third_party/WebKit/Source/core/events/EventDispatcher.cpp
+++ b/third_party/WebKit/Source/core/events/EventDispatcher.cpp
@@ -203,14 +203,10 @@ inline void EventDispatcher::dispatchEventPostProcess(void* preDispatchEventHand
// Pass the data from the preDispatchEventHandler to the postDispatchEventHandler.
m_node->postDispatchEventHandler(m_event.get(), preDispatchEventHandlerResult);
- // The DOM Events spec says that events dispatched by JS (other than "click")
- // should not have their default handlers invoked.
- bool isTrustedOrClick = !RuntimeEnabledFeatures::trustedEventsDefaultActionEnabled() || m_event->isTrusted() || (m_event->isMouseEvent() && toMouseEvent(*m_event).type() == EventTypeNames::click);
-
// Call default event handlers. While the DOM does have a concept of preventing
// default handling, the detail of which handlers are called is an internal
// implementation detail and not part of the DOM.
- if (!m_event->defaultPrevented() && !m_event->defaultHandled() && isTrustedOrClick) {
+ if (!m_event->defaultPrevented() && !m_event->defaultHandled()) {
// Non-bubbling events call only one default event handler, the one for the target.
m_node->willCallDefaultEventHandler(*m_event);
m_node->defaultEventHandler(m_event.get());
diff --git a/third_party/WebKit/Source/platform/RuntimeEnabledFeatures.in b/third_party/WebKit/Source/platform/RuntimeEnabledFeatures.in
index 5de7c80..a0b1692 100644
--- a/third_party/WebKit/Source/platform/RuntimeEnabledFeatures.in
+++ b/third_party/WebKit/Source/platform/RuntimeEnabledFeatures.in
@@ -159,7 +159,6 @@ ThreadedParserDataReceiver
Touch status=stable
TouchIconLoading
TrustedEvents status=experimental
-TrustedEventsDefaultAction
UnsafeES3APIs
UnsandboxedAuxiliary status=stable
UserSelectAll status=experimental