Changeset 96721 in webkit

Timestamp:

Oct 5, 2011 10:41:52 AM (13 years ago)

Author:

commit-queue@webkit.org

Message:

Spec change - option.label should be reflected like option.value
​https://bugs.webkit.org/show_bug.cgi?id=68684

Patch by Sachin Puranik <​jcqt43@motorola.com> on 2011-10-05
Reviewed by Darin Adler.

Source/WebCore:

Incorporating the recent change in spec for label attribute of
option element. While retrieving the "Label" IDL attribute return
the "Label" content attribute if present , else return the
value of textContent attribute.

Tests: fast/forms/option-label-trim-html-spaces.html

fast/forms/option-value-and-label-changed-by-js.html

• dom/OptionElement.cpp:

(WebCore::OptionElement::normalizeText):style fixes

• dom/OptionElement.h: make collectOptionInnerText() protected.
• html/HTMLOptionElement.cpp:

(WebCore::HTMLOptionElement::label): return innerText if label attribute un-available.
(WebCore::HTMLOptionElement::setLabel):setLabel() implementation.

• html/HTMLOptionElement.h: add setLabel declaration.
• html/HTMLOptionElement.idl: Change reflect to ConvertNullToNullString in idl

LayoutTests:

IDL "Label" attribute of option element should return textContent IDL attribute
if conetent attribute "Label" is unavailable. Changed the tests to match
above said behaviour. Added new tests.

• fast/forms/option-label-trim-html-spaces-expected.txt: Html space triming test.
• fast/forms/option-label-trim-html-spaces.html: Html space triming test.
• fast/forms/option-value-and-label-changed-by-js-expected.txt: Attribute change from JS.
• fast/forms/option-value-and-label-changed-by-js.html: Attribute change from JS.
• fast/forms/option-value-and-label-expected.txt: Changed test case as per new spec.
• fast/forms/option-value-and-label.html: Changed test case as per new spec.

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/fast/forms/option-label-trim-html-spaces-expected.txt (added)
• LayoutTests/fast/forms/option-label-trim-html-spaces.html (added)
• LayoutTests/fast/forms/option-value-and-label-changed-by-js-expected.txt (added)
• LayoutTests/fast/forms/option-value-and-label-changed-by-js.html (copied) (copied from trunk/LayoutTests/fast/forms/option-value-and-label.html) (2 diffs)
• LayoutTests/fast/forms/option-value-and-label-expected.txt (modified) (1 diff)
• LayoutTests/fast/forms/option-value-and-label.html (modified) (1 diff)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/dom/OptionElement.cpp (modified) (2 diffs)
• Source/WebCore/dom/OptionElement.h (modified) (1 diff)
• Source/WebCore/html/HTMLOptionElement.cpp (modified) (3 diffs)
• Source/WebCore/html/HTMLOptionElement.h (modified) (2 diffs)
• Source/WebCore/html/HTMLOptionElement.idl (modified) (1 diff)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2011-10-05  Sachin Puranik  <jcqt43@motorola.com>
+
+        Spec change - option.label should be reflected like option.value
+        https://bugs.webkit.org/show_bug.cgi?id=68684
+
+        Reviewed by Darin Adler.
+
+        IDL "Label" attribute of option element should return textContent IDL attribute
+        if conetent attribute "Label" is unavailable. Changed the tests to match
+        above said behaviour. Added new tests.
+
+        * fast/forms/option-label-trim-html-spaces-expected.txt: Html space triming test.
+        * fast/forms/option-label-trim-html-spaces.html: Html space triming test.
+        * fast/forms/option-value-and-label-changed-by-js-expected.txt: Attribute change from JS.
+        * fast/forms/option-value-and-label-changed-by-js.html: Attribute change from JS.
+        * fast/forms/option-value-and-label-expected.txt: Changed  test case as per new spec.
+        * fast/forms/option-value-and-label.html: Changed test case as per new spec.
+
 2011-10-05  Ilya Tikhonovsky  <loislo@chromium.org>
 

trunk/LayoutTests/fast/forms/option-value-and-label-changed-by-js.html

@@ -10 +10 @@
 
 <select>
-<option id="o1">text</option>
-<option id="o2" value="value">text</option>
-<option id="o3" label="label">text</option>
+<option id="o1">  text  </option>
+<option id="o2" value="value">  text  </option>
+<option id="o3" label="label">  text  </option>
 <option id="o4" value="value" label="label">text</option>
 </select>
@@ -20 +20 @@
 
 var o1 = document.getElementById('o1');
-shouldBe('o1.value', '"text"');
-shouldBe('o1.label', '""');
+o1.label = "newLabel"
+o1.value = "newValue"
+shouldBe('o1.value', '"newValue"');
+shouldBe('o1.label', '"newLabel"');
 
 var o2 = document.getElementById('o2');
-shouldBe('o2.value', '"value"');
-shouldBe('o2.label', '""');
+o2.label = "newLabel"
+o2.value = "newValue"
+shouldBe('o2.value', '"newValue"');
+shouldBe('o2.label', '"newLabel"');
 
 var o3 = document.getElementById('o3');
-shouldBe('o3.value', '"text"');
-shouldBe('o3.label', '"label"');
+o3.label = "newLabel"
+o3.value = "newValue"
+shouldBe('o3.value', '"newValue"');
+shouldBe('o3.label', '"newLabel"');
 
 var o4 = document.getElementById('o4');
-shouldBe('o4.value', '"value"');
-shouldBe('o4.label', '"label"');
+o4.label = "newLabel"
+o4.value = "newValue"
+shouldBe('o4.value', '"newValue"');
+shouldBe('o4.label', '"newLabel"');
 
 var successfullyParsed = true;

trunk/LayoutTests/fast/forms/option-value-and-label-expected.txt

@@ -5 +5 @@
 
 PASS o1.value is "text"
-PASS o1.label is ""
+PASS o1.label is "text"
 PASS o2.value is "value"
-PASS o2.label is ""
+PASS o2.label is "text"
 PASS o3.value is "text"
 PASS o3.label is "label"

trunk/LayoutTests/fast/forms/option-value-and-label.html

@@ -21 +21 @@
 var o1 = document.getElementById('o1');
 shouldBe('o1.value', '"text"');
-shouldBe('o1.label', '""');
+shouldBe('o1.label', '"text"');
 
 var o2 = document.getElementById('o2');
 shouldBe('o2.value', '"value"');
-shouldBe('o2.label', '""');
+shouldBe('o2.label', '"text"');
 
 var o3 = document.getElementById('o3');

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2011-10-05  Sachin Puranik  <jcqt43@motorola.com>
+
+        Spec change - option.label should be reflected like option.value
+        https://bugs.webkit.org/show_bug.cgi?id=68684
+
+        Reviewed by Darin Adler.
+
+        Incorporating the recent change in spec for label attribute of 
+        option element. While retrieving the "Label" IDL attribute return
+        the "Label" content attribute if present , else return the 
+        value of textContent attribute.
+
+        Tests: fast/forms/option-label-trim-html-spaces.html
+               fast/forms/option-value-and-label-changed-by-js.html
+
+        * dom/OptionElement.cpp:
+        (WebCore::OptionElement::normalizeText):style fixes
+        * dom/OptionElement.h: make collectOptionInnerText() protected.
+        * html/HTMLOptionElement.cpp:
+        (WebCore::HTMLOptionElement::label): return innerText if label attribute un-available.
+        (WebCore::HTMLOptionElement::setLabel):setLabel() implementation.
+        * html/HTMLOptionElement.h: add setLabel declaration.
+        * html/HTMLOptionElement.idl: Change reflect to ConvertNullToNullString in idl
+
 2011-10-05  Rémi Duraffort  <remi.duraffort@st.com>
 

trunk/Source/WebCore/dom/OptionElement.cpp

@@ -25 +25 @@
 #include "Element.h"
 #include "HTMLNames.h"
+#include "HTMLOptionElement.h"
 #include "HTMLParserIdioms.h"
-#include "HTMLOptionElement.h"
 #include "OptionGroupElement.h"
 #include "ScriptElement.h"
@@ -101 +101 @@
     text = text.stripWhiteSpace(isHTMLSpace);
 
-    // We want to collapse our whitespace too.  This will match other browsers.
+    // We want to collapse our whitespace too. This will match other browsers.
     text = text.simplifyWhiteSpace(isHTMLSpace);
 

trunk/Source/WebCore/dom/OptionElement.h

@@ -49 +49 @@
     static String collectOptionTextRespectingGroupLabel(const OptionElementData&, const Element*);
     static String collectOptionValue(const OptionElementData&, const Element*);
+    static String collectOptionInnerText(const Element*);
 private:
-    static String collectOptionInnerText(const Element*);
     static String normalizeText(const Document*, const String&);
 };

trunk/Source/WebCore/html/HTMLOptionElement.cpp

@@ -6 +6 @@
  * Copyright (C) 2004, 2005, 2006, 2010 Apple Inc. All rights reserved.
  * Copyright (C) 2010 Google Inc. All rights reserved.
+ * Copyright (C) 2011 Motorola Mobility, Inc.  All rights reserved.
  *
  * This library is free software; you can redistribute it and/or
@@ -32 +33 @@
 #include "ExceptionCode.h"
 #include "HTMLNames.h"
+#include "HTMLParserIdioms.h"
 #include "HTMLSelectElement.h"
 #include "NodeRenderStyle.h"
@@ -217 +219 @@
 String HTMLOptionElement::label() const
 {
-    return m_data.label();
+    String label = m_data.label();
+    if (!label.isNull())
+        return label;
+ 
+    label = collectOptionInnerText(this).stripWhiteSpace(isHTMLSpace);
+    label = label.simplifyWhiteSpace(isHTMLSpace);
+
+    return label;
+}
+
+void HTMLOptionElement::setLabel(const String& label)
+{
+    setAttribute(labelAttr, label);
 }
 

trunk/Source/WebCore/html/HTMLOptionElement.h

@@ -59 +59 @@
 
     String label() const;
+    void setLabel(const String&);
 
     bool ownElementDisabled() const { return HTMLFormControlElement::disabled(); }
@@ -93 +94 @@
 };
 
-} //namespace
+} // namespace
 
 #endif

trunk/Source/WebCore/html/HTMLOptionElement.idl

@@ -33 +33 @@
         readonly attribute long index;
         attribute [Reflect] boolean disabled;
-        attribute [Reflect] DOMString label;
+        attribute [ConvertNullToNullString] DOMString label;
         attribute boolean selected;
         attribute [ConvertNullToNullString] DOMString value;