Bug 860123 - Use the right window's selection in some tests; r=ehsan

shellylin · Sep 3, 2013 · 1f98b00 · 1f98b00
1 parent bbd7b55
commit 1f98b00
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 1 deletion.
diff --git a/editor/libeditor/base/tests/test_bug646194.xul b/editor/libeditor/base/tests/test_bug646194.xul
@@ -35,11 +35,12 @@ function runTest() {
 
   var i = document.getElementById("i");
   i.focus();
+  var win = i.contentWindow;
   var doc = i.contentDocument;
   var t = doc.getElementById("t");
   t.focus();
   // put the caret at the end
-  getSelection().collapse(t.firstChild, 11);
+  win.getSelection().collapse(t.firstChild, 11);
 
   // Simulate pression Option+Delete on Mac
   // We do things this way because not every platform can invoke this

diff --git a/layout/base/tests/test_scroll_selection_into_view.html b/layout/base/tests/test_scroll_selection_into_view.html
@@ -77,6 +77,7 @@
   var c = document.getElementById("c" + id);
   var target = document.getElementById("target" + id);
   if (target.contentDocument) {
+    selection = target.contentWindow.getSelection().QueryInterface(Components.interfaces.nsISelectionPrivate);
     target = target.contentDocument.getElementById("target" + id);
   }
   selection.collapse(target.parentNode, 0);