Forms: use http: rather than file: to accomodate OOPIF

Bug: 786539 Bug: 661819 Change-Id: I26167fe8cf6f5959420d15fbed9e49a118f445b7 Cq-Include-Trybots: master.tryserver.chromium.linux:linux_site_isolation Reviewed-on: https://chromium-review.googlesource.com/778019 Commit-Queue: Benjamin Wiley Sittler <bsittler@chromium.org> Reviewed-by: Victor Costan <pwnall@chromium.org> Reviewed-by: Marijn Kruisselbrink <mek@chromium.org> Cr-Commit-Position: refs/heads/master@{#517694}
marcosholgado · Nov 18, 2017 · 126a0e6 · 126a0e6
1 parent 7b33c54
commit 126a0e6
Show file tree

Hide file tree

Showing 9 changed files with 15 additions and 27 deletions.
diff --git a/third_party/WebKit/LayoutTests/FlagExpectations/site-per-process b/third_party/WebKit/LayoutTests/FlagExpectations/site-per-process
@@ -153,18 +153,6 @@ crbug.com/778696 virtual/threaded/fast/scroll-behavior/first-scroll-runs-on-comp
 # https://crbug.com/778372: Unique name conflict with old entries?
 crbug.com/778372 external/wpt/html/browsers/origin/cross-origin-objects/cross-origin-objects.html [ Crash ]
 
-# https://crbug.com/786539: possible file drag-and-drop issue with OOPIFs?
-crbug.com/786539 http/tests/local/fileapi/send-dragged-file-form-iso-2022-jp.html [ Failure ]
-crbug.com/786539 http/tests/local/fileapi/send-dragged-file-form-utf-8.html [ Failure ]
-crbug.com/786539 http/tests/local/fileapi/send-dragged-file-form-windows-1252.html [ Failure ]
-crbug.com/786539 http/tests/local/fileapi/send-dragged-file-form-x-user-defined.html [ Failure ]
-crbug.com/786539 http/tests/local/fileapi/send-dragged-file-form.html [ Failure ]
-crbug.com/786539 virtual/mojo-loading/http/tests/local/fileapi/send-dragged-file-form-iso-2022-jp.html [ Failure ]
-crbug.com/786539 virtual/mojo-loading/http/tests/local/fileapi/send-dragged-file-form-utf-8.html [ Failure ]
-crbug.com/786539 virtual/mojo-loading/http/tests/local/fileapi/send-dragged-file-form-windows-1252.html [ Failure ]
-crbug.com/786539 virtual/mojo-loading/http/tests/local/fileapi/send-dragged-file-form-x-user-defined.html [ Failure ]
-crbug.com/786539 virtual/mojo-loading/http/tests/local/fileapi/send-dragged-file-form.html [ Failure ]
-
 # The tests below are inherently incompatible with isolating same-site, cross-origin
 # frames into separate processes (which is how Site Isolation bots treat
 # www1.web-platform.test, www2.web-platform.test, etc).

diff --git a/...al/fileapi/resources/delete-temp-file.cgi → ...ts/fileapi/resources/delete-temp-file.cgi b/...al/fileapi/resources/delete-temp-file.cgi → ...ts/fileapi/resources/delete-temp-file.cgi
diff --git a/...esources/send-dragged-file-form-helper.js → ...esources/send-dragged-file-form-helper.js b/...esources/send-dragged-file-form-helper.js → ...esources/send-dragged-file-form-helper.js
@@ -100,8 +100,8 @@ const kWebServer = 'http://127.0.0.1:8000';
 // numeric character reference replacement for filenames, field names,
 // and field values.
 //
-// Uses /local/fileapi/resources/write-temp-file.cgi to create the
-// test file and /local/fileapi/resources/delete-temp-file.cgi to
+// Uses /fileapi/resources/write-temp-file.cgi to create the
+// test file and /fileapi/resources/delete-temp-file.cgi to
 // remove it at the end of the test.
 //
 // Uses /xmlhttprequest/resources/post-echo.cgi to echo the upload
@@ -212,7 +212,7 @@ const formPostFileUploadTest = ({
     form.appendChild(fileInput);
 
     const fileToDropLines = (await (await fetch(
-        `${kWebServer}/local/fileapi/resources/write-temp-file.cgi` +
+        `${kWebServer}/fileapi/resources/write-temp-file.cgi` +
           `?filename=${
                encodeURIComponent(fileBaseName)
              }&data=${encodeURIComponent(kTestChars)}`,
@@ -260,13 +260,13 @@ const formPostFileUploadTest = ({
       });
     } finally {
       const cleanupErrors = await (await fetch(
-          `${kWebServer}/local/fileapi/resources/delete-temp-file.cgi` +
+          `${kWebServer}/fileapi/resources/delete-temp-file.cgi` +
             `?filename=${encodeURIComponent(fileToDrop)}`,
           { method: 'post' })).text();
       assert_equals(cleanupErrors, 'OK', 'Temp file cleanup should not fail');
     }
 
-    const formDataText = formTargetFrame.contentDocument.body.innerText;
+    const formDataText = formTargetFrame.contentDocument.body.textContent;
     const formDataLines = formDataText.split('\n');
     if (formDataLines.length && !formDataLines[formDataLines.length - 1]) {
       --formDataLines.length;

diff --git a/...cal/fileapi/resources/write-temp-file.cgi → ...sts/fileapi/resources/write-temp-file.cgi b/...cal/fileapi/resources/write-temp-file.cgi → ...sts/fileapi/resources/write-temp-file.cgi
diff --git a/...i/send-dragged-file-form-iso-2022-jp.html → ...i/send-dragged-file-form-iso-2022-jp.html b/...i/send-dragged-file-form-iso-2022-jp.html → ...i/send-dragged-file-form-iso-2022-jp.html
@@ -5,8 +5,8 @@
       href="https://html.spec.whatwg.org/multipage/form-control-infrastructure.html#multipart-form-data">
 <link rel="author" title="Benjamin C. Wiley Sittler"
       href="mailto:bsittler@chromium.org">
-<script src="../../../../resources/testharness.js"></script>
-<script src="../../../../resources/testharnessreport.js"></script>
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
 <script src="resources/send-dragged-file-form-helper.js"></script>
 <!--
 

diff --git a/...fileapi/send-dragged-file-form-utf-8.html → ...fileapi/send-dragged-file-form-utf-8.html b/...fileapi/send-dragged-file-form-utf-8.html → ...fileapi/send-dragged-file-form-utf-8.html
@@ -5,8 +5,8 @@
       href="https://html.spec.whatwg.org/multipage/form-control-infrastructure.html#multipart-form-data">
 <link rel="author" title="Benjamin C. Wiley Sittler"
       href="mailto:bsittler@chromium.org">
-<script src="../../../../resources/testharness.js"></script>
-<script src="../../../../resources/testharnessreport.js"></script>
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
 <script src="resources/send-dragged-file-form-helper.js"></script>
 <!--
 

diff --git a/.../send-dragged-file-form-windows-1252.html → .../send-dragged-file-form-windows-1252.html b/.../send-dragged-file-form-windows-1252.html → .../send-dragged-file-form-windows-1252.html
@@ -5,8 +5,8 @@
       href="https://html.spec.whatwg.org/multipage/form-control-infrastructure.html#multipart-form-data">
 <link rel="author" title="Benjamin C. Wiley Sittler"
       href="mailto:bsittler@chromium.org">
-<script src="../../../../resources/testharness.js"></script>
-<script src="../../../../resources/testharnessreport.js"></script>
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
 <script src="resources/send-dragged-file-form-helper.js"></script>
 <!--
 

diff --git a/...end-dragged-file-form-x-user-defined.html → ...end-dragged-file-form-x-user-defined.html b/...end-dragged-file-form-x-user-defined.html → ...end-dragged-file-form-x-user-defined.html
@@ -5,8 +5,8 @@
       href="https://html.spec.whatwg.org/multipage/form-control-infrastructure.html#multipart-form-data">
 <link rel="author" title="Benjamin C. Wiley Sittler"
       href="mailto:bsittler@chromium.org">
-<script src="../../../../resources/testharness.js"></script>
-<script src="../../../../resources/testharnessreport.js"></script>
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
 <script src="resources/send-dragged-file-form-helper.js"></script>
 <!--
 

diff --git a/...local/fileapi/send-dragged-file-form.html → ...tests/fileapi/send-dragged-file-form.html b/...local/fileapi/send-dragged-file-form.html → ...tests/fileapi/send-dragged-file-form.html
@@ -5,8 +5,8 @@
       href="https://html.spec.whatwg.org/multipage/form-control-infrastructure.html#multipart-form-data">
 <link rel="author" title="Benjamin C. Wiley Sittler"
       href="mailto:bsittler@chromium.org">
-<script src="../../../../resources/testharness.js"></script>
-<script src="../../../../resources/testharnessreport.js"></script>
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
 <script src="resources/send-dragged-file-form-helper.js"></script>
 <script>
 'use strict';