From fae58348550cea0c483ef32a0d7866bb0a0deb5b Mon Sep 17 00:00:00 2001 From: Daniel Holbert Date: Thu, 13 Dec 2018 17:47:11 +0000 Subject: [PATCH] Bug 1510369 part 3: Add about:config pref 'layout.dynamic-reflow-roots.enabled' (enabled by default). r=dbaron Differential Revision: https://phabricator.services.mozilla.com/D13133 --HG-- extra : moz-landing-system : lando --- layout/generic/ReflowInput.cpp | 11 +++++++++-- modules/libpref/init/StaticPrefList.h | 7 +++++++ 2 files changed, 16 insertions(+), 2 deletions(-) diff --git a/layout/generic/ReflowInput.cpp b/layout/generic/ReflowInput.cpp index 564a628ba06a..e059ef0bad2e 100644 --- a/layout/generic/ReflowInput.cpp +++ b/layout/generic/ReflowInput.cpp @@ -806,8 +806,15 @@ static inline bool IsIntrinsicKeyword(const nsStyleCoord& aCoord) { } static bool AreDynamicReflowRootsEnabled() { - // XXXdholbert Implemented in next patch. - return true; + static bool sAreDynamicReflowRootsEnabled; + static bool sIsPrefCached = false; + + if (!sIsPrefCached) { + sIsPrefCached = true; + Preferences::AddBoolVarCache(&sAreDynamicReflowRootsEnabled, + "layout.dynamic-reflow-roots.enabled"); + } + return sAreDynamicReflowRootsEnabled; } void ReflowInput::InitDynamicReflowRoot() { diff --git a/modules/libpref/init/StaticPrefList.h b/modules/libpref/init/StaticPrefList.h index de86b2ad9a8a..aab8efed380f 100644 --- a/modules/libpref/init/StaticPrefList.h +++ b/modules/libpref/init/StaticPrefList.h @@ -860,6 +860,13 @@ VARCACHE_PREF( bool, true ) +// Are dynamic reflow roots enabled? +VARCACHE_PREF( + "layout.dynamic-reflow-roots.enabled", + layout_dynamic_reflow_roots_enabled, + bool, true +) + //--------------------------------------------------------------------------- // JavaScript prefs //---------------------------------------------------------------------------