Bug 826964 - Attempt to fix the intermittent orange by focusing the current browser; r=ehsan
authorRaymond Lee <raymond@raysquare.com>
Mon, 14 Jan 2013 13:49:58 +0800
changeset 118788 bceda048221bee38d8a67eb696a054bdb8f0e000
parent 118787 2c7287304555227fdacf10a6d8113d526aaae93b
child 118789 329fbaeaa0d4bffe128572aa3f68a0636cd35cc5
push id24180
push useremorley@mozilla.com
push dateTue, 15 Jan 2013 22:58:27 +0000
treeherdermozilla-central@72e34ce7fd92 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersehsan
bugs826964
milestone21.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 826964 - Attempt to fix the intermittent orange by focusing the current browser; r=ehsan
dom/tests/mochitest/localstorage/Makefile.in
dom/tests/mochitest/localstorage/page_blank.html
dom/tests/mochitest/localstorage/test_localStorageQuotaPrivateBrowsing_perwindowpb.html
--- a/dom/tests/mochitest/localstorage/Makefile.in
+++ b/dom/tests/mochitest/localstorage/Makefile.in
@@ -55,26 +55,24 @@ MOCHITEST_FILES	= \
     test_storageConstructor.html \
     $(NULL)
 
 ifndef MOZ_PER_WINDOW_PRIVATE_BROWSING
 MOCHITEST_FILES += \
     test_localStorageBasePrivateBrowsing.html \
     test_localStorageQuotaPrivateBrowsing.html \
     $(NULL)
+else
+MOCHITEST_CHROME_FILES += \
+    test_localStorageBasePrivateBrowsing_perwindowpb.html \
+    page_blank.html \
+    test_localStorageQuotaPrivateBrowsing_perwindowpb.html \
+    $(NULL)
 endif
 
 MOCHITEST_CHROME_FILES = \
     test_localStorageFromChrome.xhtml \
     test_app_uninstall.html \
     test_clear_browser_data.html \
     frame_clear_browser_data.html \
     $(NULL)
 
-ifdef MOZ_PER_WINDOW_PRIVATE_BROWSING
-MOCHITEST_CHROME_FILES += \
-    test_localStorageBasePrivateBrowsing_perwindowpb.html \
-    page_blank.html \
-    test_localStorageQuotaPrivateBrowsing_perwindowpb.html \
-    $(NULL)
-endif
-
 include $(topsrcdir)/config/rules.mk
--- a/dom/tests/mochitest/localstorage/page_blank.html
+++ b/dom/tests/mochitest/localstorage/page_blank.html
@@ -1,5 +1,6 @@
+<!DOCTYPE html>
 <html>
 <body>
 
 </body>
 </html>
--- a/dom/tests/mochitest/localstorage/test_localStorageQuotaPrivateBrowsing_perwindowpb.html
+++ b/dom/tests/mochitest/localstorage/test_localStorageQuotaPrivateBrowsing_perwindowpb.html
@@ -166,16 +166,17 @@ function testOnWindow(aIsPrivate, aCallb
   win.addEventListener("load", function onLoad() {
     win.removeEventListener("load", onLoad, false);
     win.addEventListener("DOMContentLoaded", function onInnerLoad() {
       if (win.content.location.href != CONTENT_PAGE) {
         win.gBrowser.loadURI(CONTENT_PAGE);
         return;
       }
       win.removeEventListener("DOMContentLoaded", onInnerLoad, true);
+      win.gBrowser.selectedBrowser.focus();
       SimpleTest.executeSoon(function() { aCallback(win); });
     }, true);
     win.gBrowser.loadURI(CONTENT_PAGE);
   }, true);
 }
 
 </script>
 </head>