Changeset 254498 in webkit

Timestamp:

Jan 13, 2020 11:55:01 PM (4 years ago)

Author:

Alexey Shvayka

Message:

<iframe> attributes should be processed on "srcdoc" attribute removal
​https://bugs.webkit.org/show_bug.cgi?id=205995

Reviewed by Darin Adler.

LayoutTests/imported/w3c:

• web-platform-tests/html/semantics/embedded-content/the-iframe-element/srcdoc_process_attributes-expected.txt:

Source/WebCore:

Test: imported/w3c/web-platform-tests/html/semantics/embedded-content/the-iframe-element/srcdoc_process_attributes.html

Per spec, "srcdoc" attribute of an <iframe> takes precedence over "src" [1].
Before this change, "srcdoc" handling in HTMLFrameElementBase::parseAttribute didn't check whether
the attribute was set or removed. As a result, removal of "srcdoc" attribute navigated the <iframe>
to "about:srcdoc" instead of URL in value of "src" attribute.

With this change, <iframe> attributes processing matches Chrome and Firefox.

[1] ​https://html.spec.whatwg.org/multipage/iframe-embed-object.html#process-the-iframe-attributes

• html/HTMLFrameElementBase.cpp:

(WebCore::HTMLFrameElementBase::parseAttribute):

Location:

trunk

Files:

• LayoutTests/imported/w3c/ChangeLog (modified) (1 diff)
• LayoutTests/imported/w3c/web-platform-tests/html/semantics/embedded-content/the-iframe-element/srcdoc_process_attributes-expected.txt (modified) (1 diff)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/html/HTMLFrameElementBase.cpp (modified) (1 diff)

trunk/LayoutTests/imported/w3c/ChangeLog

@@ +1 @@
+2020-01-13  Alexey Shvayka  <shvaikalesh@gmail.com>
+
+        <iframe> attributes should be processed on "srcdoc" attribute removal
+        https://bugs.webkit.org/show_bug.cgi?id=205995
+
+        Reviewed by Darin Adler.
+
+        * web-platform-tests/html/semantics/embedded-content/the-iframe-element/srcdoc_process_attributes-expected.txt:
+
 2020-01-13  Pablo Saavedra  <psaavedra@igalia.com>
 

trunk/LayoutTests/imported/w3c/web-platform-tests/html/semantics/embedded-content/the-iframe-element/srcdoc_process_attributes-expected.txt

@@ -3 +3 @@
 PASS Adding `srcdoc` attribute triggers attributes processing 
 PASS Setting `srcdoc` (via property) triggers attributes processing 
-FAIL Removing `srcdoc` attribute triggers attributes processing assert_equals: expected "blob:" but got "about:"
+PASS Removing `srcdoc` attribute triggers attributes processing 
 

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2020-01-13  Alexey Shvayka  <shvaikalesh@gmail.com>
+
+        <iframe> attributes should be processed on "srcdoc" attribute removal
+        https://bugs.webkit.org/show_bug.cgi?id=205995
+
+        Reviewed by Darin Adler.
+
+        Test: imported/w3c/web-platform-tests/html/semantics/embedded-content/the-iframe-element/srcdoc_process_attributes.html
+
+        Per spec, "srcdoc" attribute of an <iframe> takes precedence over "src" [1].
+        Before this change, "srcdoc" handling in HTMLFrameElementBase::parseAttribute didn't check whether
+        the attribute was set or removed. As a result, removal of "srcdoc" attribute navigated the <iframe>
+        to "about:srcdoc" instead of URL in value of "src" attribute.
+
+        With this change, <iframe> attributes processing matches Chrome and Firefox.
+
+        [1] https://html.spec.whatwg.org/multipage/iframe-embed-object.html#process-the-iframe-attributes
+
+        * html/HTMLFrameElementBase.cpp:
+        (WebCore::HTMLFrameElementBase::parseAttribute):
+
 2020-01-13  Simon Fraser  <simon.fraser@apple.com>
 

trunk/Source/WebCore/html/HTMLFrameElementBase.cpp

@@ -105 +105 @@
 void HTMLFrameElementBase::parseAttribute(const QualifiedName& name, const AtomString& value)
 {
-    if (name == srcdocAttr)
-        setLocation("about:srcdoc");
-    else if (name == srcAttr && !hasAttributeWithoutSynchronization(srcdocAttr))
+    if (name == srcdocAttr) {
+        if (value.isNull()) {
+            const AtomString& srcValue = attributeWithoutSynchronization(srcAttr);
+            if (!srcValue.isNull())
+                setLocation(stripLeadingAndTrailingHTMLSpaces(srcValue));
+        } else
+            setLocation("about:srcdoc");
+    } else if (name == srcAttr && !hasAttributeWithoutSynchronization(srcdocAttr))
         setLocation(stripLeadingAndTrailingHTMLSpaces(value));
     else