Changeset 268867 in webkit

Timestamp:

Oct 22, 2020 9:01:40 AM (21 months ago)

Author:

commit-queue@webkit.org

Message:

Elements in Shadow DOM are wrongly marked as stale by the WebDriver
​https://bugs.webkit.org/show_bug.cgi?id=217635

Patch by Nitzan Uziely <​linkgoron@gmail.com> on 2020-10-22
Reviewed by Brian Burg.

Source/WebDriver:

Changed stale checking, to check if the root node is the document element,
instead of document.contains which doesn't work for elements in Shadow DOM.

• Session.cpp:

(WebDriver::Session::elementSendKeys):

Source/WebKit:

Fixed the focus script to work for elements in Shadow DOM
instead of declaring them as not interactable.

• WebProcess/Automation/WebAutomationSessionProxy.js:

(let.AutomationSessionProxy.prototype._clearStaleNodes):
(let.AutomationSessionProxy):

Location:

trunk/Source

Files:

• WebDriver/ChangeLog (modified) (1 diff)
• WebDriver/Session.cpp (modified) (2 diffs)
• WebKit/ChangeLog (modified) (1 diff)
• WebKit/WebProcess/Automation/WebAutomationSessionProxy.js (modified) (1 diff)

trunk/Source/WebDriver/ChangeLog

@@ +1 @@
+2020-10-22  Nitzan Uziely  <linkgoron@gmail.com>
+
+        Elements in Shadow DOM are wrongly marked as stale by the WebDriver
+        https://bugs.webkit.org/show_bug.cgi?id=217635
+
+        Reviewed by Brian Burg.
+
+        Changed stale checking, to check if the root node is the document element, 
+        instead of document.contains which doesn't work for elements in Shadow DOM.
+
+        * Session.cpp:
+        (WebDriver::Session::elementSendKeys):
+
 2020-10-21  Carlos Garcia Campos  <cgarcia@igalia.com>
 

trunk/Source/WebDriver/Session.cpp

@@ -2095 +2095 @@
                     "    let doc = element.ownerDocument || element;"
                     "    let prevActiveElement = doc.activeElement;"
-                    "    if (element != prevActiveElement && prevActiveElement)"
+                    "    let elementRootNode = element.getRootNode();"
+                    "    if (elementRootNode.activeElement !== element && prevActiveElement)"
                     "        prevActiveElement.blur();"
                     "    element.focus();"
@@ -2104 +2105 @@
                     "    if (isTextElement && element.selectionEnd == 0)"
                     "        element.setSelectionRange(element.value.length, element.value.length);"
-                    "    if (element != doc.activeElement)"
+                    "    if (elementRootNode.activeElement !== element)"
                     "        throw {name: 'ElementNotInteractable', message: 'Element is not focusable.'};"
                     "}";

trunk/Source/WebKit/ChangeLog

@@ +1 @@
+2020-10-22  Nitzan Uziely  <linkgoron@gmail.com>
+
+        Elements in Shadow DOM are wrongly marked as stale by the WebDriver
+        https://bugs.webkit.org/show_bug.cgi?id=217635
+
+        Reviewed by Brian Burg.
+
+        Fixed the focus script to work for elements in Shadow DOM
+        instead of declaring them as not interactable.
+
+        * WebProcess/Automation/WebAutomationSessionProxy.js:
+        (let.AutomationSessionProxy.prototype._clearStaleNodes):
+        (let.AutomationSessionProxy):
+
 2020-10-22  Aditya Keerthi  <akeerthi@apple.com>
 

trunk/Source/WebKit/WebProcess/Automation/WebAutomationSessionProxy.js

@@ -253 +253 @@
     {
         for (var [node, identifier] of this._nodeToIdMap) {
-            if (!document.contains(node)) {
+            const rootNode = node.getRootNode({ composed: true });
+            if (rootNode !== document) {
                 this._nodeToIdMap.delete(node);
                 this._idToNodeMap.delete(identifier);