Bug 787412 - HTMLOptionElement.prototype.text should use do a deep tr…

…ee traversal; r=mounir
mozilla · Sep 6, 2012 · 39bf3c2 · 39bf3c2
1 parent ceda491
commit 39bf3c2
Show file tree

Hide file tree

Showing 6 changed files with 36 additions and 2 deletions.
diff --git a/content/html/content/src/nsHTMLOptionElement.cpp b/content/html/content/src/nsHTMLOptionElement.cpp
@@ -260,7 +260,7 @@ NS_IMETHODIMP
 nsHTMLOptionElement::GetText(nsAString& aText)
 {
   nsAutoString text;
-  nsContentUtils::GetNodeTextContent(this, false, text);
+  nsContentUtils::GetNodeTextContent(this, true, text);
 
   // XXX No CompressWhitespace for nsAString.  Sad.
   text.CompressWhitespace(true, true);

diff --git a/content/html/content/test/forms/Makefile.in b/content/html/content/test/forms/Makefile.in
@@ -32,13 +32,14 @@ MOCHITEST_FILES = \
 		test_maxlength_attribute.html \
 		test_datalist_element.html \
 		test_form_attributes_reflection.html \
+		test_option_disabled.html \
 		test_option_index_attribute.html \
+		test_option_text.html \
 		test_progress_element.html \
 		test_form_attribute-1.html \
 		test_form_attribute-2.html \
 		test_form_attribute-3.html \
 		test_form_attribute-4.html \
-		test_option_disabled.html \
 		test_meter_element.html \
 		test_meter_pseudo-classes.html \
 		test_max_attribute.html \

diff --git a/content/html/content/test/forms/test_option_text.html b/content/html/content/test/forms/test_option_text.html
@@ -0,0 +1,16 @@
+<!doctype html>
+<meta charset=utf-8>
+<title>HTMLOptionElement.text</title>
+<link rel=author title=Ms2ger href="mailto:Ms2ger@gmail.com">
+<link rel=help href="http://www.whatwg.org/html/#dom-option-text">
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<div id=log></div>
+<script>
+test(function() {
+  var option = document.createElement("option");
+  option.appendChild(document.createElement("font"))
+        .appendChild(document.createTextNode(" font "));
+  assert_equals(option.text, "font");
+});
+</script>
diff --git a/layout/reftests/forms/reftest.list b/layout/reftests/forms/reftest.list
@@ -60,6 +60,7 @@ fails-if(Android) != textarea-rtl.html textarea-no-resize.html
 == select-multiple.html select-multiple-ref.html
 == select-boguskids.html select-boguskids-ref.html
 == select-dynamic-boguskids.html select-boguskids-ref.html
+== select-option-children.html select-option-children-ref.html
 
 asserts(2) == button-first-letter-1.html button-first-letter-1-ref.html
 asserts(1) != button-first-letter-1.html button-first-letter-1-noref.html

diff --git a/layout/reftests/forms/select-option-children-ref.html b/layout/reftests/forms/select-option-children-ref.html
@@ -0,0 +1,5 @@
+<!doctype html>
+<meta charset=utf-8>
+<title>Option elements with children</title>
+<body>
+<select><option>font</option></select>
diff --git a/layout/reftests/forms/select-option-children.html b/layout/reftests/forms/select-option-children.html
@@ -0,0 +1,11 @@
+<!doctype html>
+<meta charset=utf-8>
+<title>Option elements with children</title>
+<body>
+<script>
+document.body
+  .appendChild(document.createElement("select"))
+  .appendChild(document.createElement("option"))
+  .appendChild(document.createElement("font"))
+  .appendChild(document.createTextNode("font"))
+</script>