HTMLOptionElement.text should never return the value of label
authorcommit-queue@webkit.org <commit-queue@webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Tue, 3 Nov 2015 19:59:57 +0000 (19:59 +0000)
committercommit-queue@webkit.org <commit-queue@webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Tue, 3 Nov 2015 19:59:57 +0000 (19:59 +0000)
https://bugs.webkit.org/show_bug.cgi?id=148862
rdar://problem/22589226

Patch by Keith Rollin <krollin@apple.com> on 2015-11-03
Reviewed by Darin Adler.

LayoutTests/imported/w3c:

Rebaseline tests to reflect new behavior of option.text.

* web-platform-tests/html/semantics/forms/the-option-element/option-text-label-expected.txt:

Source/WebCore:

According to the HTML spec, `option` elements should have the
following behavior:

    - the `text` property should return text contents of element
    - the `label` property should return value of label attribute if
      it exists, else return text property
    - the UI should display label property

12 years ago, in order to be compatibile with browsers of the time, we
diverged from this behavior: the text property behaved like the label
property, and the text property was used for display. This resulted in
our UI incidentally conforming to the spec, but also in the text
property *not* conforming to the spec. See <rdar://problem/3532519>
for discussion on this change.

The behavior of the browsers we were conforming to has changed. In
particular, the text property in Firefox now conforms to the spec
instead of behaving as we did. Therefore, it's less important to
retain our old behavior for the sake of compatibility. This check-in
brings us into conformance with the spec. The result is that the UI
stays the same, but the text property will return different values than
it used to if the option element has a label attribute that used to
hide it.

Updated tests:
- fast/dom/HTMLOptionElement/option-text.html:
- fast/forms/HTMLOptionElement_label01.html:
- fast/forms/HTMLOptionElement_label02.html:
- fast/forms/HTMLOptionElement_label03.html:
- fast/forms/HTMLOptionElement_label04.html:
- fast/forms/HTMLOptionElement_label05.html:
- fast/forms/HTMLOptionElement_label06.html:
- fast/forms/HTMLOptionElement_label07.html:
- fast/forms/option-value-and-label.html:

* accessibility/AccessibilityListBoxOption.cpp:
(WebCore::AccessibilityListBoxOption::stringValue):
* accessibility/AccessibilityMenuListOption.cpp:
(WebCore::AccessibilityMenuListOption::stringValue):
* html/HTMLOptionElement.cpp:
(WebCore::HTMLOptionElement::text):
(WebCore::HTMLOptionElement::textIndentedToRespectGroupLabel):

LayoutTests:

Rebaseline tests to reflect new behavior of option.text. Convert some
render tests to reference tests.

* dom/xhtml/level2/html/HTMLOptionElement04-expected.txt:
* fast/dom/HTMLOptionElement/option-text-expected.txt:
* fast/dom/HTMLOptionElement/option-text.html:
* fast/forms/HTMLOptionElement_label01-expected.html: Added.
* fast/forms/HTMLOptionElement_label01.html:
* fast/forms/HTMLOptionElement_label02-expected.html: Added.
* fast/forms/HTMLOptionElement_label02.html:
* fast/forms/HTMLOptionElement_label03-expected.html: Added.
* fast/forms/HTMLOptionElement_label03.html:
* fast/forms/HTMLOptionElement_label04-expected.html: Added.
* fast/forms/HTMLOptionElement_label04.html:
* fast/forms/HTMLOptionElement_label05-expected.html: Added.
* fast/forms/HTMLOptionElement_label05.html:
* fast/forms/HTMLOptionElement_label06-expected.html: Added.
* fast/forms/HTMLOptionElement_label06.html:
* fast/forms/HTMLOptionElement_label07-expected.html: Added.
* fast/forms/HTMLOptionElement_label07.html:
* fast/forms/option-value-and-label-expected.txt:
* fast/forms/option-value-and-label.html:
* platform/efl/fast/forms/HTMLOptionElement_label01-expected.png: Removed.
* platform/efl/fast/forms/HTMLOptionElement_label01-expected.txt: Removed.
* platform/efl/fast/forms/HTMLOptionElement_label02-expected.png: Removed.
* platform/efl/fast/forms/HTMLOptionElement_label02-expected.txt: Removed.
* platform/efl/fast/forms/HTMLOptionElement_label03-expected.png: Removed.
* platform/efl/fast/forms/HTMLOptionElement_label03-expected.txt: Removed.
* platform/efl/fast/forms/HTMLOptionElement_label04-expected.png: Removed.
* platform/efl/fast/forms/HTMLOptionElement_label04-expected.txt: Removed.
* platform/efl/fast/forms/HTMLOptionElement_label05-expected.png: Removed.
* platform/efl/fast/forms/HTMLOptionElement_label05-expected.txt: Removed.
* platform/efl/fast/forms/HTMLOptionElement_label06-expected.png: Removed.
* platform/efl/fast/forms/HTMLOptionElement_label06-expected.txt: Removed.
* platform/efl/fast/forms/HTMLOptionElement_label07-expected.png: Removed.
* platform/efl/fast/forms/HTMLOptionElement_label07-expected.txt: Removed.
* platform/gtk/fast/forms/HTMLOptionElement_label01-expected.png: Removed.
* platform/gtk/fast/forms/HTMLOptionElement_label01-expected.txt: Removed.
* platform/gtk/fast/forms/HTMLOptionElement_label02-expected.png: Removed.
* platform/gtk/fast/forms/HTMLOptionElement_label02-expected.txt: Removed.
* platform/gtk/fast/forms/HTMLOptionElement_label03-expected.png: Removed.
* platform/gtk/fast/forms/HTMLOptionElement_label03-expected.txt: Removed.
* platform/gtk/fast/forms/HTMLOptionElement_label04-expected.png: Removed.
* platform/gtk/fast/forms/HTMLOptionElement_label04-expected.txt: Removed.
* platform/gtk/fast/forms/HTMLOptionElement_label05-expected.png: Removed.
* platform/gtk/fast/forms/HTMLOptionElement_label05-expected.txt: Removed.
* platform/gtk/fast/forms/HTMLOptionElement_label06-expected.png: Removed.
* platform/gtk/fast/forms/HTMLOptionElement_label06-expected.txt: Removed.
* platform/gtk/fast/forms/HTMLOptionElement_label07-expected.png: Removed.
* platform/gtk/fast/forms/HTMLOptionElement_label07-expected.txt: Removed.
* platform/ios-simulator-wk2/fast/forms/HTMLOptionElement_label01-expected.txt: Removed.
* platform/ios-simulator-wk2/fast/forms/HTMLOptionElement_label02-expected.txt: Removed.
* platform/ios-simulator-wk2/fast/forms/HTMLOptionElement_label03-expected.txt: Removed.
* platform/ios-simulator-wk2/fast/forms/HTMLOptionElement_label04-expected.txt: Removed.
* platform/ios-simulator-wk2/fast/forms/HTMLOptionElement_label05-expected.txt: Removed.
* platform/ios-simulator-wk2/fast/forms/HTMLOptionElement_label06-expected.txt: Removed.
* platform/ios-simulator-wk2/fast/forms/HTMLOptionElement_label07-expected.txt: Removed.
* platform/ios-simulator/fast/forms/HTMLOptionElement_label01-expected.txt: Removed.
* platform/ios-simulator/fast/forms/HTMLOptionElement_label02-expected.txt: Removed.
* platform/ios-simulator/fast/forms/HTMLOptionElement_label03-expected.txt: Removed.
* platform/ios-simulator/fast/forms/HTMLOptionElement_label04-expected.txt: Removed.
* platform/ios-simulator/fast/forms/HTMLOptionElement_label05-expected.txt: Removed.
* platform/ios-simulator/fast/forms/HTMLOptionElement_label06-expected.txt: Removed.
* platform/ios-simulator/fast/forms/HTMLOptionElement_label07-expected.txt: Removed.
* platform/mac-mavericks/fast/forms/HTMLOptionElement_label01-expected.png: Removed.
* platform/mac-mavericks/fast/forms/HTMLOptionElement_label01-expected.txt: Removed.
* platform/mac-mavericks/fast/forms/HTMLOptionElement_label02-expected.png: Removed.
* platform/mac-mavericks/fast/forms/HTMLOptionElement_label02-expected.txt: Removed.
* platform/mac-mavericks/fast/forms/HTMLOptionElement_label03-expected.png: Removed.
* platform/mac-mavericks/fast/forms/HTMLOptionElement_label04-expected.png: Removed.
* platform/mac-mavericks/fast/forms/HTMLOptionElement_label04-expected.txt: Removed.
* platform/mac-mavericks/fast/forms/HTMLOptionElement_label05-expected.png: Removed.
* platform/mac-mavericks/fast/forms/HTMLOptionElement_label05-expected.txt: Removed.
* platform/mac/fast/forms/HTMLOptionElement_label01-expected.png: Removed.
* platform/mac/fast/forms/HTMLOptionElement_label01-expected.txt: Removed.
* platform/mac/fast/forms/HTMLOptionElement_label02-expected.png: Removed.
* platform/mac/fast/forms/HTMLOptionElement_label02-expected.txt: Removed.
* platform/mac/fast/forms/HTMLOptionElement_label03-expected.png: Removed.
* platform/mac/fast/forms/HTMLOptionElement_label03-expected.txt: Removed.
* platform/mac/fast/forms/HTMLOptionElement_label04-expected.png: Removed.
* platform/mac/fast/forms/HTMLOptionElement_label04-expected.txt: Removed.
* platform/mac/fast/forms/HTMLOptionElement_label05-expected.png: Removed.
* platform/mac/fast/forms/HTMLOptionElement_label05-expected.txt: Removed.
* platform/mac/fast/forms/HTMLOptionElement_label06-expected.png: Removed.
* platform/mac/fast/forms/HTMLOptionElement_label06-expected.txt: Removed.
* platform/mac/fast/forms/HTMLOptionElement_label07-expected.png: Removed.
* platform/mac/fast/forms/HTMLOptionElement_label07-expected.txt: Removed.
* platform/win/fast/forms/HTMLOptionElement_label01-expected.png: Removed.
* platform/win/fast/forms/HTMLOptionElement_label01-expected.txt: Removed.
* platform/win/fast/forms/HTMLOptionElement_label02-expected.png: Removed.
* platform/win/fast/forms/HTMLOptionElement_label02-expected.txt: Removed.
* platform/win/fast/forms/HTMLOptionElement_label03-expected.png: Removed.
* platform/win/fast/forms/HTMLOptionElement_label03-expected.txt: Removed.
* platform/win/fast/forms/HTMLOptionElement_label04-expected.png: Removed.
* platform/win/fast/forms/HTMLOptionElement_label04-expected.txt: Removed.
* platform/win/fast/forms/HTMLOptionElement_label05-expected.txt: Removed.
* platform/win/fast/forms/HTMLOptionElement_label06-expected.txt: Removed.
* platform/win/fast/forms/HTMLOptionElement_label07-expected.txt: Removed.

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@191964 268f45cc-cd09-0410-ab3c-d52691b4dbfc

102 files changed:
LayoutTests/ChangeLog
LayoutTests/dom/xhtml/level2/html/HTMLOptionElement04-expected.txt
LayoutTests/fast/dom/HTMLOptionElement/option-text-expected.txt
LayoutTests/fast/dom/HTMLOptionElement/option-text.html
LayoutTests/fast/forms/HTMLOptionElement_label01-expected.html [new file with mode: 0644]
LayoutTests/fast/forms/HTMLOptionElement_label01.html
LayoutTests/fast/forms/HTMLOptionElement_label02-expected.html [new file with mode: 0644]
LayoutTests/fast/forms/HTMLOptionElement_label02.html
LayoutTests/fast/forms/HTMLOptionElement_label03-expected.html [new file with mode: 0644]
LayoutTests/fast/forms/HTMLOptionElement_label03.html
LayoutTests/fast/forms/HTMLOptionElement_label04-expected.html [new file with mode: 0644]
LayoutTests/fast/forms/HTMLOptionElement_label04.html
LayoutTests/fast/forms/HTMLOptionElement_label05-expected.html [new file with mode: 0644]
LayoutTests/fast/forms/HTMLOptionElement_label05.html
LayoutTests/fast/forms/HTMLOptionElement_label06-expected.html [new file with mode: 0644]
LayoutTests/fast/forms/HTMLOptionElement_label06.html
LayoutTests/fast/forms/HTMLOptionElement_label07-expected.html [new file with mode: 0644]
LayoutTests/fast/forms/HTMLOptionElement_label07.html
LayoutTests/fast/forms/option-value-and-label-expected.txt
LayoutTests/fast/forms/option-value-and-label.html
LayoutTests/imported/w3c/ChangeLog
LayoutTests/imported/w3c/web-platform-tests/html/semantics/forms/the-option-element/option-text-label-expected.txt
LayoutTests/platform/efl/fast/forms/HTMLOptionElement_label01-expected.png [deleted file]
LayoutTests/platform/efl/fast/forms/HTMLOptionElement_label01-expected.txt [deleted file]
LayoutTests/platform/efl/fast/forms/HTMLOptionElement_label02-expected.png [deleted file]
LayoutTests/platform/efl/fast/forms/HTMLOptionElement_label02-expected.txt [deleted file]
LayoutTests/platform/efl/fast/forms/HTMLOptionElement_label03-expected.png [deleted file]
LayoutTests/platform/efl/fast/forms/HTMLOptionElement_label03-expected.txt [deleted file]
LayoutTests/platform/efl/fast/forms/HTMLOptionElement_label04-expected.png [deleted file]
LayoutTests/platform/efl/fast/forms/HTMLOptionElement_label04-expected.txt [deleted file]
LayoutTests/platform/efl/fast/forms/HTMLOptionElement_label05-expected.png [deleted file]
LayoutTests/platform/efl/fast/forms/HTMLOptionElement_label05-expected.txt [deleted file]
LayoutTests/platform/efl/fast/forms/HTMLOptionElement_label06-expected.png [deleted file]
LayoutTests/platform/efl/fast/forms/HTMLOptionElement_label06-expected.txt [deleted file]
LayoutTests/platform/efl/fast/forms/HTMLOptionElement_label07-expected.png [deleted file]
LayoutTests/platform/efl/fast/forms/HTMLOptionElement_label07-expected.txt [deleted file]
LayoutTests/platform/gtk/fast/forms/HTMLOptionElement_label01-expected.png [deleted file]
LayoutTests/platform/gtk/fast/forms/HTMLOptionElement_label01-expected.txt [deleted file]
LayoutTests/platform/gtk/fast/forms/HTMLOptionElement_label02-expected.png [deleted file]
LayoutTests/platform/gtk/fast/forms/HTMLOptionElement_label02-expected.txt [deleted file]
LayoutTests/platform/gtk/fast/forms/HTMLOptionElement_label03-expected.png [deleted file]
LayoutTests/platform/gtk/fast/forms/HTMLOptionElement_label03-expected.txt [deleted file]
LayoutTests/platform/gtk/fast/forms/HTMLOptionElement_label04-expected.png [deleted file]
LayoutTests/platform/gtk/fast/forms/HTMLOptionElement_label04-expected.txt [deleted file]
LayoutTests/platform/gtk/fast/forms/HTMLOptionElement_label05-expected.png [deleted file]
LayoutTests/platform/gtk/fast/forms/HTMLOptionElement_label05-expected.txt [deleted file]
LayoutTests/platform/gtk/fast/forms/HTMLOptionElement_label06-expected.png [deleted file]
LayoutTests/platform/gtk/fast/forms/HTMLOptionElement_label06-expected.txt [deleted file]
LayoutTests/platform/gtk/fast/forms/HTMLOptionElement_label07-expected.png [deleted file]
LayoutTests/platform/gtk/fast/forms/HTMLOptionElement_label07-expected.txt [deleted file]
LayoutTests/platform/ios-simulator-wk2/fast/forms/HTMLOptionElement_label01-expected.txt [deleted file]
LayoutTests/platform/ios-simulator-wk2/fast/forms/HTMLOptionElement_label02-expected.txt [deleted file]
LayoutTests/platform/ios-simulator-wk2/fast/forms/HTMLOptionElement_label03-expected.txt [deleted file]
LayoutTests/platform/ios-simulator-wk2/fast/forms/HTMLOptionElement_label04-expected.txt [deleted file]
LayoutTests/platform/ios-simulator-wk2/fast/forms/HTMLOptionElement_label05-expected.txt [deleted file]
LayoutTests/platform/ios-simulator-wk2/fast/forms/HTMLOptionElement_label06-expected.txt [deleted file]
LayoutTests/platform/ios-simulator-wk2/fast/forms/HTMLOptionElement_label07-expected.txt [deleted file]
LayoutTests/platform/ios-simulator/fast/forms/HTMLOptionElement_label01-expected.txt [deleted file]
LayoutTests/platform/ios-simulator/fast/forms/HTMLOptionElement_label02-expected.txt [deleted file]
LayoutTests/platform/ios-simulator/fast/forms/HTMLOptionElement_label03-expected.txt [deleted file]
LayoutTests/platform/ios-simulator/fast/forms/HTMLOptionElement_label04-expected.txt [deleted file]
LayoutTests/platform/ios-simulator/fast/forms/HTMLOptionElement_label05-expected.txt [deleted file]
LayoutTests/platform/ios-simulator/fast/forms/HTMLOptionElement_label06-expected.txt [deleted file]
LayoutTests/platform/ios-simulator/fast/forms/HTMLOptionElement_label07-expected.txt [deleted file]
LayoutTests/platform/mac-mavericks/fast/forms/HTMLOptionElement_label01-expected.png [deleted file]
LayoutTests/platform/mac-mavericks/fast/forms/HTMLOptionElement_label01-expected.txt [deleted file]
LayoutTests/platform/mac-mavericks/fast/forms/HTMLOptionElement_label02-expected.png [deleted file]
LayoutTests/platform/mac-mavericks/fast/forms/HTMLOptionElement_label02-expected.txt [deleted file]
LayoutTests/platform/mac-mavericks/fast/forms/HTMLOptionElement_label03-expected.png [deleted file]
LayoutTests/platform/mac-mavericks/fast/forms/HTMLOptionElement_label04-expected.png [deleted file]
LayoutTests/platform/mac-mavericks/fast/forms/HTMLOptionElement_label04-expected.txt [deleted file]
LayoutTests/platform/mac-mavericks/fast/forms/HTMLOptionElement_label05-expected.png [deleted file]
LayoutTests/platform/mac-mavericks/fast/forms/HTMLOptionElement_label05-expected.txt [deleted file]
LayoutTests/platform/mac/fast/forms/HTMLOptionElement_label01-expected.png [deleted file]
LayoutTests/platform/mac/fast/forms/HTMLOptionElement_label01-expected.txt [deleted file]
LayoutTests/platform/mac/fast/forms/HTMLOptionElement_label02-expected.png [deleted file]
LayoutTests/platform/mac/fast/forms/HTMLOptionElement_label02-expected.txt [deleted file]
LayoutTests/platform/mac/fast/forms/HTMLOptionElement_label03-expected.png [deleted file]
LayoutTests/platform/mac/fast/forms/HTMLOptionElement_label03-expected.txt [deleted file]
LayoutTests/platform/mac/fast/forms/HTMLOptionElement_label04-expected.png [deleted file]
LayoutTests/platform/mac/fast/forms/HTMLOptionElement_label04-expected.txt [deleted file]
LayoutTests/platform/mac/fast/forms/HTMLOptionElement_label05-expected.png [deleted file]
LayoutTests/platform/mac/fast/forms/HTMLOptionElement_label05-expected.txt [deleted file]
LayoutTests/platform/mac/fast/forms/HTMLOptionElement_label06-expected.png [deleted file]
LayoutTests/platform/mac/fast/forms/HTMLOptionElement_label06-expected.txt [deleted file]
LayoutTests/platform/mac/fast/forms/HTMLOptionElement_label07-expected.png [deleted file]
LayoutTests/platform/mac/fast/forms/HTMLOptionElement_label07-expected.txt [deleted file]
LayoutTests/platform/win/fast/forms/HTMLOptionElement_label01-expected.png [deleted file]
LayoutTests/platform/win/fast/forms/HTMLOptionElement_label01-expected.txt [deleted file]
LayoutTests/platform/win/fast/forms/HTMLOptionElement_label02-expected.png [deleted file]
LayoutTests/platform/win/fast/forms/HTMLOptionElement_label02-expected.txt [deleted file]
LayoutTests/platform/win/fast/forms/HTMLOptionElement_label03-expected.png [deleted file]
LayoutTests/platform/win/fast/forms/HTMLOptionElement_label03-expected.txt [deleted file]
LayoutTests/platform/win/fast/forms/HTMLOptionElement_label04-expected.png [deleted file]
LayoutTests/platform/win/fast/forms/HTMLOptionElement_label04-expected.txt [deleted file]
LayoutTests/platform/win/fast/forms/HTMLOptionElement_label05-expected.txt [deleted file]
LayoutTests/platform/win/fast/forms/HTMLOptionElement_label06-expected.txt [deleted file]
LayoutTests/platform/win/fast/forms/HTMLOptionElement_label07-expected.txt [deleted file]
Source/WebCore/ChangeLog
Source/WebCore/accessibility/AccessibilityListBoxOption.cpp
Source/WebCore/accessibility/AccessibilityMenuListOption.cpp
Source/WebCore/html/HTMLOptionElement.cpp

index ae9e1f9..4b84440 100644 (file)
@@ -1,3 +1,110 @@
+2015-11-03  Keith Rollin  <krollin@apple.com>
+
+        HTMLOptionElement.text should never return the value of label
+        https://bugs.webkit.org/show_bug.cgi?id=148862
+        rdar://problem/22589226
+
+        Reviewed by Darin Adler.
+
+        Rebaseline tests to reflect new behavior of option.text. Convert some
+        render tests to reference tests.
+
+        * dom/xhtml/level2/html/HTMLOptionElement04-expected.txt:
+        * fast/dom/HTMLOptionElement/option-text-expected.txt:
+        * fast/dom/HTMLOptionElement/option-text.html:
+        * fast/forms/HTMLOptionElement_label01-expected.html: Added.
+        * fast/forms/HTMLOptionElement_label01.html:
+        * fast/forms/HTMLOptionElement_label02-expected.html: Added.
+        * fast/forms/HTMLOptionElement_label02.html:
+        * fast/forms/HTMLOptionElement_label03-expected.html: Added.
+        * fast/forms/HTMLOptionElement_label03.html:
+        * fast/forms/HTMLOptionElement_label04-expected.html: Added.
+        * fast/forms/HTMLOptionElement_label04.html:
+        * fast/forms/HTMLOptionElement_label05-expected.html: Added.
+        * fast/forms/HTMLOptionElement_label05.html:
+        * fast/forms/HTMLOptionElement_label06-expected.html: Added.
+        * fast/forms/HTMLOptionElement_label06.html:
+        * fast/forms/HTMLOptionElement_label07-expected.html: Added.
+        * fast/forms/HTMLOptionElement_label07.html:
+        * fast/forms/option-value-and-label-expected.txt:
+        * fast/forms/option-value-and-label.html:
+        * platform/efl/fast/forms/HTMLOptionElement_label01-expected.png: Removed.
+        * platform/efl/fast/forms/HTMLOptionElement_label01-expected.txt: Removed.
+        * platform/efl/fast/forms/HTMLOptionElement_label02-expected.png: Removed.
+        * platform/efl/fast/forms/HTMLOptionElement_label02-expected.txt: Removed.
+        * platform/efl/fast/forms/HTMLOptionElement_label03-expected.png: Removed.
+        * platform/efl/fast/forms/HTMLOptionElement_label03-expected.txt: Removed.
+        * platform/efl/fast/forms/HTMLOptionElement_label04-expected.png: Removed.
+        * platform/efl/fast/forms/HTMLOptionElement_label04-expected.txt: Removed.
+        * platform/efl/fast/forms/HTMLOptionElement_label05-expected.png: Removed.
+        * platform/efl/fast/forms/HTMLOptionElement_label05-expected.txt: Removed.
+        * platform/efl/fast/forms/HTMLOptionElement_label06-expected.png: Removed.
+        * platform/efl/fast/forms/HTMLOptionElement_label06-expected.txt: Removed.
+        * platform/efl/fast/forms/HTMLOptionElement_label07-expected.png: Removed.
+        * platform/efl/fast/forms/HTMLOptionElement_label07-expected.txt: Removed.
+        * platform/gtk/fast/forms/HTMLOptionElement_label01-expected.png: Removed.
+        * platform/gtk/fast/forms/HTMLOptionElement_label01-expected.txt: Removed.
+        * platform/gtk/fast/forms/HTMLOptionElement_label02-expected.png: Removed.
+        * platform/gtk/fast/forms/HTMLOptionElement_label02-expected.txt: Removed.
+        * platform/gtk/fast/forms/HTMLOptionElement_label03-expected.png: Removed.
+        * platform/gtk/fast/forms/HTMLOptionElement_label03-expected.txt: Removed.
+        * platform/gtk/fast/forms/HTMLOptionElement_label04-expected.png: Removed.
+        * platform/gtk/fast/forms/HTMLOptionElement_label04-expected.txt: Removed.
+        * platform/gtk/fast/forms/HTMLOptionElement_label05-expected.png: Removed.
+        * platform/gtk/fast/forms/HTMLOptionElement_label05-expected.txt: Removed.
+        * platform/gtk/fast/forms/HTMLOptionElement_label06-expected.png: Removed.
+        * platform/gtk/fast/forms/HTMLOptionElement_label06-expected.txt: Removed.
+        * platform/gtk/fast/forms/HTMLOptionElement_label07-expected.png: Removed.
+        * platform/gtk/fast/forms/HTMLOptionElement_label07-expected.txt: Removed.
+        * platform/ios-simulator-wk2/fast/forms/HTMLOptionElement_label01-expected.txt: Removed.
+        * platform/ios-simulator-wk2/fast/forms/HTMLOptionElement_label02-expected.txt: Removed.
+        * platform/ios-simulator-wk2/fast/forms/HTMLOptionElement_label03-expected.txt: Removed.
+        * platform/ios-simulator-wk2/fast/forms/HTMLOptionElement_label04-expected.txt: Removed.
+        * platform/ios-simulator-wk2/fast/forms/HTMLOptionElement_label05-expected.txt: Removed.
+        * platform/ios-simulator-wk2/fast/forms/HTMLOptionElement_label06-expected.txt: Removed.
+        * platform/ios-simulator-wk2/fast/forms/HTMLOptionElement_label07-expected.txt: Removed.
+        * platform/ios-simulator/fast/forms/HTMLOptionElement_label01-expected.txt: Removed.
+        * platform/ios-simulator/fast/forms/HTMLOptionElement_label02-expected.txt: Removed.
+        * platform/ios-simulator/fast/forms/HTMLOptionElement_label03-expected.txt: Removed.
+        * platform/ios-simulator/fast/forms/HTMLOptionElement_label04-expected.txt: Removed.
+        * platform/ios-simulator/fast/forms/HTMLOptionElement_label05-expected.txt: Removed.
+        * platform/ios-simulator/fast/forms/HTMLOptionElement_label06-expected.txt: Removed.
+        * platform/ios-simulator/fast/forms/HTMLOptionElement_label07-expected.txt: Removed.
+        * platform/mac-mavericks/fast/forms/HTMLOptionElement_label01-expected.png: Removed.
+        * platform/mac-mavericks/fast/forms/HTMLOptionElement_label01-expected.txt: Removed.
+        * platform/mac-mavericks/fast/forms/HTMLOptionElement_label02-expected.png: Removed.
+        * platform/mac-mavericks/fast/forms/HTMLOptionElement_label02-expected.txt: Removed.
+        * platform/mac-mavericks/fast/forms/HTMLOptionElement_label03-expected.png: Removed.
+        * platform/mac-mavericks/fast/forms/HTMLOptionElement_label04-expected.png: Removed.
+        * platform/mac-mavericks/fast/forms/HTMLOptionElement_label04-expected.txt: Removed.
+        * platform/mac-mavericks/fast/forms/HTMLOptionElement_label05-expected.png: Removed.
+        * platform/mac-mavericks/fast/forms/HTMLOptionElement_label05-expected.txt: Removed.
+        * platform/mac/fast/forms/HTMLOptionElement_label01-expected.png: Removed.
+        * platform/mac/fast/forms/HTMLOptionElement_label01-expected.txt: Removed.
+        * platform/mac/fast/forms/HTMLOptionElement_label02-expected.png: Removed.
+        * platform/mac/fast/forms/HTMLOptionElement_label02-expected.txt: Removed.
+        * platform/mac/fast/forms/HTMLOptionElement_label03-expected.png: Removed.
+        * platform/mac/fast/forms/HTMLOptionElement_label03-expected.txt: Removed.
+        * platform/mac/fast/forms/HTMLOptionElement_label04-expected.png: Removed.
+        * platform/mac/fast/forms/HTMLOptionElement_label04-expected.txt: Removed.
+        * platform/mac/fast/forms/HTMLOptionElement_label05-expected.png: Removed.
+        * platform/mac/fast/forms/HTMLOptionElement_label05-expected.txt: Removed.
+        * platform/mac/fast/forms/HTMLOptionElement_label06-expected.png: Removed.
+        * platform/mac/fast/forms/HTMLOptionElement_label06-expected.txt: Removed.
+        * platform/mac/fast/forms/HTMLOptionElement_label07-expected.png: Removed.
+        * platform/mac/fast/forms/HTMLOptionElement_label07-expected.txt: Removed.
+        * platform/win/fast/forms/HTMLOptionElement_label01-expected.png: Removed.
+        * platform/win/fast/forms/HTMLOptionElement_label01-expected.txt: Removed.
+        * platform/win/fast/forms/HTMLOptionElement_label02-expected.png: Removed.
+        * platform/win/fast/forms/HTMLOptionElement_label02-expected.txt: Removed.
+        * platform/win/fast/forms/HTMLOptionElement_label03-expected.png: Removed.
+        * platform/win/fast/forms/HTMLOptionElement_label03-expected.txt: Removed.
+        * platform/win/fast/forms/HTMLOptionElement_label04-expected.png: Removed.
+        * platform/win/fast/forms/HTMLOptionElement_label04-expected.txt: Removed.
+        * platform/win/fast/forms/HTMLOptionElement_label05-expected.txt: Removed.
+        * platform/win/fast/forms/HTMLOptionElement_label06-expected.txt: Removed.
+        * platform/win/fast/forms/HTMLOptionElement_label07-expected.txt: Removed.
+
 2015-11-02  Wenson Hsieh  <wenson_hsieh@apple.com>
 
         Tapping *below* some <input>s can focus them in Mobile Safari
index a95014a..9648511 100644 (file)
@@ -1,3 +1,2 @@
 Test   http://www.w3.org/2001/DOM-Test-Suite/level2/html/HTMLOptionElement04
-Status failure
-Message        textLink: assertEquals failed, actual l1, expected EMP10002.
+Status Success
index d34a2cd..848ba07 100644 (file)
@@ -1,9 +1,9 @@
-Test for the text attribute of HTMLOptionElement. To match other browsers, the attribute value is the text as displayed in the list box or popup, rather than strictly “the text contained within the option element” as specified.
+Test for the text attribute of HTMLOptionElement. Specification.
 
 
 PASS: got "foo" as expected.
 PASS: got "foo" as expected.
 PASS: got "¥" as expected.
 PASS: got "foo bar" as expected.
-PASS: got "label" as expected.
+PASS: got "text" as expected.
 
index 2e621d6..74e321e 100644 (file)
 <body>
     <p>
         Test for the <code>text</code> attribute of <code>HTMLOptionElement</code>.
-        To match other browsers, the attribute value is the text as displayed
-        in the list box or popup, rather than strictly &ldquo;the text contained within the option element&rdquo;
-        as <a href="http://www.w3.org/TR/2003/REC-DOM-Level-2-HTML-20030109/html.html#ID-48154426">specified</a>.
+        <a href="http://www.w3.org/TR/2003/REC-DOM-Level-2-HTML-20030109/html.html#ID-48154426">Specification</a>.
     </p>
     <select multiple>
         <option id="o1">foo </option>
         <option id="o2"> foo</option>
         <option id="o3">\</option>
         <option id="o4">foo   bar</option>
-        <option id="o5" label=" label ">ignored</option>
+        <option id="o5" label=" label ">text</option>
     </select>
     <pre id="console"></pre>
     <script>
@@ -41,7 +39,7 @@
         test("o2", "foo");
         test("o3", "\u00a5");
         test("o4", "foo bar");
-        test("o5", "label");
+        test("o5", "text");
     </script>
 </body>
 </html>
diff --git a/LayoutTests/fast/forms/HTMLOptionElement_label01-expected.html b/LayoutTests/fast/forms/HTMLOptionElement_label01-expected.html
new file mode 100644 (file)
index 0000000..31781fc
--- /dev/null
@@ -0,0 +1,6 @@
+<!DOCTYPE html>
+<body>
+    <select>
+        <option>1</option>
+    </select>
+</body>
index 94a502d..4510e4f 100644 (file)
@@ -1,4 +1,7 @@
-In the selection list below, the text 'The label for this element is "1"' should appear, and not the character '1'<br>
-<select>
-<option label="1">the label for this element is "1"</option>
-</select>
+<!DOCTYPE html>
+<!-- In the selection list below, the character '1' should appear, and not the text 'The label for this element is "1"' -->
+<body>
+    <select>
+        <option label="1">the label for this element is "1"</option>
+    </select>
+<body>
diff --git a/LayoutTests/fast/forms/HTMLOptionElement_label02-expected.html b/LayoutTests/fast/forms/HTMLOptionElement_label02-expected.html
new file mode 100644 (file)
index 0000000..ac38fac
--- /dev/null
@@ -0,0 +1,6 @@
+<!DOCTYPE html>
+<body>
+    <select>
+        <option></option>
+    </select>
+</body>
index 8522d04..1ed8bcc 100644 (file)
@@ -1,4 +1,7 @@
-With the label empty, the enclosing text is used.<br>
-<select>
-<option label="">empty label should display empty string to match IE</option>
-</select>
+<!DOCTYPE html>
+<!-- Even though it's empty, the label exists, so it is used. -->
+<body>
+    <select>
+        <option label="">empty label should display empty string to match IE</option>
+    </select>
+</body>
diff --git a/LayoutTests/fast/forms/HTMLOptionElement_label03-expected.html b/LayoutTests/fast/forms/HTMLOptionElement_label03-expected.html
new file mode 100644 (file)
index 0000000..958644b
--- /dev/null
@@ -0,0 +1,6 @@
+<!DOCTYPE html>
+<body>
+    <select>
+        <option> </option>
+    </select>
+</body>
index f72ae96..0c9f361 100644 (file)
@@ -1,4 +1,7 @@
-When the label contains only white space, the containing text is used.<br>
-<select>
-<option label=" ">white space label should display empty string to match IE</option>
-</select>
+<!DOCTYPE html>
+<!-- Even though the label is nothing but whitespace, it exists, so it it used. -->
+<body>
+    <select>
+        <option label=" ">white space label should display empty string to match IE</option>
+    </select>
+</body>
diff --git a/LayoutTests/fast/forms/HTMLOptionElement_label04-expected.html b/LayoutTests/fast/forms/HTMLOptionElement_label04-expected.html
new file mode 100644 (file)
index 0000000..ac38fac
--- /dev/null
@@ -0,0 +1,6 @@
+<!DOCTYPE html>
+<body>
+    <select>
+        <option></option>
+    </select>
+</body>
index cf13e74..f89a772 100644 (file)
@@ -1,4 +1,7 @@
-The label attribute appears, but is missing the equals value piece, so the containing text is used.<br>
-<select>
-<option label>the label attribute is mentioned but no value is specified; this text should appear</option>
-</select>
+<!DOCTYPE html>
+<!-- Even though the label is missing the 'equals value' piece, it exists, so it is used. -->
+<body>
+    <select>
+        <option label>this text should not appear</option>
+    </select>
+</body>
diff --git a/LayoutTests/fast/forms/HTMLOptionElement_label05-expected.html b/LayoutTests/fast/forms/HTMLOptionElement_label05-expected.html
new file mode 100644 (file)
index 0000000..791531e
--- /dev/null
@@ -0,0 +1,6 @@
+<!DOCTYPE html>
+<body>
+    <select size="5">
+        <option>This label should appear</option>
+    </select>
+</body>
index e17150c..57f6ea0 100644 (file)
@@ -1,2 +1,7 @@
-In the list box below, the text "This text should appear" should be shown as the first entry into the list box.<br>
-<select size="5"><option label="This label should not appear">This text should appear</option></select>
+<!DOCTYPE html>
+<!-- In the list box below, the text "This label should appear" should be shown as the first entry into the list box. -->
+<body>
+    <select size="5">
+        <option label="This label should appear">This text should not appear</option>
+    </select>
+</body>
diff --git a/LayoutTests/fast/forms/HTMLOptionElement_label06-expected.html b/LayoutTests/fast/forms/HTMLOptionElement_label06-expected.html
new file mode 100644 (file)
index 0000000..dccb1ea
--- /dev/null
@@ -0,0 +1,6 @@
+<!DOCTYPE html>
+<body>
+    <select>
+        <option>text</option>
+    </select>
+</body>
index cca18e3..40c817a 100644 (file)
@@ -1,2 +1,7 @@
-The select item below has a label specified, and no enclosed text. There should be no text shown in the select box.<br>
-<select><option label="text"></option></select>
+<!DOCTYPE html>
+<!-- The select item below has a label specified, and no enclosed text. The label 'text' should be shown in the select box. -->
+<body>
+    <select>
+        <option label="text"></option>
+    </select>
+</body>
diff --git a/LayoutTests/fast/forms/HTMLOptionElement_label07-expected.html b/LayoutTests/fast/forms/HTMLOptionElement_label07-expected.html
new file mode 100644 (file)
index 0000000..dccb1ea
--- /dev/null
@@ -0,0 +1,6 @@
+<!DOCTYPE html>
+<body>
+    <select>
+        <option>text</option>
+    </select>
+</body>
index 4d0bab3..8961268 100644 (file)
@@ -1,2 +1,7 @@
-The select item below has a label specified, and enclosed text that is whitespace. There should be no text shown in the select box.<br>
-<select><option label="text"> </option></select>
+<!DOCTYPE html>
+<!-- The select item below has a label specified, and enclosed text that is whitespace. The label 'text' should be shown in the select box. -->
+<body>
+    <select>
+        <option label="text"> </option>
+    </select>
+</body>
index 7f16382..6cdf98f 100644 (file)
@@ -5,12 +5,16 @@ On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE
 
 PASS o1.value is "text"
 PASS o1.label is "text"
+PASS o1.text is "text"
 PASS o2.value is "value"
 PASS o2.label is "text"
+PASS o2.text is "text"
 PASS o3.value is "text"
 PASS o3.label is "label"
+PASS o3.text is "text"
 PASS o4.value is "value"
 PASS o4.label is "label"
+PASS o4.text is "text"
 PASS successfullyParsed is true
 
 TEST COMPLETE
index fc4ebad..8d71abe 100644 (file)
@@ -20,18 +20,22 @@ description('Test for .value and .label of OPTION element');
 var o1 = document.getElementById('o1');
 shouldBe('o1.value', '"text"');
 shouldBe('o1.label', '"text"');
+shouldBe('o1.text', '"text"');
 
 var o2 = document.getElementById('o2');
 shouldBe('o2.value', '"value"');
 shouldBe('o2.label', '"text"');
+shouldBe('o2.text', '"text"');
 
 var o3 = document.getElementById('o3');
 shouldBe('o3.value', '"text"');
 shouldBe('o3.label', '"label"');
+shouldBe('o3.text', '"text"');
 
 var o4 = document.getElementById('o4');
 shouldBe('o4.value', '"value"');
 shouldBe('o4.label', '"label"');
+shouldBe('o4.text', '"text"');
 </script>
 <script src="../../resources/js-test-post.js"></script>
 </body>
index c58d070..d29aa93 100644 (file)
@@ -1,3 +1,15 @@
+2015-11-03  Keith Rollin  <krollin@apple.com>
+
+        HTMLOptionElement.text should never return the value of label
+        https://bugs.webkit.org/show_bug.cgi?id=148862
+        rdar://problem/22589226
+
+        Reviewed by Darin Adler.
+
+        Rebaseline tests to reflect new behavior of option.text.
+
+        * web-platform-tests/html/semantics/forms/the-option-element/option-text-label-expected.txt:
+
 2015-10-28  Brady Eidson  <beidson@apple.com>
 
         Modern IDB: Support IDBDatabase.transaction() (and transaction scheduling in general).
diff --git a/LayoutTests/platform/efl/fast/forms/HTMLOptionElement_label01-expected.png b/LayoutTests/platform/efl/fast/forms/HTMLOptionElement_label01-expected.png
deleted file mode 100644 (file)
index e9d4192..0000000
Binary files a/LayoutTests/platform/efl/fast/forms/HTMLOptionElement_label01-expected.png and /dev/null differ
diff --git a/LayoutTests/platform/efl/fast/forms/HTMLOptionElement_label01-expected.txt b/LayoutTests/platform/efl/fast/forms/HTMLOptionElement_label01-expected.txt
deleted file mode 100644 (file)
index 202cb6f..0000000
+++ /dev/null
@@ -1,13 +0,0 @@
-layer at (0,0) size 800x600
-  RenderView at (0,0) size 800x600
-layer at (0,0) size 800x600
-  RenderBlock {HTML} at (0,0) size 800x600
-    RenderBody {BODY} at (8,8) size 784x584
-      RenderText {#text} at (0,0) size 673x17
-        text run at (0,0) width 673: "In the selection list below, the text 'The label for this element is \"1\"' should appear, and not the character '1'"
-      RenderBR {BR} at (673,14) size 0x0
-      RenderMenuList {SELECT} at (2,20) size 270x38 [bgcolor=#FFFFFF]
-        RenderBlock (anonymous) at (15,10) size 214x18
-          RenderText at (0,0) size 214x17
-            text run at (0,0) width 214: "the label for this element is \"1\""
-      RenderText {#text} at (0,0) size 0x0
diff --git a/LayoutTests/platform/efl/fast/forms/HTMLOptionElement_label02-expected.png b/LayoutTests/platform/efl/fast/forms/HTMLOptionElement_label02-expected.png
deleted file mode 100644 (file)
index 0d09b60..0000000
Binary files a/LayoutTests/platform/efl/fast/forms/HTMLOptionElement_label02-expected.png and /dev/null differ
diff --git a/LayoutTests/platform/efl/fast/forms/HTMLOptionElement_label02-expected.txt b/LayoutTests/platform/efl/fast/forms/HTMLOptionElement_label02-expected.txt
deleted file mode 100644 (file)
index b690732..0000000
+++ /dev/null
@@ -1,13 +0,0 @@
-layer at (0,0) size 800x600
-  RenderView at (0,0) size 800x600
-layer at (0,0) size 800x600
-  RenderBlock {HTML} at (0,0) size 800x600
-    RenderBody {BODY} at (8,8) size 784x584
-      RenderText {#text} at (0,0) size 300x17
-        text run at (0,0) width 300: "With the label empty, the enclosing text is used."
-      RenderBR {BR} at (300,14) size 0x0
-      RenderMenuList {SELECT} at (2,20) size 418x38 [bgcolor=#FFFFFF]
-        RenderBlock (anonymous) at (15,10) size 362x18
-          RenderText at (0,0) size 362x17
-            text run at (0,0) width 362: "empty label should display empty string to match IE"
-      RenderText {#text} at (0,0) size 0x0
diff --git a/LayoutTests/platform/efl/fast/forms/HTMLOptionElement_label03-expected.png b/LayoutTests/platform/efl/fast/forms/HTMLOptionElement_label03-expected.png
deleted file mode 100644 (file)
index 320f0b3..0000000
Binary files a/LayoutTests/platform/efl/fast/forms/HTMLOptionElement_label03-expected.png and /dev/null differ
diff --git a/LayoutTests/platform/efl/fast/forms/HTMLOptionElement_label03-expected.txt b/LayoutTests/platform/efl/fast/forms/HTMLOptionElement_label03-expected.txt
deleted file mode 100644 (file)
index fd4df2e..0000000
+++ /dev/null
@@ -1,13 +0,0 @@
-layer at (0,0) size 800x600
-  RenderView at (0,0) size 800x600
-layer at (0,0) size 800x600
-  RenderBlock {HTML} at (0,0) size 800x600
-    RenderBody {BODY} at (8,8) size 784x584
-      RenderText {#text} at (0,0) size 436x17
-        text run at (0,0) width 436: "When the label contains only white space, the containing text is used."
-      RenderBR {BR} at (436,14) size 0x0
-      RenderMenuList {SELECT} at (2,20) size 460x38 [bgcolor=#FFFFFF]
-        RenderBlock (anonymous) at (15,10) size 404x18
-          RenderText at (0,0) size 404x17
-            text run at (0,0) width 404: "white space label should display empty string to match IE"
-      RenderText {#text} at (0,0) size 0x0
diff --git a/LayoutTests/platform/efl/fast/forms/HTMLOptionElement_label04-expected.png b/LayoutTests/platform/efl/fast/forms/HTMLOptionElement_label04-expected.png
deleted file mode 100644 (file)
index 3b6c159..0000000
Binary files a/LayoutTests/platform/efl/fast/forms/HTMLOptionElement_label04-expected.png and /dev/null differ
diff --git a/LayoutTests/platform/efl/fast/forms/HTMLOptionElement_label04-expected.txt b/LayoutTests/platform/efl/fast/forms/HTMLOptionElement_label04-expected.txt
deleted file mode 100644 (file)
index 48a4d92..0000000
+++ /dev/null
@@ -1,13 +0,0 @@
-layer at (0,0) size 800x600
-  RenderView at (0,0) size 800x600
-layer at (0,0) size 800x600
-  RenderBlock {HTML} at (0,0) size 800x600
-    RenderBody {BODY} at (8,8) size 784x584
-      RenderText {#text} at (0,0) size 595x17
-        text run at (0,0) width 595: "The label attribute appears, but is missing the equals value piece, so the containing text is used."
-      RenderBR {BR} at (595,14) size 0x0
-      RenderMenuList {SELECT} at (2,20) size 616x38 [bgcolor=#FFFFFF]
-        RenderBlock (anonymous) at (15,10) size 560x18
-          RenderText at (0,0) size 560x17
-            text run at (0,0) width 560: "the label attribute is mentioned but no value is specified; this text should appear"
-      RenderText {#text} at (0,0) size 0x0
diff --git a/LayoutTests/platform/efl/fast/forms/HTMLOptionElement_label05-expected.png b/LayoutTests/platform/efl/fast/forms/HTMLOptionElement_label05-expected.png
deleted file mode 100644 (file)
index f052253..0000000
Binary files a/LayoutTests/platform/efl/fast/forms/HTMLOptionElement_label05-expected.png and /dev/null differ
diff --git a/LayoutTests/platform/efl/fast/forms/HTMLOptionElement_label05-expected.txt b/LayoutTests/platform/efl/fast/forms/HTMLOptionElement_label05-expected.txt
deleted file mode 100644 (file)
index 6e2f902..0000000
+++ /dev/null
@@ -1,10 +0,0 @@
-layer at (0,0) size 800x600
-  RenderView at (0,0) size 800x600
-layer at (0,0) size 800x600
-  RenderBlock {HTML} at (0,0) size 800x600
-    RenderBody {BODY} at (8,8) size 784x584
-      RenderText {#text} at (0,0) size 668x17
-        text run at (0,0) width 668: "In the list box below, the text \"This text should appear\" should be shown as the first entry into the list box."
-      RenderBR {BR} at (668,14) size 0x0
-      RenderListBox {SELECT} at (2,20) size 187x91 [bgcolor=#FFFFFF] [border: (1px inset #808080)]
-      RenderText {#text} at (0,0) size 0x0
diff --git a/LayoutTests/platform/efl/fast/forms/HTMLOptionElement_label06-expected.png b/LayoutTests/platform/efl/fast/forms/HTMLOptionElement_label06-expected.png
deleted file mode 100644 (file)
index b9f8c78..0000000
Binary files a/LayoutTests/platform/efl/fast/forms/HTMLOptionElement_label06-expected.png and /dev/null differ
diff --git a/LayoutTests/platform/efl/fast/forms/HTMLOptionElement_label06-expected.txt b/LayoutTests/platform/efl/fast/forms/HTMLOptionElement_label06-expected.txt
deleted file mode 100644 (file)
index ef9605a..0000000
+++ /dev/null
@@ -1,13 +0,0 @@
-layer at (0,0) size 800x600
-  RenderView at (0,0) size 800x600
-layer at (0,0) size 800x600
-  RenderBlock {HTML} at (0,0) size 800x600
-    RenderBody {BODY} at (8,8) size 784x584
-      RenderText {#text} at (0,0) size 718x17
-        text run at (0,0) width 718: "The select item below has a label specified, and no enclosed text. There should be no text shown in the select box."
-      RenderBR {BR} at (718,14) size 0x0
-      RenderMenuList {SELECT} at (2,20) size 56x38 [bgcolor=#FFFFFF]
-        RenderBlock (anonymous) at (15,10) size 0x18
-          RenderText at (0,0) size 0x17
-            text run at (0,0) width 0: " "
-      RenderText {#text} at (0,0) size 0x0
diff --git a/LayoutTests/platform/efl/fast/forms/HTMLOptionElement_label07-expected.png b/LayoutTests/platform/efl/fast/forms/HTMLOptionElement_label07-expected.png
deleted file mode 100644 (file)
index faab059..0000000
Binary files a/LayoutTests/platform/efl/fast/forms/HTMLOptionElement_label07-expected.png and /dev/null differ
diff --git a/LayoutTests/platform/efl/fast/forms/HTMLOptionElement_label07-expected.txt b/LayoutTests/platform/efl/fast/forms/HTMLOptionElement_label07-expected.txt
deleted file mode 100644 (file)
index ed43439..0000000
+++ /dev/null
@@ -1,14 +0,0 @@
-layer at (0,0) size 800x600
-  RenderView at (0,0) size 800x600
-layer at (0,0) size 800x600
-  RenderBlock {HTML} at (0,0) size 800x600
-    RenderBody {BODY} at (8,8) size 784x584
-      RenderText {#text} at (0,0) size 781x35
-        text run at (0,0) width 781: "The select item below has a label specified, and enclosed text that is whitespace. There should be no text shown in the select"
-        text run at (0,18) width 28: "box."
-      RenderBR {BR} at (28,32) size 0x0
-      RenderMenuList {SELECT} at (2,38) size 56x38 [bgcolor=#FFFFFF]
-        RenderBlock (anonymous) at (15,10) size 0x18
-          RenderText at (0,0) size 0x17
-            text run at (0,0) width 0: " "
-      RenderText {#text} at (0,0) size 0x0
diff --git a/LayoutTests/platform/gtk/fast/forms/HTMLOptionElement_label01-expected.png b/LayoutTests/platform/gtk/fast/forms/HTMLOptionElement_label01-expected.png
deleted file mode 100644 (file)
index 611a736..0000000
Binary files a/LayoutTests/platform/gtk/fast/forms/HTMLOptionElement_label01-expected.png and /dev/null differ
diff --git a/LayoutTests/platform/gtk/fast/forms/HTMLOptionElement_label01-expected.txt b/LayoutTests/platform/gtk/fast/forms/HTMLOptionElement_label01-expected.txt
deleted file mode 100644 (file)
index 87a911d..0000000
+++ /dev/null
@@ -1,13 +0,0 @@
-layer at (0,0) size 800x600
-  RenderView at (0,0) size 800x600
-layer at (0,0) size 800x600
-  RenderBlock {HTML} at (0,0) size 800x600
-    RenderBody {BODY} at (8,8) size 784x584
-      RenderText {#text} at (0,0) size 673x17
-        text run at (0,0) width 673: "In the selection list below, the text 'The label for this element is \"1\"' should appear, and not the character '1'"
-      RenderBR {BR} at (673,14) size 0x0
-      RenderMenuList {SELECT} at (2,19) size 241x27 [bgcolor=#FFFFFF] [border: (1px solid #000000)]
-        RenderBlock (anonymous) at (1,1) size 239x25
-          RenderText at (4,4) size 214x17
-            text run at (4,4) width 214: "the label for this element is \"1\""
-      RenderText {#text} at (0,0) size 0x0
diff --git a/LayoutTests/platform/gtk/fast/forms/HTMLOptionElement_label02-expected.png b/LayoutTests/platform/gtk/fast/forms/HTMLOptionElement_label02-expected.png
deleted file mode 100644 (file)
index ba44daa..0000000
Binary files a/LayoutTests/platform/gtk/fast/forms/HTMLOptionElement_label02-expected.png and /dev/null differ
diff --git a/LayoutTests/platform/gtk/fast/forms/HTMLOptionElement_label02-expected.txt b/LayoutTests/platform/gtk/fast/forms/HTMLOptionElement_label02-expected.txt
deleted file mode 100644 (file)
index 0641fd1..0000000
+++ /dev/null
@@ -1,13 +0,0 @@
-layer at (0,0) size 800x600
-  RenderView at (0,0) size 800x600
-layer at (0,0) size 800x600
-  RenderBlock {HTML} at (0,0) size 800x600
-    RenderBody {BODY} at (8,8) size 784x584
-      RenderText {#text} at (0,0) size 300x17
-        text run at (0,0) width 300: "With the label empty, the enclosing text is used."
-      RenderBR {BR} at (300,14) size 0x0
-      RenderMenuList {SELECT} at (2,19) size 389x27 [bgcolor=#FFFFFF] [border: (1px solid #000000)]
-        RenderBlock (anonymous) at (1,1) size 387x25
-          RenderText at (4,4) size 362x17
-            text run at (4,4) width 362: "empty label should display empty string to match IE"
-      RenderText {#text} at (0,0) size 0x0
diff --git a/LayoutTests/platform/gtk/fast/forms/HTMLOptionElement_label03-expected.png b/LayoutTests/platform/gtk/fast/forms/HTMLOptionElement_label03-expected.png
deleted file mode 100644 (file)
index 83c3486..0000000
Binary files a/LayoutTests/platform/gtk/fast/forms/HTMLOptionElement_label03-expected.png and /dev/null differ
diff --git a/LayoutTests/platform/gtk/fast/forms/HTMLOptionElement_label03-expected.txt b/LayoutTests/platform/gtk/fast/forms/HTMLOptionElement_label03-expected.txt
deleted file mode 100644 (file)
index ce9edc5..0000000
+++ /dev/null
@@ -1,13 +0,0 @@
-layer at (0,0) size 800x600
-  RenderView at (0,0) size 800x600
-layer at (0,0) size 800x600
-  RenderBlock {HTML} at (0,0) size 800x600
-    RenderBody {BODY} at (8,8) size 784x584
-      RenderText {#text} at (0,0) size 436x17
-        text run at (0,0) width 436: "When the label contains only white space, the containing text is used."
-      RenderBR {BR} at (436,14) size 0x0
-      RenderMenuList {SELECT} at (2,19) size 431x27 [bgcolor=#FFFFFF] [border: (1px solid #000000)]
-        RenderBlock (anonymous) at (1,1) size 429x25
-          RenderText at (4,4) size 404x17
-            text run at (4,4) width 404: "white space label should display empty string to match IE"
-      RenderText {#text} at (0,0) size 0x0
diff --git a/LayoutTests/platform/gtk/fast/forms/HTMLOptionElement_label04-expected.png b/LayoutTests/platform/gtk/fast/forms/HTMLOptionElement_label04-expected.png
deleted file mode 100644 (file)
index 54c5464..0000000
Binary files a/LayoutTests/platform/gtk/fast/forms/HTMLOptionElement_label04-expected.png and /dev/null differ
diff --git a/LayoutTests/platform/gtk/fast/forms/HTMLOptionElement_label04-expected.txt b/LayoutTests/platform/gtk/fast/forms/HTMLOptionElement_label04-expected.txt
deleted file mode 100644 (file)
index 51efdea..0000000
+++ /dev/null
@@ -1,13 +0,0 @@
-layer at (0,0) size 800x600
-  RenderView at (0,0) size 800x600
-layer at (0,0) size 800x600
-  RenderBlock {HTML} at (0,0) size 800x600
-    RenderBody {BODY} at (8,8) size 784x584
-      RenderText {#text} at (0,0) size 595x17
-        text run at (0,0) width 595: "The label attribute appears, but is missing the equals value piece, so the containing text is used."
-      RenderBR {BR} at (595,14) size 0x0
-      RenderMenuList {SELECT} at (2,19) size 587x27 [bgcolor=#FFFFFF] [border: (1px solid #000000)]
-        RenderBlock (anonymous) at (1,1) size 585x25
-          RenderText at (4,4) size 560x17
-            text run at (4,4) width 560: "the label attribute is mentioned but no value is specified; this text should appear"
-      RenderText {#text} at (0,0) size 0x0
diff --git a/LayoutTests/platform/gtk/fast/forms/HTMLOptionElement_label05-expected.png b/LayoutTests/platform/gtk/fast/forms/HTMLOptionElement_label05-expected.png
deleted file mode 100644 (file)
index 64a2646..0000000
Binary files a/LayoutTests/platform/gtk/fast/forms/HTMLOptionElement_label05-expected.png and /dev/null differ
diff --git a/LayoutTests/platform/gtk/fast/forms/HTMLOptionElement_label05-expected.txt b/LayoutTests/platform/gtk/fast/forms/HTMLOptionElement_label05-expected.txt
deleted file mode 100644 (file)
index 213b1c5..0000000
+++ /dev/null
@@ -1,10 +0,0 @@
-layer at (0,0) size 800x600
-  RenderView at (0,0) size 800x600
-layer at (0,0) size 800x600
-  RenderBlock {HTML} at (0,0) size 800x600
-    RenderBody {BODY} at (8,8) size 784x584
-      RenderText {#text} at (0,0) size 668x17
-        text run at (0,0) width 668: "In the list box below, the text \"This text should appear\" should be shown as the first entry into the list box."
-      RenderBR {BR} at (668,14) size 0x0
-      RenderListBox {SELECT} at (2,19) size 187x91 [bgcolor=#FFFFFF] [border: (1px inset #808080)]
-      RenderText {#text} at (0,0) size 0x0
diff --git a/LayoutTests/platform/gtk/fast/forms/HTMLOptionElement_label06-expected.png b/LayoutTests/platform/gtk/fast/forms/HTMLOptionElement_label06-expected.png
deleted file mode 100644 (file)
index f3cc2a2..0000000
Binary files a/LayoutTests/platform/gtk/fast/forms/HTMLOptionElement_label06-expected.png and /dev/null differ
diff --git a/LayoutTests/platform/gtk/fast/forms/HTMLOptionElement_label06-expected.txt b/LayoutTests/platform/gtk/fast/forms/HTMLOptionElement_label06-expected.txt
deleted file mode 100644 (file)
index 51c228b..0000000
+++ /dev/null
@@ -1,13 +0,0 @@
-layer at (0,0) size 800x600
-  RenderView at (0,0) size 800x600
-layer at (0,0) size 800x600
-  RenderBlock {HTML} at (0,0) size 800x600
-    RenderBody {BODY} at (8,8) size 784x584
-      RenderText {#text} at (0,0) size 718x17
-        text run at (0,0) width 718: "The select item below has a label specified, and no enclosed text. There should be no text shown in the select box."
-      RenderBR {BR} at (718,14) size 0x0
-      RenderMenuList {SELECT} at (2,19) size 27x27 [bgcolor=#FFFFFF] [border: (1px solid #000000)]
-        RenderBlock (anonymous) at (1,1) size 25x25
-          RenderText at (4,4) size 0x17
-            text run at (4,4) width 0: " "
-      RenderText {#text} at (0,0) size 0x0
diff --git a/LayoutTests/platform/gtk/fast/forms/HTMLOptionElement_label07-expected.png b/LayoutTests/platform/gtk/fast/forms/HTMLOptionElement_label07-expected.png
deleted file mode 100644 (file)
index 2c2d62f..0000000
Binary files a/LayoutTests/platform/gtk/fast/forms/HTMLOptionElement_label07-expected.png and /dev/null differ
diff --git a/LayoutTests/platform/gtk/fast/forms/HTMLOptionElement_label07-expected.txt b/LayoutTests/platform/gtk/fast/forms/HTMLOptionElement_label07-expected.txt
deleted file mode 100644 (file)
index 8023828..0000000
+++ /dev/null
@@ -1,14 +0,0 @@
-layer at (0,0) size 800x600
-  RenderView at (0,0) size 800x600
-layer at (0,0) size 800x600
-  RenderBlock {HTML} at (0,0) size 800x600
-    RenderBody {BODY} at (8,8) size 784x584
-      RenderText {#text} at (0,0) size 781x34
-        text run at (0,0) width 781: "The select item below has a label specified, and enclosed text that is whitespace. There should be no text shown in the select"
-        text run at (0,17) width 28: "box."
-      RenderBR {BR} at (28,31) size 0x0
-      RenderMenuList {SELECT} at (2,36) size 27x27 [bgcolor=#FFFFFF] [border: (1px solid #000000)]
-        RenderBlock (anonymous) at (1,1) size 25x25
-          RenderText at (4,4) size 0x17
-            text run at (4,4) width 0: " "
-      RenderText {#text} at (0,0) size 0x0
diff --git a/LayoutTests/platform/ios-simulator-wk2/fast/forms/HTMLOptionElement_label01-expected.txt b/LayoutTests/platform/ios-simulator-wk2/fast/forms/HTMLOptionElement_label01-expected.txt
deleted file mode 100644 (file)
index 4fff53e..0000000
+++ /dev/null
@@ -1,13 +0,0 @@
-layer at (0,0) size 800x600
-  RenderView at (0,0) size 800x600
-layer at (0,0) size 800x600
-  RenderBlock {HTML} at (0,0) size 800x600
-    RenderBody {BODY} at (8,8) size 784x584
-      RenderText {#text} at (0,0) size 685x19
-        text run at (0,0) width 685: "In the selection list below, the text 'The label for this element is \"1\"' should appear, and not the character '1'"
-      RenderBR {BR} at (684,15) size 1x0
-      RenderMenuList {SELECT} at (2,22) size 180x20 [bgcolor=#FFFFFF02] [border: (1px solid #4C4C4C)]
-        RenderBlock (anonymous) at (6,3) size 168x14
-          RenderText at (0,0) size 148x14
-            text run at (0,0) width 148: "the label for this element is \"1\""
-      RenderText {#text} at (0,0) size 0x0
diff --git a/LayoutTests/platform/ios-simulator-wk2/fast/forms/HTMLOptionElement_label02-expected.txt b/LayoutTests/platform/ios-simulator-wk2/fast/forms/HTMLOptionElement_label02-expected.txt
deleted file mode 100644 (file)
index afb3461..0000000
+++ /dev/null
@@ -1,13 +0,0 @@
-layer at (0,0) size 800x600
-  RenderView at (0,0) size 800x600
-layer at (0,0) size 800x600
-  RenderBlock {HTML} at (0,0) size 800x600
-    RenderBody {BODY} at (8,8) size 784x584
-      RenderText {#text} at (0,0) size 306x19
-        text run at (0,0) width 306: "With the label empty, the enclosing text is used."
-      RenderBR {BR} at (305,15) size 1x0
-      RenderMenuList {SELECT} at (2,22) size 283x20 [bgcolor=#FFFFFF02] [border: (1px solid #4C4C4C)]
-        RenderBlock (anonymous) at (6,3) size 271x14
-          RenderText at (0,0) size 251x14
-            text run at (0,0) width 251: "empty label should display empty string to match IE"
-      RenderText {#text} at (0,0) size 0x0
diff --git a/LayoutTests/platform/ios-simulator-wk2/fast/forms/HTMLOptionElement_label03-expected.txt b/LayoutTests/platform/ios-simulator-wk2/fast/forms/HTMLOptionElement_label03-expected.txt
deleted file mode 100644 (file)
index eeee340..0000000
+++ /dev/null
@@ -1,13 +0,0 @@
-layer at (0,0) size 800x600
-  RenderView at (0,0) size 800x600
-layer at (0,0) size 800x600
-  RenderBlock {HTML} at (0,0) size 800x600
-    RenderBody {BODY} at (8,8) size 784x584
-      RenderText {#text} at (0,0) size 445x19
-        text run at (0,0) width 445: "When the label contains only white space, the containing text is used."
-      RenderBR {BR} at (444,15) size 1x0
-      RenderMenuList {SELECT} at (2,22) size 311x20 [bgcolor=#FFFFFF02] [border: (1px solid #4C4C4C)]
-        RenderBlock (anonymous) at (6,3) size 299x14
-          RenderText at (0,0) size 279x14
-            text run at (0,0) width 279: "white space label should display empty string to match IE"
-      RenderText {#text} at (0,0) size 0x0
diff --git a/LayoutTests/platform/ios-simulator-wk2/fast/forms/HTMLOptionElement_label04-expected.txt b/LayoutTests/platform/ios-simulator-wk2/fast/forms/HTMLOptionElement_label04-expected.txt
deleted file mode 100644 (file)
index 77a10ba..0000000
+++ /dev/null
@@ -1,13 +0,0 @@
-layer at (0,0) size 800x600
-  RenderView at (0,0) size 800x600
-layer at (0,0) size 800x600
-  RenderBlock {HTML} at (0,0) size 800x600
-    RenderBody {BODY} at (8,8) size 784x584
-      RenderText {#text} at (0,0) size 610x19
-        text run at (0,0) width 610: "The label attribute appears, but is missing the equals value piece, so the containing text is used."
-      RenderBR {BR} at (609,15) size 1x0
-      RenderMenuList {SELECT} at (2,22) size 420x20 [bgcolor=#FFFFFF02] [border: (1px solid #4C4C4C)]
-        RenderBlock (anonymous) at (6,3) size 408x14
-          RenderText at (0,0) size 388x14
-            text run at (0,0) width 388: "the label attribute is mentioned but no value is specified; this text should appear"
-      RenderText {#text} at (0,0) size 0x0
diff --git a/LayoutTests/platform/ios-simulator-wk2/fast/forms/HTMLOptionElement_label05-expected.txt b/LayoutTests/platform/ios-simulator-wk2/fast/forms/HTMLOptionElement_label05-expected.txt
deleted file mode 100644 (file)
index ab73971..0000000
+++ /dev/null
@@ -1,13 +0,0 @@
-layer at (0,0) size 800x600
-  RenderView at (0,0) size 800x600
-layer at (0,0) size 800x600
-  RenderBlock {HTML} at (0,0) size 800x600
-    RenderBody {BODY} at (8,8) size 784x584
-      RenderText {#text} at (0,0) size 680x19
-        text run at (0,0) width 680: "In the list box below, the text \"This text should appear\" should be shown as the first entry into the list box."
-      RenderBR {BR} at (679,15) size 1x0
-      RenderMenuList {SELECT} at (2,22) size 147x20 [bgcolor=#FFFFFF02] [border: (1px solid #4C4C4C)]
-        RenderBlock (anonymous) at (6,3) size 135x14
-          RenderText at (0,0) size 0x14
-            text run at (0,0) width 0: " "
-      RenderText {#text} at (0,0) size 0x0
diff --git a/LayoutTests/platform/ios-simulator-wk2/fast/forms/HTMLOptionElement_label06-expected.txt b/LayoutTests/platform/ios-simulator-wk2/fast/forms/HTMLOptionElement_label06-expected.txt
deleted file mode 100644 (file)
index 34ea203..0000000
+++ /dev/null
@@ -1,13 +0,0 @@
-layer at (0,0) size 800x600
-  RenderView at (0,0) size 800x600
-layer at (0,0) size 800x600
-  RenderBlock {HTML} at (0,0) size 800x600
-    RenderBody {BODY} at (8,8) size 784x584
-      RenderText {#text} at (0,0) size 731x19
-        text run at (0,0) width 731: "The select item below has a label specified, and no enclosed text. There should be no text shown in the select box."
-      RenderBR {BR} at (730,15) size 1x0
-      RenderMenuList {SELECT} at (2,22) size 32x20 [bgcolor=#FFFFFF02] [border: (1px solid #4C4C4C)]
-        RenderBlock (anonymous) at (6,3) size 20x14
-          RenderText at (0,0) size 0x14
-            text run at (0,0) width 0: " "
-      RenderText {#text} at (0,0) size 0x0
diff --git a/LayoutTests/platform/ios-simulator-wk2/fast/forms/HTMLOptionElement_label07-expected.txt b/LayoutTests/platform/ios-simulator-wk2/fast/forms/HTMLOptionElement_label07-expected.txt
deleted file mode 100644 (file)
index 88215e6..0000000
+++ /dev/null
@@ -1,14 +0,0 @@
-layer at (0,0) size 800x600
-  RenderView at (0,0) size 800x600
-layer at (0,0) size 800x600
-  RenderBlock {HTML} at (0,0) size 800x600
-    RenderBody {BODY} at (8,8) size 784x584
-      RenderText {#text} at (0,0) size 756x39
-        text run at (0,0) width 756: "The select item below has a label specified, and enclosed text that is whitespace. There should be no text shown in the"
-        text run at (0,20) width 69: "select box."
-      RenderBR {BR} at (68,35) size 1x0
-      RenderMenuList {SELECT} at (2,42) size 32x20 [bgcolor=#FFFFFF02] [border: (1px solid #4C4C4C)]
-        RenderBlock (anonymous) at (6,3) size 20x14
-          RenderText at (0,0) size 0x14
-            text run at (0,0) width 0: " "
-      RenderText {#text} at (0,0) size 0x0
diff --git a/LayoutTests/platform/ios-simulator/fast/forms/HTMLOptionElement_label01-expected.txt b/LayoutTests/platform/ios-simulator/fast/forms/HTMLOptionElement_label01-expected.txt
deleted file mode 100644 (file)
index 4fff53e..0000000
+++ /dev/null
@@ -1,13 +0,0 @@
-layer at (0,0) size 800x600
-  RenderView at (0,0) size 800x600
-layer at (0,0) size 800x600
-  RenderBlock {HTML} at (0,0) size 800x600
-    RenderBody {BODY} at (8,8) size 784x584
-      RenderText {#text} at (0,0) size 685x19
-        text run at (0,0) width 685: "In the selection list below, the text 'The label for this element is \"1\"' should appear, and not the character '1'"
-      RenderBR {BR} at (684,15) size 1x0
-      RenderMenuList {SELECT} at (2,22) size 180x20 [bgcolor=#FFFFFF02] [border: (1px solid #4C4C4C)]
-        RenderBlock (anonymous) at (6,3) size 168x14
-          RenderText at (0,0) size 148x14
-            text run at (0,0) width 148: "the label for this element is \"1\""
-      RenderText {#text} at (0,0) size 0x0
diff --git a/LayoutTests/platform/ios-simulator/fast/forms/HTMLOptionElement_label02-expected.txt b/LayoutTests/platform/ios-simulator/fast/forms/HTMLOptionElement_label02-expected.txt
deleted file mode 100644 (file)
index afb3461..0000000
+++ /dev/null
@@ -1,13 +0,0 @@
-layer at (0,0) size 800x600
-  RenderView at (0,0) size 800x600
-layer at (0,0) size 800x600
-  RenderBlock {HTML} at (0,0) size 800x600
-    RenderBody {BODY} at (8,8) size 784x584
-      RenderText {#text} at (0,0) size 306x19
-        text run at (0,0) width 306: "With the label empty, the enclosing text is used."
-      RenderBR {BR} at (305,15) size 1x0
-      RenderMenuList {SELECT} at (2,22) size 283x20 [bgcolor=#FFFFFF02] [border: (1px solid #4C4C4C)]
-        RenderBlock (anonymous) at (6,3) size 271x14
-          RenderText at (0,0) size 251x14
-            text run at (0,0) width 251: "empty label should display empty string to match IE"
-      RenderText {#text} at (0,0) size 0x0
diff --git a/LayoutTests/platform/ios-simulator/fast/forms/HTMLOptionElement_label03-expected.txt b/LayoutTests/platform/ios-simulator/fast/forms/HTMLOptionElement_label03-expected.txt
deleted file mode 100644 (file)
index eeee340..0000000
+++ /dev/null
@@ -1,13 +0,0 @@
-layer at (0,0) size 800x600
-  RenderView at (0,0) size 800x600
-layer at (0,0) size 800x600
-  RenderBlock {HTML} at (0,0) size 800x600
-    RenderBody {BODY} at (8,8) size 784x584
-      RenderText {#text} at (0,0) size 445x19
-        text run at (0,0) width 445: "When the label contains only white space, the containing text is used."
-      RenderBR {BR} at (444,15) size 1x0
-      RenderMenuList {SELECT} at (2,22) size 311x20 [bgcolor=#FFFFFF02] [border: (1px solid #4C4C4C)]
-        RenderBlock (anonymous) at (6,3) size 299x14
-          RenderText at (0,0) size 279x14
-            text run at (0,0) width 279: "white space label should display empty string to match IE"
-      RenderText {#text} at (0,0) size 0x0
diff --git a/LayoutTests/platform/ios-simulator/fast/forms/HTMLOptionElement_label04-expected.txt b/LayoutTests/platform/ios-simulator/fast/forms/HTMLOptionElement_label04-expected.txt
deleted file mode 100644 (file)
index 77a10ba..0000000
+++ /dev/null
@@ -1,13 +0,0 @@
-layer at (0,0) size 800x600
-  RenderView at (0,0) size 800x600
-layer at (0,0) size 800x600
-  RenderBlock {HTML} at (0,0) size 800x600
-    RenderBody {BODY} at (8,8) size 784x584
-      RenderText {#text} at (0,0) size 610x19
-        text run at (0,0) width 610: "The label attribute appears, but is missing the equals value piece, so the containing text is used."
-      RenderBR {BR} at (609,15) size 1x0
-      RenderMenuList {SELECT} at (2,22) size 420x20 [bgcolor=#FFFFFF02] [border: (1px solid #4C4C4C)]
-        RenderBlock (anonymous) at (6,3) size 408x14
-          RenderText at (0,0) size 388x14
-            text run at (0,0) width 388: "the label attribute is mentioned but no value is specified; this text should appear"
-      RenderText {#text} at (0,0) size 0x0
diff --git a/LayoutTests/platform/ios-simulator/fast/forms/HTMLOptionElement_label05-expected.txt b/LayoutTests/platform/ios-simulator/fast/forms/HTMLOptionElement_label05-expected.txt
deleted file mode 100644 (file)
index ab73971..0000000
+++ /dev/null
@@ -1,13 +0,0 @@
-layer at (0,0) size 800x600
-  RenderView at (0,0) size 800x600
-layer at (0,0) size 800x600
-  RenderBlock {HTML} at (0,0) size 800x600
-    RenderBody {BODY} at (8,8) size 784x584
-      RenderText {#text} at (0,0) size 680x19
-        text run at (0,0) width 680: "In the list box below, the text \"This text should appear\" should be shown as the first entry into the list box."
-      RenderBR {BR} at (679,15) size 1x0
-      RenderMenuList {SELECT} at (2,22) size 147x20 [bgcolor=#FFFFFF02] [border: (1px solid #4C4C4C)]
-        RenderBlock (anonymous) at (6,3) size 135x14
-          RenderText at (0,0) size 0x14
-            text run at (0,0) width 0: " "
-      RenderText {#text} at (0,0) size 0x0
diff --git a/LayoutTests/platform/ios-simulator/fast/forms/HTMLOptionElement_label06-expected.txt b/LayoutTests/platform/ios-simulator/fast/forms/HTMLOptionElement_label06-expected.txt
deleted file mode 100644 (file)
index 34ea203..0000000
+++ /dev/null
@@ -1,13 +0,0 @@
-layer at (0,0) size 800x600
-  RenderView at (0,0) size 800x600
-layer at (0,0) size 800x600
-  RenderBlock {HTML} at (0,0) size 800x600
-    RenderBody {BODY} at (8,8) size 784x584
-      RenderText {#text} at (0,0) size 731x19
-        text run at (0,0) width 731: "The select item below has a label specified, and no enclosed text. There should be no text shown in the select box."
-      RenderBR {BR} at (730,15) size 1x0
-      RenderMenuList {SELECT} at (2,22) size 32x20 [bgcolor=#FFFFFF02] [border: (1px solid #4C4C4C)]
-        RenderBlock (anonymous) at (6,3) size 20x14
-          RenderText at (0,0) size 0x14
-            text run at (0,0) width 0: " "
-      RenderText {#text} at (0,0) size 0x0
diff --git a/LayoutTests/platform/ios-simulator/fast/forms/HTMLOptionElement_label07-expected.txt b/LayoutTests/platform/ios-simulator/fast/forms/HTMLOptionElement_label07-expected.txt
deleted file mode 100644 (file)
index 88215e6..0000000
+++ /dev/null
@@ -1,14 +0,0 @@
-layer at (0,0) size 800x600
-  RenderView at (0,0) size 800x600
-layer at (0,0) size 800x600
-  RenderBlock {HTML} at (0,0) size 800x600
-    RenderBody {BODY} at (8,8) size 784x584
-      RenderText {#text} at (0,0) size 756x39
-        text run at (0,0) width 756: "The select item below has a label specified, and enclosed text that is whitespace. There should be no text shown in the"
-        text run at (0,20) width 69: "select box."
-      RenderBR {BR} at (68,35) size 1x0
-      RenderMenuList {SELECT} at (2,42) size 32x20 [bgcolor=#FFFFFF02] [border: (1px solid #4C4C4C)]
-        RenderBlock (anonymous) at (6,3) size 20x14
-          RenderText at (0,0) size 0x14
-            text run at (0,0) width 0: " "
-      RenderText {#text} at (0,0) size 0x0
diff --git a/LayoutTests/platform/mac-mavericks/fast/forms/HTMLOptionElement_label01-expected.png b/LayoutTests/platform/mac-mavericks/fast/forms/HTMLOptionElement_label01-expected.png
deleted file mode 100644 (file)
index 2bd4c55..0000000
Binary files a/LayoutTests/platform/mac-mavericks/fast/forms/HTMLOptionElement_label01-expected.png and /dev/null differ
diff --git a/LayoutTests/platform/mac-mavericks/fast/forms/HTMLOptionElement_label01-expected.txt b/LayoutTests/platform/mac-mavericks/fast/forms/HTMLOptionElement_label01-expected.txt
deleted file mode 100644 (file)
index fd40667..0000000
+++ /dev/null
@@ -1,13 +0,0 @@
-layer at (0,0) size 800x600
-  RenderView at (0,0) size 800x600
-layer at (0,0) size 800x600
-  RenderBlock {HTML} at (0,0) size 800x600
-    RenderBody {BODY} at (8,8) size 784x584
-      RenderText {#text} at (0,0) size 685x18
-        text run at (0,0) width 685: "In the selection list below, the text 'The label for this element is \"1\"' should appear, and not the character '1'"
-      RenderBR {BR} at (684,14) size 1x0
-      RenderMenuList {SELECT} at (2,20) size 196x18 [bgcolor=#FFFFFF]
-        RenderBlock (anonymous) at (0,0) size 196x18
-          RenderText at (8,2) size 165x13
-            text run at (8,2) width 165: "the label for this element is \"1\""
-      RenderText {#text} at (0,0) size 0x0
diff --git a/LayoutTests/platform/mac-mavericks/fast/forms/HTMLOptionElement_label02-expected.png b/LayoutTests/platform/mac-mavericks/fast/forms/HTMLOptionElement_label02-expected.png
deleted file mode 100644 (file)
index 79ade4d..0000000
Binary files a/LayoutTests/platform/mac-mavericks/fast/forms/HTMLOptionElement_label02-expected.png and /dev/null differ
diff --git a/LayoutTests/platform/mac-mavericks/fast/forms/HTMLOptionElement_label02-expected.txt b/LayoutTests/platform/mac-mavericks/fast/forms/HTMLOptionElement_label02-expected.txt
deleted file mode 100644 (file)
index cd69f32..0000000
+++ /dev/null
@@ -1,13 +0,0 @@
-layer at (0,0) size 800x600
-  RenderView at (0,0) size 800x600
-layer at (0,0) size 800x600
-  RenderBlock {HTML} at (0,0) size 800x600
-    RenderBody {BODY} at (8,8) size 784x584
-      RenderText {#text} at (0,0) size 306x18
-        text run at (0,0) width 306: "With the label empty, the enclosing text is used."
-      RenderBR {BR} at (305,14) size 1x0
-      RenderMenuList {SELECT} at (2,20) size 307x18 [bgcolor=#FFFFFF]
-        RenderBlock (anonymous) at (0,0) size 307x18
-          RenderText at (8,2) size 276x13
-            text run at (8,2) width 276: "empty label should display empty string to match IE"
-      RenderText {#text} at (0,0) size 0x0
diff --git a/LayoutTests/platform/mac-mavericks/fast/forms/HTMLOptionElement_label03-expected.png b/LayoutTests/platform/mac-mavericks/fast/forms/HTMLOptionElement_label03-expected.png
deleted file mode 100644 (file)
index 540cf4b..0000000
Binary files a/LayoutTests/platform/mac-mavericks/fast/forms/HTMLOptionElement_label03-expected.png and /dev/null differ
diff --git a/LayoutTests/platform/mac-mavericks/fast/forms/HTMLOptionElement_label04-expected.png b/LayoutTests/platform/mac-mavericks/fast/forms/HTMLOptionElement_label04-expected.png
deleted file mode 100644 (file)
index 5248581..0000000
Binary files a/LayoutTests/platform/mac-mavericks/fast/forms/HTMLOptionElement_label04-expected.png and /dev/null differ
diff --git a/LayoutTests/platform/mac-mavericks/fast/forms/HTMLOptionElement_label04-expected.txt b/LayoutTests/platform/mac-mavericks/fast/forms/HTMLOptionElement_label04-expected.txt
deleted file mode 100644 (file)
index 37eb4a7..0000000
+++ /dev/null
@@ -1,13 +0,0 @@
-layer at (0,0) size 800x600
-  RenderView at (0,0) size 800x600
-layer at (0,0) size 800x600
-  RenderBlock {HTML} at (0,0) size 800x600
-    RenderBody {BODY} at (8,8) size 784x584
-      RenderText {#text} at (0,0) size 610x18
-        text run at (0,0) width 610: "The label attribute appears, but is missing the equals value piece, so the containing text is used."
-      RenderBR {BR} at (609,14) size 1x0
-      RenderMenuList {SELECT} at (2,20) size 461x18 [bgcolor=#FFFFFF]
-        RenderBlock (anonymous) at (0,0) size 461x18
-          RenderText at (8,2) size 430x13
-            text run at (8,2) width 430: "the label attribute is mentioned but no value is specified; this text should appear"
-      RenderText {#text} at (0,0) size 0x0
diff --git a/LayoutTests/platform/mac-mavericks/fast/forms/HTMLOptionElement_label05-expected.png b/LayoutTests/platform/mac-mavericks/fast/forms/HTMLOptionElement_label05-expected.png
deleted file mode 100644 (file)
index d3b7dc3..0000000
Binary files a/LayoutTests/platform/mac-mavericks/fast/forms/HTMLOptionElement_label05-expected.png and /dev/null differ
diff --git a/LayoutTests/platform/mac-mavericks/fast/forms/HTMLOptionElement_label05-expected.txt b/LayoutTests/platform/mac-mavericks/fast/forms/HTMLOptionElement_label05-expected.txt
deleted file mode 100644 (file)
index 84d5718..0000000
+++ /dev/null
@@ -1,10 +0,0 @@
-layer at (0,0) size 800x600
-  RenderView at (0,0) size 800x600
-layer at (0,0) size 800x600
-  RenderBlock {HTML} at (0,0) size 800x600
-    RenderBody {BODY} at (8,8) size 784x584
-      RenderText {#text} at (0,0) size 680x18
-        text run at (0,0) width 680: "In the list box below, the text \"This text should appear\" should be shown as the first entry into the list box."
-      RenderBR {BR} at (679,14) size 1x0
-      RenderListBox {SELECT} at (2,20) size 142x71 [bgcolor=#FFFFFF] [border: (1px inset #808080)]
-      RenderText {#text} at (0,0) size 0x0
diff --git a/LayoutTests/platform/mac/fast/forms/HTMLOptionElement_label01-expected.png b/LayoutTests/platform/mac/fast/forms/HTMLOptionElement_label01-expected.png
deleted file mode 100644 (file)
index ec15c6e..0000000
Binary files a/LayoutTests/platform/mac/fast/forms/HTMLOptionElement_label01-expected.png and /dev/null differ
diff --git a/LayoutTests/platform/mac/fast/forms/HTMLOptionElement_label01-expected.txt b/LayoutTests/platform/mac/fast/forms/HTMLOptionElement_label01-expected.txt
deleted file mode 100644 (file)
index a3e4a7c..0000000
+++ /dev/null
@@ -1,13 +0,0 @@
-layer at (0,0) size 800x600
-  RenderView at (0,0) size 800x600
-layer at (0,0) size 800x600
-  RenderBlock {HTML} at (0,0) size 800x600
-    RenderBody {BODY} at (8,8) size 784x584
-      RenderText {#text} at (0,0) size 685x18
-        text run at (0,0) width 685: "In the selection list below, the text 'The label for this element is \"1\"' should appear, and not the character '1'"
-      RenderBR {BR} at (684,14) size 1x0
-      RenderMenuList {SELECT} at (2,20) size 194x18 [bgcolor=#FFFFFF]
-        RenderBlock (anonymous) at (0,0) size 194x18
-          RenderText at (8,2) size 163x13
-            text run at (8,2) width 163: "the label for this element is \"1\""
-      RenderText {#text} at (0,0) size 0x0
diff --git a/LayoutTests/platform/mac/fast/forms/HTMLOptionElement_label02-expected.png b/LayoutTests/platform/mac/fast/forms/HTMLOptionElement_label02-expected.png
deleted file mode 100644 (file)
index e869bd3..0000000
Binary files a/LayoutTests/platform/mac/fast/forms/HTMLOptionElement_label02-expected.png and /dev/null differ
diff --git a/LayoutTests/platform/mac/fast/forms/HTMLOptionElement_label02-expected.txt b/LayoutTests/platform/mac/fast/forms/HTMLOptionElement_label02-expected.txt
deleted file mode 100644 (file)
index cf0e1ac..0000000
+++ /dev/null
@@ -1,13 +0,0 @@
-layer at (0,0) size 800x600
-  RenderView at (0,0) size 800x600
-layer at (0,0) size 800x600
-  RenderBlock {HTML} at (0,0) size 800x600
-    RenderBody {BODY} at (8,8) size 784x584
-      RenderText {#text} at (0,0) size 306x18
-        text run at (0,0) width 306: "With the label empty, the enclosing text is used."
-      RenderBR {BR} at (305,14) size 1x0
-      RenderMenuList {SELECT} at (2,20) size 306x18 [bgcolor=#FFFFFF]
-        RenderBlock (anonymous) at (0,0) size 306x18
-          RenderText at (8,2) size 275x13
-            text run at (8,2) width 275: "empty label should display empty string to match IE"
-      RenderText {#text} at (0,0) size 0x0
diff --git a/LayoutTests/platform/mac/fast/forms/HTMLOptionElement_label03-expected.png b/LayoutTests/platform/mac/fast/forms/HTMLOptionElement_label03-expected.png
deleted file mode 100644 (file)
index 2283a2a..0000000
Binary files a/LayoutTests/platform/mac/fast/forms/HTMLOptionElement_label03-expected.png and /dev/null differ
diff --git a/LayoutTests/platform/mac/fast/forms/HTMLOptionElement_label03-expected.txt b/LayoutTests/platform/mac/fast/forms/HTMLOptionElement_label03-expected.txt
deleted file mode 100644 (file)
index 8b8bd42..0000000
+++ /dev/null
@@ -1,13 +0,0 @@
-layer at (0,0) size 800x600
-  RenderView at (0,0) size 800x600
-layer at (0,0) size 800x600
-  RenderBlock {HTML} at (0,0) size 800x600
-    RenderBody {BODY} at (8,8) size 784x584
-      RenderText {#text} at (0,0) size 445x18
-        text run at (0,0) width 445: "When the label contains only white space, the containing text is used."
-      RenderBR {BR} at (444,14) size 1x0
-      RenderMenuList {SELECT} at (2,20) size 336x18 [bgcolor=#FFFFFF]
-        RenderBlock (anonymous) at (0,0) size 336x18
-          RenderText at (8,2) size 305x13
-            text run at (8,2) width 305: "white space label should display empty string to match IE"
-      RenderText {#text} at (0,0) size 0x0
diff --git a/LayoutTests/platform/mac/fast/forms/HTMLOptionElement_label04-expected.png b/LayoutTests/platform/mac/fast/forms/HTMLOptionElement_label04-expected.png
deleted file mode 100644 (file)
index 2aa6b97..0000000
Binary files a/LayoutTests/platform/mac/fast/forms/HTMLOptionElement_label04-expected.png and /dev/null differ
diff --git a/LayoutTests/platform/mac/fast/forms/HTMLOptionElement_label04-expected.txt b/LayoutTests/platform/mac/fast/forms/HTMLOptionElement_label04-expected.txt
deleted file mode 100644 (file)
index ab7ed45..0000000
+++ /dev/null
@@ -1,13 +0,0 @@
-layer at (0,0) size 800x600
-  RenderView at (0,0) size 800x600
-layer at (0,0) size 800x600
-  RenderBlock {HTML} at (0,0) size 800x600
-    RenderBody {BODY} at (8,8) size 784x584
-      RenderText {#text} at (0,0) size 610x18
-        text run at (0,0) width 610: "The label attribute appears, but is missing the equals value piece, so the containing text is used."
-      RenderBR {BR} at (609,14) size 1x0
-      RenderMenuList {SELECT} at (2,20) size 455x18 [bgcolor=#FFFFFF]
-        RenderBlock (anonymous) at (0,0) size 455x18
-          RenderText at (8,2) size 424x13
-            text run at (8,2) width 424: "the label attribute is mentioned but no value is specified; this text should appear"
-      RenderText {#text} at (0,0) size 0x0
diff --git a/LayoutTests/platform/mac/fast/forms/HTMLOptionElement_label05-expected.png b/LayoutTests/platform/mac/fast/forms/HTMLOptionElement_label05-expected.png
deleted file mode 100644 (file)
index 3ded059..0000000
Binary files a/LayoutTests/platform/mac/fast/forms/HTMLOptionElement_label05-expected.png and /dev/null differ
diff --git a/LayoutTests/platform/mac/fast/forms/HTMLOptionElement_label05-expected.txt b/LayoutTests/platform/mac/fast/forms/HTMLOptionElement_label05-expected.txt
deleted file mode 100644 (file)
index 84d5718..0000000
+++ /dev/null
@@ -1,10 +0,0 @@
-layer at (0,0) size 800x600
-  RenderView at (0,0) size 800x600
-layer at (0,0) size 800x600
-  RenderBlock {HTML} at (0,0) size 800x600
-    RenderBody {BODY} at (8,8) size 784x584
-      RenderText {#text} at (0,0) size 680x18
-        text run at (0,0) width 680: "In the list box below, the text \"This text should appear\" should be shown as the first entry into the list box."
-      RenderBR {BR} at (679,14) size 1x0
-      RenderListBox {SELECT} at (2,20) size 142x71 [bgcolor=#FFFFFF] [border: (1px inset #808080)]
-      RenderText {#text} at (0,0) size 0x0
diff --git a/LayoutTests/platform/mac/fast/forms/HTMLOptionElement_label06-expected.png b/LayoutTests/platform/mac/fast/forms/HTMLOptionElement_label06-expected.png
deleted file mode 100644 (file)
index 8d8b91e..0000000
Binary files a/LayoutTests/platform/mac/fast/forms/HTMLOptionElement_label06-expected.png and /dev/null differ
diff --git a/LayoutTests/platform/mac/fast/forms/HTMLOptionElement_label06-expected.txt b/LayoutTests/platform/mac/fast/forms/HTMLOptionElement_label06-expected.txt
deleted file mode 100644 (file)
index 471f117..0000000
+++ /dev/null
@@ -1,13 +0,0 @@
-layer at (0,0) size 800x600
-  RenderView at (0,0) size 800x600
-layer at (0,0) size 800x600
-  RenderBlock {HTML} at (0,0) size 800x600
-    RenderBody {BODY} at (8,8) size 784x584
-      RenderText {#text} at (0,0) size 730x18
-        text run at (0,0) width 730: "The select item below has a label specified, and no enclosed text. There should be no text shown in the select box."
-      RenderBR {BR} at (729,14) size 1x0
-      RenderMenuList {SELECT} at (2,20) size 36x18 [bgcolor=#FFFFFF]
-        RenderBlock (anonymous) at (0,0) size 36x18
-          RenderText at (8,2) size 0x13
-            text run at (8,2) width 0: " "
-      RenderText {#text} at (0,0) size 0x0
diff --git a/LayoutTests/platform/mac/fast/forms/HTMLOptionElement_label07-expected.png b/LayoutTests/platform/mac/fast/forms/HTMLOptionElement_label07-expected.png
deleted file mode 100644 (file)
index ff570f7..0000000
Binary files a/LayoutTests/platform/mac/fast/forms/HTMLOptionElement_label07-expected.png and /dev/null differ
diff --git a/LayoutTests/platform/mac/fast/forms/HTMLOptionElement_label07-expected.txt b/LayoutTests/platform/mac/fast/forms/HTMLOptionElement_label07-expected.txt
deleted file mode 100644 (file)
index 6f5fe7f..0000000
+++ /dev/null
@@ -1,14 +0,0 @@
-layer at (0,0) size 800x600
-  RenderView at (0,0) size 800x600
-layer at (0,0) size 800x600
-  RenderBlock {HTML} at (0,0) size 800x600
-    RenderBody {BODY} at (8,8) size 784x584
-      RenderText {#text} at (0,0) size 755x36
-        text run at (0,0) width 755: "The select item below has a label specified, and enclosed text that is whitespace. There should be no text shown in the"
-        text run at (0,18) width 69: "select box."
-      RenderBR {BR} at (68,32) size 1x0
-      RenderMenuList {SELECT} at (2,38) size 36x18 [bgcolor=#FFFFFF]
-        RenderBlock (anonymous) at (0,0) size 36x18
-          RenderText at (8,2) size 0x13
-            text run at (8,2) width 0: " "
-      RenderText {#text} at (0,0) size 0x0
diff --git a/LayoutTests/platform/win/fast/forms/HTMLOptionElement_label01-expected.png b/LayoutTests/platform/win/fast/forms/HTMLOptionElement_label01-expected.png
deleted file mode 100644 (file)
index c9b52d3..0000000
Binary files a/LayoutTests/platform/win/fast/forms/HTMLOptionElement_label01-expected.png and /dev/null differ
diff --git a/LayoutTests/platform/win/fast/forms/HTMLOptionElement_label01-expected.txt b/LayoutTests/platform/win/fast/forms/HTMLOptionElement_label01-expected.txt
deleted file mode 100644 (file)
index ae3b8b3..0000000
+++ /dev/null
@@ -1,13 +0,0 @@
-layer at (0,0) size 800x600
-  RenderView at (0,0) size 800x600
-layer at (0,0) size 800x600
-  RenderBlock {HTML} at (0,0) size 800x600
-    RenderBody {BODY} at (8,8) size 784x584
-      RenderText {#text} at (0,0) size 673x18
-        text run at (0,0) width 673: "In the selection list below, the text 'The label for this element is \"1\"' should appear, and not the character '1'"
-      RenderBR {BR} at (673,14) size 0x0
-      RenderMenuList {SELECT} at (2,20) size 197x19 [bgcolor=#FFFFFF]
-        RenderBlock (anonymous) at (4,2) size 172x15
-          RenderText at (0,0) size 172x15
-            text run at (0,0) width 172: "the label for this element is \"1\""
-      RenderText {#text} at (0,0) size 0x0
diff --git a/LayoutTests/platform/win/fast/forms/HTMLOptionElement_label02-expected.png b/LayoutTests/platform/win/fast/forms/HTMLOptionElement_label02-expected.png
deleted file mode 100644 (file)
index 84c6279..0000000
Binary files a/LayoutTests/platform/win/fast/forms/HTMLOptionElement_label02-expected.png and /dev/null differ
diff --git a/LayoutTests/platform/win/fast/forms/HTMLOptionElement_label02-expected.txt b/LayoutTests/platform/win/fast/forms/HTMLOptionElement_label02-expected.txt
deleted file mode 100644 (file)
index efb588a..0000000
+++ /dev/null
@@ -1,13 +0,0 @@
-layer at (0,0) size 800x600
-  RenderView at (0,0) size 800x600
-layer at (0,0) size 800x600
-  RenderBlock {HTML} at (0,0) size 800x600
-    RenderBody {BODY} at (8,8) size 784x584
-      RenderText {#text} at (0,0) size 300x18
-        text run at (0,0) width 300: "With the label empty, the enclosing text is used."
-      RenderBR {BR} at (300,14) size 0x0
-      RenderMenuList {SELECT} at (2,20) size 319x19 [bgcolor=#FFFFFF]
-        RenderBlock (anonymous) at (4,2) size 294x15
-          RenderText at (0,0) size 294x15
-            text run at (0,0) width 294: "empty label should display empty string to match IE"
-      RenderText {#text} at (0,0) size 0x0
diff --git a/LayoutTests/platform/win/fast/forms/HTMLOptionElement_label03-expected.png b/LayoutTests/platform/win/fast/forms/HTMLOptionElement_label03-expected.png
deleted file mode 100644 (file)
index 5408d19..0000000
Binary files a/LayoutTests/platform/win/fast/forms/HTMLOptionElement_label03-expected.png and /dev/null differ
diff --git a/LayoutTests/platform/win/fast/forms/HTMLOptionElement_label03-expected.txt b/LayoutTests/platform/win/fast/forms/HTMLOptionElement_label03-expected.txt
deleted file mode 100644 (file)
index a615392..0000000
+++ /dev/null
@@ -1,13 +0,0 @@
-layer at (0,0) size 800x600
-  RenderView at (0,0) size 800x600
-layer at (0,0) size 800x600
-  RenderBlock {HTML} at (0,0) size 800x600
-    RenderBody {BODY} at (8,8) size 784x584
-      RenderText {#text} at (0,0) size 436x18
-        text run at (0,0) width 436: "When the label contains only white space, the containing text is used."
-      RenderBR {BR} at (436,14) size 0x0
-      RenderMenuList {SELECT} at (2,20) size 351x19 [bgcolor=#FFFFFF]
-        RenderBlock (anonymous) at (4,2) size 326x15
-          RenderText at (0,0) size 326x15
-            text run at (0,0) width 326: "white space label should display empty string to match IE"
-      RenderText {#text} at (0,0) size 0x0
diff --git a/LayoutTests/platform/win/fast/forms/HTMLOptionElement_label04-expected.png b/LayoutTests/platform/win/fast/forms/HTMLOptionElement_label04-expected.png
deleted file mode 100644 (file)
index 6f931c1..0000000
Binary files a/LayoutTests/platform/win/fast/forms/HTMLOptionElement_label04-expected.png and /dev/null differ
diff --git a/LayoutTests/platform/win/fast/forms/HTMLOptionElement_label04-expected.txt b/LayoutTests/platform/win/fast/forms/HTMLOptionElement_label04-expected.txt
deleted file mode 100644 (file)
index 1452d08..0000000
+++ /dev/null
@@ -1,13 +0,0 @@
-layer at (0,0) size 800x600
-  RenderView at (0,0) size 800x600
-layer at (0,0) size 800x600
-  RenderBlock {HTML} at (0,0) size 800x600
-    RenderBody {BODY} at (8,8) size 784x584
-      RenderText {#text} at (0,0) size 595x18
-        text run at (0,0) width 595: "The label attribute appears, but is missing the equals value piece, so the containing text is used."
-      RenderBR {BR} at (595,14) size 0x0
-      RenderMenuList {SELECT} at (2,20) size 475x19 [bgcolor=#FFFFFF]
-        RenderBlock (anonymous) at (4,2) size 450x15
-          RenderText at (0,0) size 450x15
-            text run at (0,0) width 450: "the label attribute is mentioned but no value is specified; this text should appear"
-      RenderText {#text} at (0,0) size 0x0
diff --git a/LayoutTests/platform/win/fast/forms/HTMLOptionElement_label05-expected.txt b/LayoutTests/platform/win/fast/forms/HTMLOptionElement_label05-expected.txt
deleted file mode 100644 (file)
index 50657de..0000000
+++ /dev/null
@@ -1,10 +0,0 @@
-layer at (0,0) size 800x600
-  RenderView at (0,0) size 800x600
-layer at (0,0) size 800x600
-  RenderBlock {HTML} at (0,0) size 800x600
-    RenderBody {BODY} at (8,8) size 784x584
-      RenderText {#text} at (0,0) size 668x18
-        text run at (0,0) width 668: "In the list box below, the text \"This text should appear\" should be shown as the first entry into the list box."
-      RenderBR {BR} at (668,14) size 0x0
-      RenderListBox {SELECT} at (2,20) size 154x81 [bgcolor=#FFFFFF] [border: (1px inset #808080)]
-      RenderText {#text} at (0,0) size 0x0
diff --git a/LayoutTests/platform/win/fast/forms/HTMLOptionElement_label06-expected.txt b/LayoutTests/platform/win/fast/forms/HTMLOptionElement_label06-expected.txt
deleted file mode 100644 (file)
index 9d70679..0000000
+++ /dev/null
@@ -1,13 +0,0 @@
-layer at (0,0) size 800x600
-  RenderView at (0,0) size 800x600
-layer at (0,0) size 800x600
-  RenderBlock {HTML} at (0,0) size 800x600
-    RenderBody {BODY} at (8,8) size 784x584
-      RenderText {#text} at (0,0) size 718x18
-        text run at (0,0) width 718: "The select item below has a label specified, and no enclosed text. There should be no text shown in the select box."
-      RenderBR {BR} at (718,14) size 0x0
-      RenderMenuList {SELECT} at (2,20) size 25x19 [bgcolor=#FFFFFF]
-        RenderBlock (anonymous) at (4,2) size 0x15
-          RenderText at (0,0) size 0x15
-            text run at (0,0) width 0: " "
-      RenderText {#text} at (0,0) size 0x0
diff --git a/LayoutTests/platform/win/fast/forms/HTMLOptionElement_label07-expected.txt b/LayoutTests/platform/win/fast/forms/HTMLOptionElement_label07-expected.txt
deleted file mode 100644 (file)
index fa27ca1..0000000
+++ /dev/null
@@ -1,14 +0,0 @@
-layer at (0,0) size 800x600
-  RenderView at (0,0) size 800x600
-layer at (0,0) size 800x600
-  RenderBlock {HTML} at (0,0) size 800x600
-    RenderBody {BODY} at (8,8) size 784x584
-      RenderText {#text} at (0,0) size 781x36
-        text run at (0,0) width 781: "The select item below has a label specified, and enclosed text that is whitespace. There should be no text shown in the select"
-        text run at (0,18) width 28: "box."
-      RenderBR {BR} at (28,32) size 0x0
-      RenderMenuList {SELECT} at (2,38) size 25x19 [bgcolor=#FFFFFF]
-        RenderBlock (anonymous) at (4,2) size 0x15
-          RenderText at (0,0) size 0x15
-            text run at (0,0) width 0: " "
-      RenderText {#text} at (0,0) size 0x0
index 313e6a0..2ce4d32 100644 (file)
@@ -1,3 +1,54 @@
+2015-11-03  Keith Rollin  <krollin@apple.com>
+
+        HTMLOptionElement.text should never return the value of label
+        https://bugs.webkit.org/show_bug.cgi?id=148862
+        rdar://problem/22589226
+
+        Reviewed by Darin Adler.
+
+        According to the HTML spec, `option` elements should have the
+        following behavior:
+
+            - the `text` property should return text contents of element
+            - the `label` property should return value of label attribute if
+              it exists, else return text property
+            - the UI should display label property
+
+        12 years ago, in order to be compatibile with browsers of the time, we
+        diverged from this behavior: the text property behaved like the label
+        property, and the text property was used for display. This resulted in
+        our UI incidentally conforming to the spec, but also in the text
+        property *not* conforming to the spec. See <rdar://problem/3532519>
+        for discussion on this change.
+
+        The behavior of the browsers we were conforming to has changed. In
+        particular, the text property in Firefox now conforms to the spec
+        instead of behaving as we did. Therefore, it's less important to
+        retain our old behavior for the sake of compatibility. This check-in
+        brings us into conformance with the spec. The result is that the UI
+        stays the same, but the text property will return different values than
+        it used to if the option element has a label attribute that used to
+        hide it.
+
+        Updated tests:
+        - fast/dom/HTMLOptionElement/option-text.html:
+        - fast/forms/HTMLOptionElement_label01.html:
+        - fast/forms/HTMLOptionElement_label02.html:
+        - fast/forms/HTMLOptionElement_label03.html:
+        - fast/forms/HTMLOptionElement_label04.html:
+        - fast/forms/HTMLOptionElement_label05.html:
+        - fast/forms/HTMLOptionElement_label06.html:
+        - fast/forms/HTMLOptionElement_label07.html:
+        - fast/forms/option-value-and-label.html:
+
+        * accessibility/AccessibilityListBoxOption.cpp:
+        (WebCore::AccessibilityListBoxOption::stringValue):
+        * accessibility/AccessibilityMenuListOption.cpp:
+        (WebCore::AccessibilityMenuListOption::stringValue):
+        * html/HTMLOptionElement.cpp:
+        (WebCore::HTMLOptionElement::text):
+        (WebCore::HTMLOptionElement::textIndentedToRespectGroupLabel):
+
 2015-11-03  Andreas Kling  <akling@apple.com>
 
         ResourceUsageOverlay should draw itself using WebCore::GraphicsContext.
index 1188ecd..ea39eb5 100644 (file)
@@ -148,7 +148,7 @@ String AccessibilityListBoxOption::stringValue() const
         return ariaLabel;
     
     if (is<HTMLOptionElement>(*m_optionElement))
-        return downcast<HTMLOptionElement>(*m_optionElement).text();
+        return downcast<HTMLOptionElement>(*m_optionElement).label();
     
     if (is<HTMLOptGroupElement>(*m_optionElement))
         return downcast<HTMLOptGroupElement>(*m_optionElement).groupLabelText();
index 8201e4a..ddb2646 100644 (file)
@@ -118,7 +118,7 @@ LayoutRect AccessibilityMenuListOption::elementRect() const
 
 String AccessibilityMenuListOption::stringValue() const
 {
-    return downcast<HTMLOptionElement>(*m_element).text();
+    return downcast<HTMLOptionElement>(*m_element).label();
 }
 
 } // namespace WebCore
index 124d169..0a72f19 100644 (file)
@@ -98,17 +98,7 @@ bool HTMLOptionElement::isFocusable() const
 
 String HTMLOptionElement::text() const
 {
-    String text;
-
-    // WinIE does not use the label attribute, so as a quirk, we ignore it.
-    if (!document().inQuirksMode())
-        text = fastGetAttribute(labelAttr);
-
-    // FIXME: The following treats an element with the label attribute set to
-    // the empty string the same as an element with no label attribute at all.
-    // Is that correct? If it is, then should the label function work the same way?
-    if (text.isEmpty())
-        text = collectOptionInnerText();
+    String text = collectOptionInnerText();
 
     // FIXME: Is displayStringModifiedByEncoding helpful here?
     // If it's correct here, then isn't it needed in the value and label functions too?
@@ -300,8 +290,8 @@ String HTMLOptionElement::textIndentedToRespectGroupLabel() const
 {
     ContainerNode* parent = parentNode();
     if (is<HTMLOptGroupElement>(parent))
-        return "    " + text();
-    return text();
+        return "    " + label();
+    return label();
 }
 
 bool HTMLOptionElement::isDisabledFormControl() const