Changeset 284934 in webkit

Timestamp:

Oct 27, 2021 12:05:46 PM (9 months ago)

Author:

Chris Dumez

Message:

JavaScript URL result should be treated as UTF-8 bytes
​https://bugs.webkit.org/show_bug.cgi?id=232380

Reviewed by Darin Adler.

LayoutTests/imported/w3c:

Rebaseline WPT test now that more checks are passing. The remaining failures are due to the fact that we ignore the JavaScript URL result
when the URL is set as href on an anchor (as opposed to the src of an iframe). This will be addressed separately.

• web-platform-tests/html/browsers/browsing-the-web/navigating-across-documents/javascript-url-return-value-handling-dynamic-expected.txt:

Source/WebCore:

JavaScript URL result should be treated as UTF-8 bytes:

• ​https://github.com/whatwg/html/pull/6781

No new tests, rebaselined existing test.

• loader/DocumentWriter.cpp:

(WebCore::DocumentWriter::replaceDocumentWithResultOfExecutingJavascriptURL):

Location:

trunk

Files:

• LayoutTests/imported/w3c/ChangeLog (modified) (1 diff)
• LayoutTests/imported/w3c/web-platform-tests/html/browsers/browsing-the-web/navigating-across-documents/javascript-url-return-value-handling-dynamic-expected.txt (modified) (1 diff)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/loader/DocumentLoader.cpp (modified) (2 diffs)
• Source/WebCore/loader/DocumentWriter.cpp (modified) (3 diffs)
• Source/WebCore/loader/DocumentWriter.h (modified) (1 diff)

trunk/LayoutTests/imported/w3c/ChangeLog

@@ +1 @@
+2021-10-27  Chris Dumez  <cdumez@apple.com>
+
+        JavaScript URL result should be treated as UTF-8 bytes
+        https://bugs.webkit.org/show_bug.cgi?id=232380
+
+        Reviewed by Darin Adler.
+
+        Rebaseline WPT test now that more checks are passing. The remaining failures are due to the fact that we ignore the JavaScript URL result
+        when the URL is set as href on an anchor (as opposed to the src of an iframe). This will be addressed separately.
+
+        * web-platform-tests/html/browsers/browsing-the-web/navigating-across-documents/javascript-url-return-value-handling-dynamic-expected.txt:
+
 2021-10-26  Chris Dumez  <cdumez@apple.com>
 

trunk/LayoutTests/imported/w3c/web-platform-tests/html/browsers/browsing-the-web/navigating-across-documents/javascript-url-return-value-handling-dynamic-expected.txt

@@ -1 +1 @@
 
-FAIL 0041 set in src="" assert_equals: expected "UTF-8" but got "windows-1252"
+PASS 0041 set in src=""
 FAIL 0041 set in href="" targeting a frame and clicked assert_equals: expected "A" but got ""
-FAIL 0080 00FF set in src="" assert_equals: expected "UTF-8" but got "windows-1252"
+PASS 0080 00FF set in src=""
 FAIL 0080 00FF set in href="" targeting a frame and clicked assert_equals: expected "€ÿ" but got ""
-FAIL 0080 00FF 0100 set in src="" assert_equals: expected "UTF-8" but got "windows-1252"
+PASS 0080 00FF 0100 set in src=""
 FAIL 0080 00FF 0100 set in href="" targeting a frame and clicked assert_equals: expected "€ÿĀ" but got ""
-FAIL D83D DE0D set in src="" assert_equals: expected "UTF-8" but got "windows-1252"
+PASS D83D DE0D set in src=""
 FAIL D83D DE0D set in href="" targeting a frame and clicked assert_equals: expected "😍" but got ""
-FAIL DE0D 0041 set in src="" assert_equals: expected "\ufffdA" but got "U+de0dA"
+PASS DE0D 0041 set in src=""
 FAIL DE0D 0041 set in href="" targeting a frame and clicked assert_equals: expected "\ufffdA" but got ""
 

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2021-10-27  Chris Dumez  <cdumez@apple.com>
+
+        JavaScript URL result should be treated as UTF-8 bytes
+        https://bugs.webkit.org/show_bug.cgi?id=232380
+
+        Reviewed by Darin Adler.
+
+        JavaScript URL result should be treated as UTF-8 bytes:
+        - https://github.com/whatwg/html/pull/6781
+
+        No new tests, rebaselined existing test.
+
+        * loader/DocumentWriter.cpp:
+        (WebCore::DocumentWriter::replaceDocumentWithResultOfExecutingJavascriptURL):
+
 2021-10-27  Martin Robinson  <mrobinson@webkit.org>
 

trunk/Source/WebCore/loader/DocumentLoader.cpp

@@ -1281 +1281 @@
         }
 
-        bool userChosen;
+        DocumentWriter::IsEncodingUserChosen userChosen;
         String encoding;
         if (overrideEncoding().isNull()) {
-            userChosen = false;
+            userChosen = DocumentWriter::IsEncodingUserChosen::No;
             encoding = response().textEncodingName();
 #if ENABLE(WEB_ARCHIVE) || ENABLE(MHTML)
@@ -1291 +1291 @@
 #endif
         } else {
-            userChosen = true;
+            userChosen = DocumentWriter::IsEncodingUserChosen::Yes;
             encoding = overrideEncoding();
         }

trunk/Source/WebCore/loader/DocumentWriter.cpp

@@ -78 +78 @@
     begin(m_frame->document()->url(), true, ownerDocument);
 
+    setEncoding("UTF-8"_s, IsEncodingUserChosen::No);
+
     // begin() might fire an unload event, which will result in a situation where no new document has been attached,
     // and the old document has been detached. Therefore, bail out if no document is attached.
@@ -89 +91 @@
         }
 
-        // FIXME: This should call DocumentParser::appendBytes instead of append
-        // to support RawDataDocumentParsers.
-        if (DocumentParser* parser = m_frame->document()->parser())
-            parser->append(source.impl());
+        if (DocumentParser* parser = m_frame->document()->parser()) {
+            auto utf8Source = source.utf8();
+            parser->appendBytes(*this, reinterpret_cast<const uint8_t*>(utf8Source.data()), utf8Source.length());
+        }
     }
 
@@ -307 +309 @@
 }
 
-void DocumentWriter::setEncoding(const String& name, bool userChosen)
+void DocumentWriter::setEncoding(const String& name, IsEncodingUserChosen isUserChosen)
 {
     m_encoding = name;
-    m_encodingWasChosenByUser = userChosen;
+    m_encodingWasChosenByUser = isUserChosen == IsEncodingUserChosen::Yes;
 }
 

trunk/Source/WebCore/loader/DocumentWriter.h

@@ -54 +54 @@
     void setFrame(Frame&);
 
-    WEBCORE_EXPORT void setEncoding(const String& encoding, bool userChosen);
+    enum class IsEncodingUserChosen : bool { No, Yes };
+    WEBCORE_EXPORT void setEncoding(const String& encoding, IsEncodingUserChosen);
 
     const String& mimeType() const { return m_mimeType; }