diff options
| author | wolfbeast <mcwerewolf@gmail.com> | 2018-04-25 01:44:14 +0200 |
|---|---|---|
| committer | wolfbeast <mcwerewolf@gmail.com> | 2018-04-25 01:44:14 +0200 |
| commit | fe8155c118c4d536c048957156a1473a8595ab8d (patch) | |
| tree | bd7863368d6072ed3ac75126f80a09b11346c3c7 /layout/base/nsCSSFrameConstructor.cpp | |
| parent | fcfd61829a1edd8519e3965f201f575d70a84239 (diff) | |
| parent | a203f449bbc01f97564b7c5e2272b06a9569d7b4 (diff) | |
| download | UXP-fe8155c118c4d536c048957156a1473a8595ab8d.tar UXP-fe8155c118c4d536c048957156a1473a8595ab8d.tar.gz UXP-fe8155c118c4d536c048957156a1473a8595ab8d.tar.lz UXP-fe8155c118c4d536c048957156a1473a8595ab8d.tar.xz UXP-fe8155c118c4d536c048957156a1473a8595ab8d.zip | |
Merge branch 'master' of https://github.com/MoonchildProductions/UXP
Diffstat (limited to 'layout/base/nsCSSFrameConstructor.cpp')
| -rw-r--r-- | layout/base/nsCSSFrameConstructor.cpp | 15 |
1 files changed, 11 insertions, 4 deletions
diff --git a/layout/base/nsCSSFrameConstructor.cpp b/layout/base/nsCSSFrameConstructor.cpp index f8c7f52a9..767298b85 100644 --- a/layout/base/nsCSSFrameConstructor.cpp +++ b/layout/base/nsCSSFrameConstructor.cpp @@ -8246,11 +8246,19 @@ nsCSSFrameConstructor::ContentRemoved(nsIContent* aContainer, *aDestroyedFramesFor = aChild; } + nsPresContext* presContext = mPresShell->GetPresContext(); + MOZ_ASSERT(presContext, "Our presShell should have a valid presContext"); + if (aChild->IsHTMLElement(nsGkAtoms::body) || (!aContainer && aChild->IsElement())) { - // This might be the element we propagated viewport scrollbar - // styles from. Recompute those. - mPresShell->GetPresContext()->UpdateViewportScrollbarStylesOverride(); + // We might be removing the element that we propagated viewport scrollbar + // styles from. Recompute those. (This clause covers two of the three + // possible scrollbar-propagation sources: the <body> [as aChild or a + // descendant] and the root node. The other possible scrollbar-propagation + // source is a fullscreen element, and we have code elsewhere to update + // scrollbars after fullscreen elements are removed -- specifically, it's + // part of the fullscreen cleanup code called by Element::UnbindFromTree.) + presContext->UpdateViewportScrollbarStylesOverride(); } // XXXldb Do we need to re-resolve style to handle the CSS2 + combinator and @@ -8316,7 +8324,6 @@ nsCSSFrameConstructor::ContentRemoved(nsIContent* aContainer, ClearDisplayContentsIn(aChild, aContainer); } - nsPresContext* presContext = mPresShell->GetPresContext(); #ifdef MOZ_XUL if (NotifyListBoxBody(presContext, aContainer, aChild, aOldNextSibling, childFrame, CONTENT_REMOVED)) { |