Changeset 244814 in webkit

Timestamp:

Apr 30, 2019 5:12:51 PM (5 years ago)

Author:

Devin Rousso

Message:

Crash when running test wpt/tests/element_click/bubbling.py::test_element_disappears_during_click
​https://bugs.webkit.org/show_bug.cgi?id=197361
<rdar://problem/49861407>

Reviewed by Brian Burg.

Don't assume that all elements have client rects (e.g. getClientRects). If the container
element isn't visible, then the child won't be either.

• UIProcess/Automation/SimulatedInputDispatcher.cpp:

(WebKit::SimulatedInputDispatcher::resolveLocation):
(WebKit::SimulatedInputDispatcher::transitionInputSourceToState):

• UIProcess/Automation/WebAutomationSession.cpp:

(WebKit::WebAutomationSession::viewportInViewCenterPointOfElement):

Location:

trunk/Source/WebKit

Files:

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

trunk/Source/WebKit/ChangeLog

@@ +1 @@
+2019-04-30  Devin Rousso  <drousso@apple.com>
+
+        Crash when running test wpt/tests/element_click/bubbling.py::test_element_disappears_during_click
+        https://bugs.webkit.org/show_bug.cgi?id=197361
+        <rdar://problem/49861407>
+
+        Reviewed by Brian Burg.
+
+        Don't assume that all elements have client rects (e.g. `getClientRects`). If the container
+        element isn't visible, then the child won't be either.
+
+        * UIProcess/Automation/SimulatedInputDispatcher.cpp:
+        (WebKit::SimulatedInputDispatcher::resolveLocation):
+        (WebKit::SimulatedInputDispatcher::transitionInputSourceToState):
+        * UIProcess/Automation/WebAutomationSession.cpp:
+        (WebKit::WebAutomationSession::viewportInViewCenterPointOfElement):
+
 2019-04-30  Chris Dumez  <cdumez@apple.com>
 

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

@@ -223 +223 @@
             }
 
-            ASSERT(inViewCenterPoint);
+            if (!inViewCenterPoint) {
+                completionHandler(WTF::nullopt, AUTOMATION_COMMAND_ERROR_WITH_NAME(ElementNotInteractable));
+                return;
+            }
+
             destination.moveBy(inViewCenterPoint.value());
             completionHandler(destination, WTF::nullopt);
@@ -270 +274 @@
                 return;
             }
-            RELEASE_ASSERT(location);
+
+            if (!location) {
+                eventDispatchFinished(AUTOMATION_COMMAND_ERROR_WITH_NAME(ElementNotInteractable));
+                return;
+            }
+
             b.location = location;
             // The "dispatch a pointer{Down,Up,Move} action" algorithms (§17.4 Dispatching Actions).
@@ -304 +313 @@
                 return;
             }
-            RELEASE_ASSERT(location);
+
+            if (!location) {
+                eventDispatchFinished(AUTOMATION_COMMAND_ERROR_WITH_NAME(ElementNotInteractable));
+                return;
+            }
+
             b.location = location;
             // The "dispatch a pointer{Down,Up,Move} action" algorithms (§17.4 Dispatching Actions).

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

@@ -1462 +1462 @@
         }
 
-        ASSERT(inViewCenterPoint);
+        if (!inViewCenterPoint) {
+            completionHandler(WTF::nullopt, AUTOMATION_COMMAND_ERROR_WITH_NAME(ElementNotInteractable));
+            return;
+        }
+
         completionHandler(inViewCenterPoint, WTF::nullopt);
     };