Changeset 239074 in webkit

Timestamp:

Dec 11, 2018 9:39:16 AM (5 years ago)

Author:

BJ Burg

Message:

SimulatedInputDispatcher::transitionInputSourceToState() can reuse a moved-from completion handler
​https://bugs.webkit.org/show_bug.cgi?id=191155
<rdar://problem/45745569>

Reviewed by Joseph Pecoraro.

• UIProcess/Automation/SimulatedInputDispatcher.cpp:

(WebKit::SimulatedInputDispatcher::transitionInputSourceToState):
Add an ASSERT to guard against unexpected inputs where >1 VirtualKey changes per state.
webkitdriver needs to be updated to not produce such states in this scenario, but this will
avoid a runtime crash caused by trying to call a moved-out completion handler a second time.

Location:

trunk/Source/WebKit

Files:

• ChangeLog (modified) (1 diff)
• UIProcess/Automation/SimulatedInputDispatcher.cpp (modified) (2 diffs)

trunk/Source/WebKit/ChangeLog

@@ +1 @@
+2018-12-11  Brian Burg  <bburg@apple.com>
+
+        SimulatedInputDispatcher::transitionInputSourceToState() can reuse a moved-from completion handler
+        https://bugs.webkit.org/show_bug.cgi?id=191155
+        <rdar://problem/45745569>
+
+        Reviewed by Joseph Pecoraro.
+
+        * UIProcess/Automation/SimulatedInputDispatcher.cpp:
+        (WebKit::SimulatedInputDispatcher::transitionInputSourceToState):
+        Add an ASSERT to guard against unexpected inputs where >1 VirtualKey changes per state.
+        webkitdriver needs to be updated to not produce such states in this scenario, but this will
+        avoid a runtime crash caused by trying to call a moved-out completion handler a second time.
+
 2018-12-11  Commit Queue  <commit-queue@webkit.org>
 

trunk/Source/WebKit/UIProcess/Automation/SimulatedInputDispatcher.cpp

@@ -298 +298 @@
             m_client.simulateKeyboardInteraction(m_page, KeyboardInteraction::KeyRelease, a.pressedCharKey.value(), WTFMove(eventDispatchFinished));
         } else if (a.pressedVirtualKeys != b.pressedVirtualKeys) {
+            bool simulatedAnInteraction = false;
             for (VirtualKey key : b.pressedVirtualKeys) {
                 if (!a.pressedVirtualKeys.contains(key)) {
+                    ASSERT_WITH_MESSAGE(!simulatedAnInteraction, "Only one VirtualKey may differ at a time between two input source states.");
+                    if (simulatedAnInteraction)
+                        continue;
+                    simulatedAnInteraction = true;
 #if !LOG_DISABLED
                     String virtualKeyName = Inspector::Protocol::AutomationHelpers::getEnumConstantValue(key);
@@ -310 +315 @@
             for (VirtualKey key : a.pressedVirtualKeys) {
                 if (!b.pressedVirtualKeys.contains(key)) {
+                    ASSERT_WITH_MESSAGE(!simulatedAnInteraction, "Only one VirtualKey may differ at a time between two input source states.");
+                    if (simulatedAnInteraction)
+                        continue;
+                    simulatedAnInteraction = true;
 #if !LOG_DISABLED
                     String virtualKeyName = Inspector::Protocol::AutomationHelpers::getEnumConstantValue(key);