From a64de8bf5fa269197930b30381f2f30b67a708de Mon Sep 17 00:00:00 2001
From: Mihai Alexandru Michis <malexandru@mozilla.com>
Date: Tue, 15 Sep 2020 07:22:29 +0300
Subject: [PATCH] Backed out 2 changesets (bug 1663562) for causing bustages in
 nsPresContext.cpp

CLOSED TREE

Backed out changeset 67cbb5422dbc (bug 1663562)
Backed out changeset 574709176152 (bug 1663562)
---
 dom/base/test/mochitest.ini              |  1 -
 layout/base/nsPresContext.cpp            | 15 +--------------
 modules/libpref/init/StaticPrefList.yaml |  6 ------
 3 files changed, 1 insertion(+), 21 deletions(-)

diff --git a/dom/base/test/mochitest.ini b/dom/base/test/mochitest.ini
index cdd2212b9465..e1aa0c9fd750 100644
--- a/dom/base/test/mochitest.ini
+++ b/dom/base/test/mochitest.ini
@@ -1,7 +1,6 @@
 [DEFAULT]
 prefs =
   plugin.load_flash_only=false
-  font.size.inflation.skipmaybereflowwithwebrender=true
 support-files =
   audio.ogg
   audioEndedDuringPlaying.webm
diff --git a/layout/base/nsPresContext.cpp b/layout/base/nsPresContext.cpp
index cec9746b301a..7da620c66334 100644
--- a/layout/base/nsPresContext.cpp
+++ b/layout/base/nsPresContext.cpp
@@ -269,13 +269,11 @@ static const char* gExactCallbackPrefs[] = {
     "nglayout.debug.paint_flashing",
     "nglayout.debug.paint_flashing_chrome",
     "intl.accept_languages",
-    "dom.meta-viewport.enabled",
     nullptr,
 };
 
 static const char* gPrefixCallbackPrefs[] = {
-    "font.", "browser.display.",    "browser.viewport.",
-    "bidi.", "gfx.font_rendering.", nullptr,
+    "font.", "browser.display.", "bidi.", "gfx.font_rendering.", nullptr,
 };
 
 void nsPresContext::Destroy() {
@@ -499,17 +497,6 @@ void nsPresContext::PreferenceChanged(const char* aPrefName) {
     }
     return;
   }
-
-  if (StringBeginsWith(prefName, "browser.viewport."_ns) ||
-      StringBeginsWith(prefName, "font.size.inflation."_ns) ||
-      prefName.EqualsLiteral("dom.meta-viewport.enabled")) {
-    if (mPresShell &&
-        (!gfxVars::UseWebRender() ||
-         !StaticPrefs::font_size_inflation_skipmaybereflowwithwebrender())) {
-      mPresShell->MaybeReflowForInflationScreenSizeChange();
-    }
-  }
-
   // Changing any of these potentially changes the value of @media
   // (prefers-contrast).
   if (prefName.EqualsLiteral("layout.css.prefers-contrast.enabled") ||
diff --git a/modules/libpref/init/StaticPrefList.yaml b/modules/libpref/init/StaticPrefList.yaml
index b6b8df824c30..71ccfff48bf3 100644
--- a/modules/libpref/init/StaticPrefList.yaml
+++ b/modules/libpref/init/StaticPrefList.yaml
@@ -3702,12 +3702,6 @@
   value: 0
   mirror: always
 
-# temporary pref to work around a problem (bug 1663562)
-- name: font.size.inflation.skipmaybereflowwithwebrender
-  type: RelaxedAtomicBool
-  value: false
-  mirror: always
-
 # This setting corresponds to a global text zoom setting affecting
 # all content that is not already subject to font size inflation.
 # It is interpreted as a percentage value that is applied on top