forked from mirrors/gecko-dev
da97c00bb1
Instead, sort stuff using CSSOrderAwareFrameIterator. The current sorting is broken in presence of dynamic insertions, consider the following <Child(order)> combination in the DOM: <A(1000)> <B(0)> That'd look like: <B(0)> <A(1000)> On the frame tree. However when appending a child before B so that the DOM looks like: <A(1000)> <C(0)> <B(0)> The frame constructor will properly insert after A, and the reordering, which is stable, will end up with: <B(0)> <C(0)> <A(1000)> Which is the wrong frame tree order. We only use -moz-box-ordinal-group in regular sprocket layout, so just handle it there rather than everywhere. Similarly, we only rely on it for in-flow stuff, so remove the test for that added in bug 877890 (flex changed behavior afterwards, interestingly enough). Differential Revision: https://phabricator.services.mozilla.com/D94790
88 lines
2.5 KiB
C++
88 lines
2.5 KiB
C++
/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
|
|
/* vim: set ts=8 sts=2 et sw=2 tw=80: */
|
|
/* This Source Code Form is subject to the terms of the Mozilla Public
|
|
* License, v. 2.0. If a copy of the MPL was not distributed with this
|
|
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
|
|
|
|
/* Iterator class for frame lists that respect CSS "order" during layout */
|
|
|
|
#include "CSSOrderAwareFrameIterator.h"
|
|
#include "nsIFrameInlines.h"
|
|
|
|
static bool CanUse(const nsIFrame* aFrame) {
|
|
return aFrame->IsFlexOrGridContainer() || aFrame->IsXULBoxFrame() ||
|
|
(aFrame->GetContent() &&
|
|
aFrame->GetContent()->IsXULElement(nsGkAtoms::treecols));
|
|
}
|
|
|
|
namespace mozilla {
|
|
|
|
template <>
|
|
bool CSSOrderAwareFrameIterator::CanUse(const nsIFrame* aFrame) {
|
|
return ::CanUse(aFrame);
|
|
}
|
|
|
|
template <>
|
|
bool ReverseCSSOrderAwareFrameIterator::CanUse(const nsIFrame* aFrame) {
|
|
return ::CanUse(aFrame);
|
|
}
|
|
|
|
template <>
|
|
int CSSOrderAwareFrameIterator::CSSOrderComparator(nsIFrame* const& a,
|
|
nsIFrame* const& b) {
|
|
return a->StylePosition()->mOrder - b->StylePosition()->mOrder;
|
|
}
|
|
|
|
template <>
|
|
int CSSOrderAwareFrameIterator::CSSBoxOrdinalGroupComparator(
|
|
nsIFrame* const& a, nsIFrame* const& b) {
|
|
return a->StyleXUL()->mBoxOrdinal - b->StyleXUL()->mBoxOrdinal;
|
|
}
|
|
|
|
template <>
|
|
bool CSSOrderAwareFrameIterator::IsForward() const {
|
|
return true;
|
|
}
|
|
|
|
template <>
|
|
nsFrameList::iterator CSSOrderAwareFrameIterator::begin(
|
|
const nsFrameList& aList) {
|
|
return aList.begin();
|
|
}
|
|
|
|
template <>
|
|
nsFrameList::iterator CSSOrderAwareFrameIterator::end(
|
|
const nsFrameList& aList) {
|
|
return aList.end();
|
|
}
|
|
|
|
template <>
|
|
int ReverseCSSOrderAwareFrameIterator::CSSOrderComparator(nsIFrame* const& a,
|
|
nsIFrame* const& b) {
|
|
return b->StylePosition()->mOrder - a->StylePosition()->mOrder;
|
|
}
|
|
|
|
template <>
|
|
int ReverseCSSOrderAwareFrameIterator::CSSBoxOrdinalGroupComparator(
|
|
nsIFrame* const& a, nsIFrame* const& b) {
|
|
return b->StyleXUL()->mBoxOrdinal - a->StyleXUL()->mBoxOrdinal;
|
|
}
|
|
|
|
template <>
|
|
bool ReverseCSSOrderAwareFrameIterator::IsForward() const {
|
|
return false;
|
|
}
|
|
|
|
template <>
|
|
nsFrameList::reverse_iterator ReverseCSSOrderAwareFrameIterator::begin(
|
|
const nsFrameList& aList) {
|
|
return aList.rbegin();
|
|
}
|
|
|
|
template <>
|
|
nsFrameList::reverse_iterator ReverseCSSOrderAwareFrameIterator::end(
|
|
const nsFrameList& aList) {
|
|
return aList.rend();
|
|
}
|
|
|
|
} // namespace mozilla
|