Changeset 266671 in webkit

Timestamp:

Sep 5, 2020, 1:54:42 PM (5 years ago)

Author:

achristensen@apple.com

Message:

XML documents in iframes should not inherit encoding from parent frame
​https://bugs.webkit.org/show_bug.cgi?id=216216

Reviewed by Darin Adler.

LayoutTests/imported/w3c:

• web-platform-tests/encoding/utf-32-from-win1252-expected.txt:

Source/WebCore:

This seems to match the behavior of Chrome and Firefox.
Covered by newly passing web platform tests, which other browsers already pass.

• loader/DocumentWriter.cpp:

(WebCore::canReferToParentFrameEncoding):

Location:

trunk

Files:

• LayoutTests/imported/w3c/ChangeLog (modified) (1 diff)
• LayoutTests/imported/w3c/web-platform-tests/encoding/utf-32-from-win1252-expected.txt (modified) (1 diff)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/loader/DocumentWriter.cpp (modified) (1 diff)

trunk/LayoutTests/imported/w3c/ChangeLog

@@ +1 @@
+2020-09-05  Alex Christensen  <achristensen@webkit.org>
+
+        XML documents in iframes should not inherit encoding from parent frame
+        https://bugs.webkit.org/show_bug.cgi?id=216216
+
+        Reviewed by Darin Adler.
+
+        * web-platform-tests/encoding/utf-32-from-win1252-expected.txt:
+
 2020-09-05  Alex Christensen  <achristensen@webkit.org>
 

trunk/LayoutTests/imported/w3c/web-platform-tests/encoding/utf-32-from-win1252-expected.txt

@@ -1 +1 @@
 
 PASS Expect resources/utf-32-big-endian-bom.html to parse as windows-1252 
-FAIL Expect resources/utf-32-big-endian-bom.xml to parse as UTF-8 assert_equals: expected "UTF-8" but got "windows-1252"
+PASS Expect resources/utf-32-big-endian-bom.xml to parse as UTF-8 
 PASS Expect resources/utf-32-big-endian-nobom.html to parse as windows-1252 
-FAIL Expect resources/utf-32-big-endian-nobom.xml to parse as UTF-8 assert_equals: expected "UTF-8" but got "windows-1252"
+PASS Expect resources/utf-32-big-endian-nobom.xml to parse as UTF-8 
 PASS Expect resources/utf-32-little-endian-bom.html to parse as UTF-16LE 
 PASS Expect resources/utf-32-little-endian-bom.xml to parse as UTF-16LE 
 PASS Expect resources/utf-32-little-endian-nobom.html to parse as windows-1252 
-FAIL Expect resources/utf-32-little-endian-nobom.xml to parse as UTF-8 assert_equals: expected "UTF-8" but got "windows-1252"
+PASS Expect resources/utf-32-little-endian-nobom.xml to parse as UTF-8 
 

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2020-09-05  Alex Christensen  <achristensen@webkit.org>
+
+        XML documents in iframes should not inherit encoding from parent frame
+        https://bugs.webkit.org/show_bug.cgi?id=216216
+
+        Reviewed by Darin Adler.
+
+        This seems to match the behavior of Chrome and Firefox.
+        Covered by newly passing web platform tests, which other browsers already pass.
+
+        * loader/DocumentWriter.cpp:
+        (WebCore::canReferToParentFrameEncoding):
+
 2020-09-05  Devin Rousso  <drousso@apple.com>
 

trunk/Source/WebCore/loader/DocumentWriter.cpp

@@ -56 +56 @@
 static inline bool canReferToParentFrameEncoding(const Frame* frame, const Frame* parentFrame) 
 {
+    if (is<XMLDocument>(frame->document()))
+        return false;
     return parentFrame && parentFrame->document()->securityOrigin().canAccess(frame->document()->securityOrigin());
 }