Changeset 213542 in webkit

Timestamp:

Mar 7, 2017 2:24:19 PM (7 years ago)

Author:

Chris Dumez

Message:

Label of an <option> element should not be displayed in quirks mode
​https://bugs.webkit.org/show_bug.cgi?id=169296
<rdar://problem/30900751>

Reviewed by Simon Fraser.

Source/WebCore:

Label of an <option> element should not be displayed in quirks mode, to
match Chrome and Firefox. However, we should still display the label in
strict mode, as per the HTML specification:

• ​https://html.spec.whatwg.org/multipage/rendering.html#the-select-element-2

Chrome renders the label in strict mode, same as us. Firefox does not:

• ​https://bugzilla.mozilla.org/show_bug.cgi?id=1345242

Tests: fast/dom/HTMLOptionElement/option-label-quirksmode.html

fast/dom/HTMLOptionElement/option-label-quirksmode2.html
fast/dom/HTMLOptionElement/option-label-strictmode.html

• html/HTMLOptionElement.cpp:

(WebCore::HTMLOptionElement::displayLabel):
(WebCore::HTMLOptionElement::textIndentedToRespectGroupLabel):

• html/HTMLOptionElement.h:

LayoutTests:

Add layout test coverage.

• fast/dom/HTMLOptionElement/option-label-quirksmode-expected.html: Added.
• fast/dom/HTMLOptionElement/option-label-quirksmode.html: Added.
• fast/dom/HTMLOptionElement/option-label-quirksmode2-expected.html: Added.
• fast/dom/HTMLOptionElement/option-label-quirksmode2.html: Added.
• fast/dom/HTMLOptionElement/option-label-strictmode-expected.html: Added.
• fast/dom/HTMLOptionElement/option-label-strictmode.html: Added.

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/fast/dom/HTMLOptionElement/option-label-quirksmode-expected.html (added)
• LayoutTests/fast/dom/HTMLOptionElement/option-label-quirksmode.html (added)
• LayoutTests/fast/dom/HTMLOptionElement/option-label-quirksmode2-expected.html (added)
• LayoutTests/fast/dom/HTMLOptionElement/option-label-quirksmode2.html (added)
• LayoutTests/fast/dom/HTMLOptionElement/option-label-strictmode-expected.html (added)
• LayoutTests/fast/dom/HTMLOptionElement/option-label-strictmode.html (added)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/html/HTMLOptionElement.cpp (modified) (2 diffs)
• Source/WebCore/html/HTMLOptionElement.h (modified) (1 diff)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2017-03-07  Chris Dumez  <cdumez@apple.com>
+
+        Label of an <option> element should not be displayed in quirks mode
+        https://bugs.webkit.org/show_bug.cgi?id=169296
+        <rdar://problem/30900751>
+
+        Reviewed by Simon Fraser.
+
+        Add layout test coverage.
+
+        * fast/dom/HTMLOptionElement/option-label-quirksmode-expected.html: Added.
+        * fast/dom/HTMLOptionElement/option-label-quirksmode.html: Added.
+        * fast/dom/HTMLOptionElement/option-label-quirksmode2-expected.html: Added.
+        * fast/dom/HTMLOptionElement/option-label-quirksmode2.html: Added.
+        * fast/dom/HTMLOptionElement/option-label-strictmode-expected.html: Added.
+        * fast/dom/HTMLOptionElement/option-label-strictmode.html: Added.
+
 2017-03-07  Ryan Haddad  <ryanhaddad@apple.com>
 

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2017-03-07  Chris Dumez  <cdumez@apple.com>
+
+        Label of an <option> element should not be displayed in quirks mode
+        https://bugs.webkit.org/show_bug.cgi?id=169296
+        <rdar://problem/30900751>
+
+        Reviewed by Simon Fraser.
+
+        Label of an <option> element should not be displayed in quirks mode, to
+        match Chrome and Firefox. However, we should still display the label in
+        strict mode, as per the HTML specification:
+        - https://html.spec.whatwg.org/multipage/rendering.html#the-select-element-2
+
+        Chrome renders the label in strict mode, same as us. Firefox does not:
+        - https://bugzilla.mozilla.org/show_bug.cgi?id=1345242
+
+        Tests: fast/dom/HTMLOptionElement/option-label-quirksmode.html
+               fast/dom/HTMLOptionElement/option-label-quirksmode2.html
+               fast/dom/HTMLOptionElement/option-label-strictmode.html
+
+        * html/HTMLOptionElement.cpp:
+        (WebCore::HTMLOptionElement::displayLabel):
+        (WebCore::HTMLOptionElement::textIndentedToRespectGroupLabel):
+        * html/HTMLOptionElement.h:
+
 2017-03-07  Dean Jackson  <dino@apple.com>
 

trunk/Source/WebCore/html/HTMLOptionElement.cpp

@@ -277 +277 @@
 }
 
+// Same as label() but ignores the label content attribute in quirks mode for compatibility with other browsers.
+String HTMLOptionElement::displayLabel() const
+{
+    if (document().inQuirksMode())
+        return collectOptionInnerText().stripWhiteSpace(isHTMLSpace).simplifyWhiteSpace(isHTMLSpace);
+    return label();
+}
+
 void HTMLOptionElement::setLabel(const String& label)
 {
@@ -296 +304 @@
     ContainerNode* parent = parentNode();
     if (is<HTMLOptGroupElement>(parent))
-        return "    " + label();
-    return label();
+        return "    " + displayLabel();
+    return displayLabel();
 }
 

trunk/Source/WebCore/html/HTMLOptionElement.h

@@ -55 +55 @@
 
     WEBCORE_EXPORT String label() const;
+    String displayLabel() const;
     WEBCORE_EXPORT void setLabel(const String&);