Merge m-c into s-c

2012-01-17 11:54:07 -08:00 · 2012-01-17 11:54:07 -08:00 · 3009b114f4
--- a/layout/base/tests/bug389321-1-ref.html
+++ b/layout/base/tests/bug389321-1-ref.html
@ -4,12 +4,14 @@
 <body>
 <span contenteditable id="t" style="border: 1px dashed green; min-height: 2px; padding-right: 20px;"> </span></body>
 <script>
-  // Only focus the span to put the caret at its beginning
  var sel = window.getSelection();
  sel.removeAllRanges();

+  // Focus the span to put the caret at its beginning.
  var area = document.getElementById('t');
  area.focus();
+
+  // Do nothing else.
 </script>
 </body>
 </html>
--- a/layout/base/tests/bug389321-1.html
+++ b/layout/base/tests/bug389321-1.html
@ -4,14 +4,15 @@
 <body>
 <span contenteditable id="t" style="border: 1px dashed green; min-height: 2px; padding-right: 20px;"> </span></body>
 <script>
-  // Enter a character in the span and delete it
  var sel = window.getSelection();
  sel.removeAllRanges();

+  // Focus the span to put the caret at its beginning.
  var area = document.getElementById('t');
  area.focus();

-  sendKey("W"); // enter a character
+  // Enter a character in the span then delete it.
+  sendChar("W");
  sendKey("BACK_SPACE");
 </script>
 </body>