Backed out changeset b7531c106b59 (bug 1480934) for failing android at mobile/android/tests/browser/chrome/test_session_scroll_position.html on a CLOSED TREE
authorAndreea Pavel <apavel@mozilla.com>
Tue, 14 Aug 2018 08:22:04 +0300
changeset 486411 3e66cf1dad95c1594448d82bcac82711f8ba155e
parent 486410 b7531c106b5947faf3edd8a951003d406c6a54dd
child 486450 914b3b370ad059a04ad751642b74e013f8e3ad08
child 486452 b1dea6a1cd1135bca0180100f98ce713670d6e0a
push id9719
push userffxbld-merge
push dateFri, 24 Aug 2018 17:49:46 +0000
treeherdermozilla-beta@719ec98fba77 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
bugs1480934
milestone63.0a1
backs outb7531c106b5947faf3edd8a951003d406c6a54dd
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
Backed out changeset b7531c106b59 (bug 1480934) for failing android at mobile/android/tests/browser/chrome/test_session_scroll_position.html on a CLOSED TREE
toolkit/components/reader/AboutReader.jsm
toolkit/themes/shared/aboutReader.css
--- a/toolkit/components/reader/AboutReader.jsm
+++ b/toolkit/components/reader/AboutReader.jsm
@@ -777,18 +777,18 @@ AboutReader.prototype = {
     }
 
     return PluralForm.get(slowEstimate, gStrings.GetStringFromName(displayStringKey))
       .replace("#1", fastEstimate)
       .replace("#2", slowEstimate);
   },
 
   _showError() {
-    this._headerElement.classList.remove("reader-show-element");
-    this._contentElement.classList.remove("reader-show-element");
+    this._headerElement.style.display = "none";
+    this._contentElement.style.display = "none";
 
     let errorMessage = gStrings.GetStringFromName("aboutReader.loadError");
     this._messageElement.textContent = errorMessage;
     this._messageElement.style.display = "block";
 
     this._doc.title = errorMessage;
 
     this._doc.documentElement.dataset.isError = true;
@@ -812,73 +812,73 @@ AboutReader.prototype = {
       start = 2;
     else if (host.startsWith("mobile."))
       start = 7;
 
     return host.substring(start);
   },
 
   _showContent(article) {
-    this._messageElement.classList.remove("reader-show-element");
+    this._messageElement.style.display = "none";
 
     this._article = article;
 
     this._domainElement.href = article.url;
     let articleUri = Services.io.newURI(article.url);
     this._domainElement.textContent = this._stripHost(articleUri.host);
     this._creditsElement.textContent = article.byline;
 
     this._titleElement.textContent = article.title;
     this._readTimeElement.textContent = this._formatReadTime(article.readingTimeMinsSlow, article.readingTimeMinsFast);
     this._doc.title = article.title;
 
-    this._headerElement.classList.add("reader-show-element");
+    this._headerElement.style.display = "block";
 
     let parserUtils = Cc["@mozilla.org/parserutils;1"].getService(Ci.nsIParserUtils);
     let contentFragment = parserUtils.parseFragment(article.content,
       Ci.nsIParserUtils.SanitizerDropForms | Ci.nsIParserUtils.SanitizerAllowStyle,
       false, articleUri, this._contentElement);
     this._contentElement.innerHTML = "";
     this._contentElement.appendChild(contentFragment);
     this._maybeSetTextDirection(article);
     this._foundLanguage(article.language);
 
-    this._contentElement.classList.add("reader-show-element");
+    this._contentElement.style.display = "block";
     this._updateImageMargins();
 
     this._requestFavicon();
     this._doc.body.classList.add("loaded");
 
     this._goToReference(articleUri.ref);
 
     Services.obs.notifyObservers(this._win, "AboutReader:Ready");
 
     this._doc.dispatchEvent(
       new this._win.CustomEvent("AboutReaderContentReady", { bubbles: true, cancelable: false }));
   },
 
   _hideContent() {
-    this._headerElement.classList.remove("reader-show-element");
-    this._contentElement.classList.remove("reader-show-element");
+    this._headerElement.style.display = "none";
+    this._contentElement.style.display = "none";
   },
 
   _showProgressDelayed() {
     this._win.setTimeout(() => {
       // No need to show progress if the article has been loaded,
       // if the window has been unloaded, or if there was an error
       // trying to load the article.
       if (this._article || this._windowUnloaded || this._error) {
         return;
       }
 
-      this._headerElement.classList.remove("reader-show-element");
-      this._contentElement.classList.remove("reader-show-element");
+      this._headerElement.style.display = "none";
+      this._contentElement.style.display = "none";
 
       this._messageElement.textContent = gStrings.GetStringFromName("aboutReader.loading2");
-      this._messageElement.classList.add("reader-show-element");
+      this._messageElement.style.display = "block";
     }, 300);
   },
 
   /**
    * Returns the original article URL for this about:reader view.
    */
   _getOriginalUrl(win) {
     let url = win ? win.location.href : this._win.location.href;
--- a/toolkit/themes/shared/aboutReader.css
+++ b/toolkit/themes/shared/aboutReader.css
@@ -756,12 +756,8 @@ body:not(.loaded) .toolbar:-moz-locale-d
 .moz-reader-content img.emoji {
   display: inline-block;
   border-width: 0;
   /* height: auto is implied from `.moz-reader-content *` rule. */
   width: 1em;
   margin: 0 .07em;
   padding: 0;
 }
-
-.reader-show-element {
-  display: initial;
-}