Bug 1587661 - Really minor cleanup to the scroll anchoring suppression code. r=dholbert

Should have no behavior change, just moving the code a bit together.

Differential Revision: https://phabricator.services.mozilla.com/D48792

--HG--
extra : moz-landing-system : lando
This commit is contained in:
Emilio Cobos Álvarez 2019-10-10 07:06:08 +00:00
Родитель 2df9cdb3b4
Коммит e485303264
1 изменённых файлов: 13 добавлений и 17 удалений

Просмотреть файл

@ -1237,28 +1237,24 @@ void nsFrame::DidSetComputedStyle(ComputedStyle* aOldComputedStyle) {
if (mInScrollAnchorChain) {
const nsStylePosition* oldPosition = aOldComputedStyle->StylePosition();
if (oldPosition->mOffset != StylePosition()->mOffset ||
oldPosition->mWidth != StylePosition()->mWidth ||
oldPosition->mMinWidth != StylePosition()->mMinWidth ||
oldPosition->mMaxWidth != StylePosition()->mMaxWidth ||
oldPosition->mHeight != StylePosition()->mHeight ||
oldPosition->mMinHeight != StylePosition()->mMinHeight ||
oldPosition->mMaxHeight != StylePosition()->mMaxHeight) {
if (!needAnchorSuppression &&
(oldPosition->mOffset != StylePosition()->mOffset ||
oldPosition->mWidth != StylePosition()->mWidth ||
oldPosition->mMinWidth != StylePosition()->mMinWidth ||
oldPosition->mMaxWidth != StylePosition()->mMaxWidth ||
oldPosition->mHeight != StylePosition()->mHeight ||
oldPosition->mMinHeight != StylePosition()->mMinHeight ||
oldPosition->mMaxHeight != StylePosition()->mMaxHeight ||
oldDisp->mPosition != StyleDisplay()->mPosition ||
oldDisp->mTransform != StyleDisplay()->mTransform)) {
needAnchorSuppression = true;
}
// TODO(emilio): Should this do something about other transform-like
// properties?
if (oldDisp->mPosition != StyleDisplay()->mPosition ||
oldDisp->mTransform != StyleDisplay()->mTransform) {
needAnchorSuppression = true;
if (needAnchorSuppression &&
StaticPrefs::layout_css_scroll_anchoring_suppressions_enabled()) {
ScrollAnchorContainer::FindFor(this)->SuppressAdjustments();
}
}
if (mInScrollAnchorChain && needAnchorSuppression &&
StaticPrefs::layout_css_scroll_anchoring_suppressions_enabled()) {
ScrollAnchorContainer::FindFor(this)->SuppressAdjustments();
}
}
imgIRequest* oldBorderImage =