Backed out changeset afcfa17be8ac (bug 1367430) for making bug 1365021 worse

--HG--
extra : rebase_source : e655ab964901f8fa3c4993ccf46b1c812b3957e7

testing/marionette/action.js

@@ -898,20 +898,6 @@ action.Mouse = class {
     assert.positiveInteger(button);
     this.button = button;
     this.buttons = 0;
-    this.altKey = false;
-    this.shiftKey = false;
-    this.metaKey = false;
-    this.ctrlKey = false;
-    // set modifier properties based on whether any corresponding keys are
-    // pressed on any key input source
-    for (let inputState of action.inputStateMap.values()) {
-      if (inputState.type == "key") {
-        this.altKey = inputState.alt || this.altKey;
-        this.ctrlKey = inputState.ctrl || this.ctrlKey;
-        this.metaKey = inputState.meta || this.metaKey;
-        this.shiftKey = inputState.shift || this.shiftKey;
-      }
-    }
   }
 
   update(inputState) {

testing/web-platform/tests/webdriver/actions/sequence.py

-import pytest
-
 from support.refine import get_keys, filter_dict, get_events
-from support.keys import Keys
 
 
 def test_no_actions_send_no_events(session, key_reporter, key_chain):
@@ -32,113 +29,3 @@ def test_release_no_actions_sends_no_events(session, key_reporter):
     session.actions.release()
     assert len(get_keys(key_reporter)) == 0
     assert len(get_events(session)) == 0
-
-
-@pytest.mark.parametrize("modifier, prop", [
-    (Keys.CONTROL, "ctrlKey"),
-    (Keys.ALT, "altKey"),
-    (Keys.META, "metaKey"),
-    (Keys.SHIFT, "shiftKey"),
-    (Keys.R_CONTROL, "ctrlKey"),
-    (Keys.R_ALT, "altKey"),
-    (Keys.R_META, "metaKey"),
-    (Keys.R_SHIFT, "shiftKey"),
-])
-def test_control_click(session,
-                       test_actions_page,
-                       key_chain,
-                       mouse_chain,
-                       modifier,
-                       prop):
-    key_chain \
-        .pause(0) \
-        .key_down(modifier) \
-        .pause(200) \
-        .key_up(modifier)
-    outer = session.find.css("#outer", all=False)
-    mouse_chain.click(element=outer)
-    session.actions.perform([key_chain.dict, mouse_chain.dict])
-    expected = [
-        {"type": "mousemove"},
-        {"type": "mousedown"},
-        {"type": "mouseup"},
-        {"type": "click"},
-    ]
-    defaults = {
-        "altKey": False,
-        "metaKey": False,
-        "shiftKey": False,
-        "ctrlKey": False
-    }
-    for e in expected:
-        e.update(defaults)
-        if e["type"] != "mousemove":
-            e[prop] = True
-    filtered_events = [filter_dict(e, expected[0]) for e in get_events(session)]
-    assert expected == filtered_events
-
-
-def test_release_control_click(session, key_reporter, key_chain, mouse_chain):
-    key_chain \
-        .pause(0) \
-        .key_down(Keys.CONTROL)
-    mouse_chain \
-        .pointer_move(0, 0, origin=key_reporter) \
-        .pointer_down()
-    session.actions.perform([key_chain.dict, mouse_chain.dict])
-    session.execute_script("""
-        var keyReporter = document.getElementById("keys");
-        ["mousedown", "mouseup"].forEach((e) => {
-            keyReporter.addEventListener(e, recordPointerEvent);
-          });
-        resetEvents();
-    """)
-    session.actions.release()
-    expected = [
-        {"type": "mouseup"},
-        {"type": "keyup"},
-    ]
-    events = [filter_dict(e, expected[0]) for e in get_events(session)]
-    assert events == expected
-
-
-def test_many_modifiers_click(session, test_actions_page, key_chain, mouse_chain):
-    outer = session.find.css("#outer", all=False)
-    key_chain \
-        .pause(0) \
-        .key_down(Keys.CONTROL) \
-        .key_down(Keys.SHIFT) \
-        .pause(0) \
-        .key_up(Keys.CONTROL) \
-        .key_up(Keys.SHIFT)
-    mouse_chain \
-        .pointer_move(0, 0, origin=outer) \
-        .pause(0) \
-        .pointer_down() \
-        .pointer_up() \
-        .pause(0) \
-        .pause(0) \
-        .pointer_down()
-    session.actions.perform([key_chain.dict, mouse_chain.dict])
-    expected = [
-        {"type": "mousemove"},
-        # shift and ctrl presses
-        {"type": "mousedown"},
-        {"type": "mouseup"},
-        {"type": "click"},
-        # no modifiers pressed
-        {"type": "mousedown"},
-    ]
-    defaults = {
-        "altKey": False,
-        "metaKey": False,
-        "shiftKey": False,
-        "ctrlKey": False
-    }
-    for e in expected:
-        e.update(defaults)
-    for e in expected[1:4]:
-        e["shiftKey"] = True
-        e["ctrlKey"] = True
-    events = [filter_dict(e, expected[0]) for e in get_events(session)]
-    assert events == expected

testing/web-platform/tests/webdriver/actions/support/test_actions_wdspec.html

@@ -70,10 +70,6 @@
             "buttons": event.buttons,
             "pageX": event.pageX,
             "pageY": event.pageY,
-            "ctrlKey": event.ctrlKey,
-            "metaKey": event.metaKey,
-            "altKey": event.altKey,
-            "shiftKey": event.shiftKey,
             "target": event.target.id
           });
           appendMessage(`${event.type}(` +
@@ -82,10 +78,6 @@
               `pageY: ${event.pageY}, ` +
               `button: ${event.button}, ` +
               `buttons: ${event.buttons}, ` +
-              `ctrlKey: ${event.ctrlKey}, ` +
-              `altKey: ${event.altKey}, ` +
-              `metaKey: ${event.metaKey}, ` +
-              `shiftKey: ${event.shiftKey}, ` +
               `target id: ${event.target.id})`);
         }