Backout changeset 37c5482971b1 (bug 583976) because of Android R2 test failures
authorEhsan Akhgari <ehsan@mozilla.com>
Mon, 03 Oct 2011 23:40:34 -0400
changeset 78045 149fc4a6efca858205c5d48629ef6b7ff97ad693
parent 78044 d0700bfeda6373ce6fa9383a4c77b27b532900f6
child 78054 3c9e65a1a5bb4520362658b11a1eb4b1de3b4627
push id21263
push usereakhgari@mozilla.com
push dateTue, 04 Oct 2011 03:55:06 +0000
treeherdermozilla-central@149fc4a6efca [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
bugs583976
milestone10.0a1
backs out37c5482971b1fdb1e6c02ae45e762143da01ce2a
first release with
nightly linux32
149fc4a6efca / 10.0a1 / 20111004030858 / files
nightly linux64
149fc4a6efca / 10.0a1 / 20111004030858 / files
nightly mac
149fc4a6efca / 10.0a1 / 20111004030858 / files
nightly win32
149fc4a6efca / 10.0a1 / 20111004030858 / files
nightly win64
149fc4a6efca / 10.0a1 / 20111004030858 / files
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
releases
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Backout changeset 37c5482971b1 (bug 583976) because of Android R2 test failures
layout/tools/reftest/reftest.js
--- a/layout/tools/reftest/reftest.js
+++ b/layout/tools/reftest/reftest.js
@@ -871,16 +871,22 @@ function ServeFiles(manifestURL, depth, 
     }
 
     return files.map(FileToURI);
 }
 
 // Return true iff this window is focused when this function returns.
 function Focus()
 {
+    // FIXME/bug 583976: focus doesn't yet work with out-of-process
+    // content.
+    if (gBrowserIsRemote) {
+        return false;
+    }
+
     var fm = CC["@mozilla.org/focus-manager;1"].getService(CI.nsIFocusManager);
     fm.activeWindow = window;
     try {
         var dock = CC["@mozilla.org/widget/macdocksupport;1"].getService(CI.nsIMacDockSupport);
         dock.activateApplication(true);
     } catch(ex) {
     }
     return true;