Skip to content

Commit

Permalink
Backed out 2 changesets (bug 1663562) for causing bustages in nsPresC…
Browse files Browse the repository at this point in the history
…ontext.cpp

CLOSED TREE

Backed out changeset 67cbb5422dbc (bug 1663562)
Backed out changeset 574709176152 (bug 1663562)
  • Loading branch information
Mihai Alexandru Michis committed Sep 15, 2020
1 parent 147ca18 commit a64de8b
Show file tree
Hide file tree
Showing 3 changed files with 1 addition and 21 deletions.
1 change: 0 additions & 1 deletion dom/base/test/mochitest.ini
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
[DEFAULT]
prefs =
plugin.load_flash_only=false
font.size.inflation.skipmaybereflowwithwebrender=true
support-files =
audio.ogg
audioEndedDuringPlaying.webm
Expand Down
15 changes: 1 addition & 14 deletions layout/base/nsPresContext.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -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() {
Expand Down Expand Up @@ -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") ||
Expand Down
6 changes: 0 additions & 6 deletions modules/libpref/init/StaticPrefList.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down

0 comments on commit a64de8b

Please sign in to comment.