Changeset 275050 in webkit

Timestamp:

Mar 25, 2021 11:54:45 AM (16 months ago)

Author:

BJ Burg

Message:

SendKeys on Input of type=file returns element not found in some cases
​https://bugs.webkit.org/show_bug.cgi?id=223028
<rdar://problem/75526126>

Reviewed by Devin Rousso.

This bizarre behavior is triggered by removing the <input type=file> element inside an onclick() handler
for the input element. This confuses safaridriver, which expects to be able to query the file input's .value
via JavaScript after setting the files.

As part of the fix, provide the list of selected filenames in the Automation.fileChooserDismissed event.
On the safaridriver side, just use the list of filenames provided in this event to avoid an extra JS evaluation
that may race with page content.

• UIProcess/Automation/Automation.json:
• UIProcess/Automation/WebAutomationSession.cpp:

(WebKit::WebAutomationSession::handleRunOpenPanel):

Location:

trunk/Source/WebKit

Files:

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

trunk/Source/WebKit/ChangeLog

@@ +1 @@
+2021-03-25  BJ Burg  <bburg@apple.com>
+
+        SendKeys on Input of type=file returns element not found in some cases
+        https://bugs.webkit.org/show_bug.cgi?id=223028
+        <rdar://problem/75526126>
+
+        Reviewed by Devin Rousso.
+
+        This bizarre behavior is triggered by removing the <input type=file> element inside an onclick() handler
+        for the input element. This confuses safaridriver, which expects to be able to query the file input's .value
+        via JavaScript after setting the files.
+
+        As part of the fix, provide the list of selected filenames in the Automation.fileChooserDismissed event.
+        On the safaridriver side, just use the list of filenames provided in this event to avoid an extra JS evaluation
+        that may race with page content.
+
+        * UIProcess/Automation/Automation.json:
+        * UIProcess/Automation/WebAutomationSession.cpp:
+        (WebKit::WebAutomationSession::handleRunOpenPanel):
+
 2021-03-25  Alex Christensen  <achristensen@webkit.org>
 

trunk/Source/WebKit/UIProcess/Automation/Automation.json

@@ -722 +722 @@
             "parameters": [
                 { "name": "browsingContextHandle", "$ref": "BrowsingContextHandle", "description": "The handle for the browsing context." },
-                { "name": "selectionCancelled", "type": "boolean", "description": "If true, the chooser was dismissed because file selection was cancelled." }
+                { "name": "selectionCancelled", "type": "boolean", "description": "If true, file selection was cancelled due to an error. For example, this could occur if a file's MIME type cannot be handled by WebKit." },
+                { "name": "selectedFiles", "type": "array", "items": { "type": "string" }, "optional": true, "description": "A list of file names that were successfully selected for upload." }
             ]
         },

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

@@ -901 +901 @@
     if (!m_filesToSelectForFileUpload.size()) {
         resultListener.cancel();
-        m_domainNotifier->fileChooserDismissed(browsingContextHandle, true);
+        m_domainNotifier->fileChooserDismissed(browsingContextHandle, true, { });
         return;
     }
@@ -907 +907 @@
     if (m_filesToSelectForFileUpload.size() > 1 && !parameters.allowMultipleFiles()) {
         resultListener.cancel();
-        m_domainNotifier->fileChooserDismissed(browsingContextHandle, true);
+        m_domainNotifier->fileChooserDismissed(browsingContextHandle, true, { });
         return;
     }
@@ -926 +926 @@
 
     // Per §14.3.10.5 in the W3C spec, if at least one file cannot be accepted, the command should fail.
-    // The REST API service can tell that this failed by checking the "files" attribute of the input element.
     for (const String& filename : m_filesToSelectForFileUpload) {
         if (!fileCanBeAcceptedForUpload(filename, allowedMIMETypes, allowedFileExtensions)) {
             resultListener.cancel();
-            m_domainNotifier->fileChooserDismissed(browsingContextHandle, true);
+            m_domainNotifier->fileChooserDismissed(browsingContextHandle, true, { });
             return;
         }
     }
 
+    // Copy the file list we used before calling out to the open panel listener.
+    Ref<JSON::ArrayOf<String>> selectedFiles = JSON::ArrayOf<String>::create();
+    for (const String& filename : m_filesToSelectForFileUpload)
+        selectedFiles->addItem(filename);
+
     resultListener.chooseFiles(m_filesToSelectForFileUpload);
-    m_domainNotifier->fileChooserDismissed(browsingContextHandle, false);
+
+    m_domainNotifier->fileChooserDismissed(browsingContextHandle, false, WTFMove(selectedFiles));
 }