Backed out changeset 30cfcf54f286 (bug 1244221) for browser_aboutHome_wrapsCorrectly.js failures a=backout
authorWes Kocher <wkocher@mozilla.com>
Thu, 11 Feb 2016 12:58:50 -0800
changeset 311217 bf3681b5be9a4fbeb525475e8197833b0bc20b8b
parent 311216 fb1653512406a59fe283de17662b7b5d09c4128a
child 311218 b3c3d3dbcca5de3d21abf658378432b5c864ce01
child 311222 66afdb3943e998d1a1a5aab1d92eb9663179bcd6
push id5607
push userkwierso@gmail.com
push dateThu, 11 Feb 2016 20:58:51 +0000
treeherdermozilla-beta@bf3681b5be9a [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersbackout
bugs1244221
milestone45.0
backs out30cfcf54f2867e2878b513140cd8094bee116586
Backed out changeset 30cfcf54f286 (bug 1244221) for browser_aboutHome_wrapsCorrectly.js failures a=backout
browser/base/content/abouthome/aboutHome.js
browser/base/content/test/general/browser.ini
browser/base/content/test/general/browser_aboutHome_wrapsCorrectly.js
--- a/browser/base/content/abouthome/aboutHome.js
+++ b/browser/base/content/abouthome/aboutHome.js
@@ -364,15 +364,15 @@ function showDefaultSnippets()
       links[0].href = DEFAULT_SNIPPETS_URLS[randIndex];
     }
   }
   // Move the default snippet to the snippets element.
   snippetsElt.appendChild(entry);
 }
 
 function fitToWidth() {
-  if (document.documentElement.scrollWidth > window.innerWidth) {
+  if (window.scrollMaxX != window.scrollMinX) {
     document.body.setAttribute("narrow", "true");
   } else if (document.body.hasAttribute("narrow")) {
     document.body.removeAttribute("narrow");
     fitToWidth();
   }
 }
--- a/browser/base/content/test/general/browser.ini
+++ b/browser/base/content/test/general/browser.ini
@@ -123,17 +123,16 @@ skip-if = os == "linux" # Bug 958026
 support-files =
   content_aboutAccounts.js
 [browser_aboutCertError.js]
 [browser_aboutSupport_newtab_security_state.js]
 [browser_aboutHealthReport.js]
 skip-if = os == "linux" # Bug 924307
 [browser_aboutHome.js]
 skip-if = e10s # Bug 1093153 - no about:home support yet
-[browser_aboutHome_wrapsCorrectly.js]
 [browser_action_keyword.js]
 [browser_action_keyword_override.js]
 [browser_action_searchengine.js]
 [browser_action_searchengine_alias.js]
 [browser_addKeywordSearch.js]
 [browser_search_favicon.js]
 skip-if = e10s # Bug 1212647
 [browser_alltabslistener.js]
deleted file mode 100644
--- a/browser/base/content/test/general/browser_aboutHome_wrapsCorrectly.js
+++ /dev/null
@@ -1,28 +0,0 @@
-add_task(function* () {
-  let newWindow = yield BrowserTestUtils.openNewBrowserWindow();
-
-  let resizedPromise = BrowserTestUtils.waitForEvent(newWindow, "resize");
-  newWindow.resizeTo(300, 300);
-  yield resizedPromise;
-
-  yield BrowserTestUtils.openNewForegroundTab(newWindow.gBrowser, "about:home");
-
-  yield ContentTask.spawn(newWindow.gBrowser.selectedBrowser, {}, function* () {
-    is(content.document.body.getAttribute("narrow"), "true", "narrow mode");
-  });
-
-  resizedPromise = BrowserTestUtils.waitForContentEvent(newWindow.gBrowser.selectedBrowser, "resize");
-
-
-  yield ContentTask.spawn(newWindow.gBrowser.selectedBrowser, {}, function* () {
-    content.window.resizeTo(800, 800);
-  });
-
-  yield resizedPromise;
-
-  yield ContentTask.spawn(newWindow.gBrowser.selectedBrowser, {}, function* () {
-    is(content.document.body.hasAttribute("narrow"), false, "non-narrow mode");
-  });
-
-  yield BrowserTestUtils.closeWindow(newWindow);
-});