commit 51708fb1315d
Author: Emilio Cobos Álvarez <emilio@crisal.io>
Date: Wed Nov 1 11:24:17 2017 +0100
Bug 1413143: Make font inflation computation less lazy. r=bz,JanH
This makes it a bit more straight-forward to change the system font scale,
preserving the sync MediaFeatureChanged event.
This also avoids notifying media queries when the shell is not initialized.
In particular, the patch in bug 1404545 allows calling MediaFeatureValuesChanged
on a still-initializing pres-shell. This is nasty, and all this initialization
order is kind of a mess, but I'm not reworking it for now...
Also, this drops the invalidation of font-inflation when a doctype is added to
the document. GetViewportInfo() already relies on the doctype not changing, as
noted in a comment.
MozReview-Commit-ID: Knw7dM1B04Y
---
dom/base/nsDocument.cpp | 2 +
layout/base/PresShell.cpp | 84 ++++++++++++++-------------------------
layout/base/nsIPresShell.h | 36 ++++-------------
layout/base/nsLayoutUtils.cpp | 8 ++--
layout/base/nsPresContext.cpp | 6 ++-
layout/reftests/bugs/reftest.list | 2 +-
6 files changed, 48 insertions(+), 90 deletions(-)
diff --git dom/base/nsDocument.cpp dom/base/nsDocument.cpp
index 03bf17e6a4b9..f3579c9420d6 100644
--- dom/base/nsDocument.cpp
+++ dom/base/nsDocument.cpp
@@ -8172,6 +8172,8 @@ nsIDocument::AdoptNode(nsINode& aAdoptedNode, ErrorResult& rv)
nsViewportInfo
nsDocument::GetViewportInfo(const ScreenIntSize& aDisplaySize)
{
+ MOZ_ASSERT(mPresShell);
+
// Compute the CSS-to-LayoutDevice pixel scale as the product of the
// widget scale and the full zoom.
nsPresContext* context = mPresShell->GetPresContext();
diff --git layout/base/PresShell.cpp layout/base/PresShell.cpp
index 6983d2d3c894..a883791d3695 100644
--- layout/base/PresShell.cpp
+++ layout/base/PresShell.cpp
@@ -765,7 +765,6 @@ nsIPresShell::nsIPresShell()
, mFontSizeInflationForceEnabled(false)
, mFontSizeInflationDisabledInMasterProcess(false)
, mFontSizeInflationEnabled(false)
- , mFontSizeInflationEnabledIsDirty(false)
, mPaintingIsFrozen(false)
, mIsNeverPainting(false)
, mInFlush(false)
@@ -1010,7 +1009,13 @@ PresShell::Init(nsIDocument* aDocument,
QueryIsActive();
// Setup our font inflation preferences.
- SetupFontInflation();
+ mFontSizeInflationEmPerLine = nsLayoutUtils::FontSizeInflationEmPerLine();
+ mFontSizeInflationMinTwips = nsLayoutUtils::FontSizeInflationMinTwips();
+ mFontSizeInflationLineThreshold = nsLayoutUtils::FontSizeInflationLineThreshold();
+ mFontSizeInflationForceEnabled = nsLayoutUtils::FontSizeInflationForceEnabled();
+ mFontSizeInflationDisabledInMasterProcess = nsLayoutUtils::FontSizeInflationDisabledInMasterProcess();
+ // We'll compute the font size inflation state in Initialize(), when we know
+ // the document type.
mTouchManager.Init(this, mDocument);
@@ -1700,6 +1705,10 @@ PresShell::Initialize(nscoord aWidth, nscoord aHeight)
NS_ASSERTION(!mDidInitialize, "Why are we being called?");
nsCOMPtr<nsIPresShell> kungFuDeathGrip(this);
+
+ RecomputeFontSizeInflationEnabled();
+ MOZ_DIAGNOSTIC_ASSERT(!mIsDestroying);
+
mDidInitialize = true;
#ifdef DEBUG
@@ -1725,6 +1734,7 @@ PresShell::Initialize(nscoord aWidth, nscoord aHeight)
// time we do this!
nsIFrame* rootFrame = mFrameConstructor->GetRootFrame();
NS_ASSERTION(!rootFrame, "How did that happen, exactly?");
+
if (!rootFrame) {
nsAutoScriptBlocker scriptBlocker;
mFrameConstructor->BeginUpdate();
@@ -4456,11 +4466,6 @@ PresShell::ContentInserted(nsIDocument* aDocument,
nullptr,
nsCSSFrameConstructor::InsertionKind::Async);
- if (aChild->NodeType() == nsIDOMNode::DOCUMENT_TYPE_NODE) {
- MOZ_ASSERT(container == aDocument);
- NotifyFontSizeInflationEnabledIsDirty();
- }
-
VERIFY_STYLE_TREE;
}
@@ -4505,11 +4510,6 @@ PresShell::ContentRemoved(nsIDocument *aDocument,
mFrameConstructor->ContentRemoved(aMaybeContainer, aChild, oldNextSibling,
nsCSSFrameConstructor::REMOVE_CONTENT);
- if (aChild->NodeType() == nsIDOMNode::DOCUMENT_TYPE_NODE) {
- MOZ_ASSERT(container == aDocument);
- NotifyFontSizeInflationEnabledIsDirty();
- }
-
VERIFY_STYLE_TREE;
}
@@ -10701,33 +10701,34 @@ nsIPresShell::SetScrollPositionClampingScrollPortSize(nscoord aWidth, nscoord aH
}
}
-void
-PresShell::SetupFontInflation()
-{
- mFontSizeInflationEmPerLine = nsLayoutUtils::FontSizeInflationEmPerLine();
- mFontSizeInflationMinTwips = nsLayoutUtils::FontSizeInflationMinTwips();
- mFontSizeInflationLineThreshold = nsLayoutUtils::FontSizeInflationLineThreshold();
- mFontSizeInflationForceEnabled = nsLayoutUtils::FontSizeInflationForceEnabled();
- mFontSizeInflationDisabledInMasterProcess = nsLayoutUtils::FontSizeInflationDisabledInMasterProcess();
-
- NotifyFontSizeInflationEnabledIsDirty();
-}
-
void
nsIPresShell::RecomputeFontSizeInflationEnabled()
{
- mFontSizeInflationEnabledIsDirty = false;
mFontSizeInflationEnabled = DetermineFontSizeInflationState();
- HandleSystemFontScale();
+ float fontScale = nsLayoutUtils::SystemFontScale();
+ if (fontScale == 0.0f) {
+ return;
+ }
+
+ MOZ_ASSERT(mDocument);
+ MOZ_ASSERT(mPresContext);
+ if (mFontSizeInflationEnabled || mDocument->IsSyntheticDocument()) {
+ mPresContext->SetSystemFontScale(1.0f);
+ } else {
+ mPresContext->SetSystemFontScale(fontScale);
+ }
}
bool
nsIPresShell::DetermineFontSizeInflationState()
{
MOZ_ASSERT(mPresContext, "our pres context should not be null");
- if ((FontSizeInflationEmPerLine() == 0 &&
- FontSizeInflationMinTwips() == 0) || mPresContext->IsChrome()) {
+ if (mPresContext->IsChrome()) {
+ return false;
+ }
+
+ if (FontSizeInflationEmPerLine() == 0 && FontSizeInflationMinTwips() == 0) {
return false;
}
@@ -10788,33 +10789,6 @@ nsIPresShell::DetermineFontSizeInflationState()
return true;
}
-bool
-nsIPresShell::FontSizeInflationEnabled()
-{
- if (mFontSizeInflationEnabledIsDirty) {
- RecomputeFontSizeInflationEnabled();
- }
-
- return mFontSizeInflationEnabled;
-}
-
-void
-nsIPresShell::HandleSystemFontScale()
-{
- float fontScale = nsLayoutUtils::SystemFontScale();
- if (fontScale == 0.0f) {
- return;
- }
-
- MOZ_ASSERT(mDocument && mPresContext, "our document and pres context should not be null");
-
- if (!mFontSizeInflationEnabled && !mDocument->IsSyntheticDocument()) {
- mPresContext->SetSystemFontScale(fontScale);
- } else {
- mPresContext->SetSystemFontScale(1.0f);
- }
-}
-
void
PresShell::PausePainting()
{
diff --git layout/base/nsIPresShell.h layout/base/nsIPresShell.h
index 32f4855347d5..3f6be216a60c 100644
--- layout/base/nsIPresShell.h
+++ layout/base/nsIPresShell.h
@@ -1507,24 +1507,14 @@ public:
return mFontSizeInflationDisabledInMasterProcess;
}
- /**
- * Determine if font size inflation is enabled. This value is cached until
- * it becomes dirty.
- *
- * @returns true, if font size inflation is enabled; false otherwise.
- */
- bool FontSizeInflationEnabled();
+ bool FontSizeInflationEnabled() const {
+ return mFontSizeInflationEnabled;
+ }
/**
- * Notify the pres shell that an event occurred making the current value of
- * mFontSizeInflationEnabled invalid. This will schedule a recomputation of
- * whether font size inflation is enabled on the next call to
- * FontSizeInflationEnabled().
+ * Recomputes whether font-size inflation is enabled.
*/
- void NotifyFontSizeInflationEnabledIsDirty()
- {
- mFontSizeInflationEnabledIsDirty = true;
- }
+ void RecomputeFontSizeInflationEnabled();
/**
* Return true if the most recent interruptible reflow was interrupted.
@@ -1590,23 +1580,11 @@ protected:
void DoObserveLayoutFlushes();
/**
- * Do computations necessary to determine if font size inflation is enabled.
- * This value is cached after computation, as the computation is somewhat
- * expensive.
- */
- void RecomputeFontSizeInflationEnabled();
-
- /**
- * Does the actual work of figuring out the current state of font size inflation.
+ * Does the actual work of figuring out the current state of font size
+ * inflation.
*/
bool DetermineFontSizeInflationState();
- /**
- * Apply the system font scale from the corresponding pref to the PresContext,
- * taking into account the current state of font size inflation.
- */
- void HandleSystemFontScale();
-
void RecordAlloc(void* aPtr) {
#ifdef DEBUG
MOZ_ASSERT(!mAllocatedPointers.Contains(aPtr));
diff --git layout/base/nsLayoutUtils.cpp layout/base/nsLayoutUtils.cpp
index e1289fd4a6a6..e165588e9c6c 100644
--- layout/base/nsLayoutUtils.cpp
+++ layout/base/nsLayoutUtils.cpp
@@ -9130,16 +9130,16 @@ MaybeReflowForInflationScreenSizeChange(nsPresContext *aPresContext)
{
if (aPresContext) {
nsIPresShell* presShell = aPresContext->GetPresShell();
- bool fontInflationWasEnabled = presShell->FontSizeInflationEnabled();
- presShell->NotifyFontSizeInflationEnabledIsDirty();
+ const bool fontInflationWasEnabled = presShell->FontSizeInflationEnabled();
+ presShell->RecomputeFontSizeInflationEnabled();
bool changed = false;
- if (presShell && presShell->FontSizeInflationEnabled() &&
+ if (presShell->FontSizeInflationEnabled() &&
presShell->FontSizeInflationMinTwips() != 0) {
aPresContext->ScreenSizeInchesForFontInflation(&changed);
}
changed = changed ||
- (fontInflationWasEnabled != presShell->FontSizeInflationEnabled());
+ fontInflationWasEnabled != presShell->FontSizeInflationEnabled();
if (changed) {
nsCOMPtr<nsIDocShell> docShell = aPresContext->GetDocShell();
if (docShell) {
diff --git layout/base/nsPresContext.cpp layout/base/nsPresContext.cpp
index 2fadaf78a29f..1ce0b492673d 100644
--- layout/base/nsPresContext.cpp
+++ layout/base/nsPresContext.cpp
@@ -2123,6 +2123,10 @@ nsPresContext::MediaFeatureValuesChanged(nsRestyleHint aRestyleHint,
mPendingViewportChange = false;
+ if (!mShell || !mShell->DidInitialize()) {
+ return;
+ }
+
if (mDocument->IsBeingUsedAsImage()) {
MOZ_ASSERT(mDocument->MediaQueryLists().isEmpty());
return;
@@ -2130,7 +2134,7 @@ nsPresContext::MediaFeatureValuesChanged(nsRestyleHint aRestyleHint,
mDocument->NotifyMediaFeatureValuesChanged();
- MOZ_ASSERT(nsContentUtils::IsSafeToRunScript());
+ MOZ_DIAGNOSTIC_ASSERT(nsContentUtils::IsSafeToRunScript());
// Media query list listeners should be notified from a queued task
// (in HTML5 terms), although we also want to notify them on certain
