Bug 1180120 - Part 3: Record on ElementRestyler whether we are at the root of a restyle. r=dbaron

This commit is contained in:
Cameron McCormack 2015-08-29 06:13:47 +10:00
Родитель 10bcb04d6f
Коммит bbf3e2feac
2 изменённых файлов: 6 добавлений и 0 удалений

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

@ -2520,6 +2520,7 @@ ElementRestyler::ElementRestyler(nsPresContext* aPresContext,
, mResolvedChild(nullptr)
, mContextsToClear(aContextsToClear)
, mSwappedStructOwners(aSwappedStructOwners)
, mIsRootOfRestyle(true)
#ifdef ACCESSIBILITY
, mDesiredA11yNotifications(eSendAllNotifications)
, mKidsDesiredA11yNotifications(mDesiredA11yNotifications)
@ -2553,6 +2554,7 @@ ElementRestyler::ElementRestyler(const ElementRestyler& aParentRestyler,
, mResolvedChild(nullptr)
, mContextsToClear(aParentRestyler.mContextsToClear)
, mSwappedStructOwners(aParentRestyler.mSwappedStructOwners)
, mIsRootOfRestyle(false)
#ifdef ACCESSIBILITY
, mDesiredA11yNotifications(aParentRestyler.mKidsDesiredA11yNotifications)
, mKidsDesiredA11yNotifications(mDesiredA11yNotifications)
@ -2600,6 +2602,7 @@ ElementRestyler::ElementRestyler(ParentContextFromChildFrame,
, mResolvedChild(nullptr)
, mContextsToClear(aParentRestyler.mContextsToClear)
, mSwappedStructOwners(aParentRestyler.mSwappedStructOwners)
, mIsRootOfRestyle(false)
#ifdef ACCESSIBILITY
, mDesiredA11yNotifications(aParentRestyler.mDesiredA11yNotifications)
, mKidsDesiredA11yNotifications(mDesiredA11yNotifications)
@ -2639,6 +2642,7 @@ ElementRestyler::ElementRestyler(nsPresContext* aPresContext,
, mResolvedChild(nullptr)
, mContextsToClear(aContextsToClear)
, mSwappedStructOwners(aSwappedStructOwners)
, mIsRootOfRestyle(true)
#ifdef ACCESSIBILITY
, mDesiredA11yNotifications(eSendAllNotifications)
, mKidsDesiredA11yNotifications(mDesiredA11yNotifications)

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

@ -770,6 +770,8 @@ private:
// stay alive until the end of the restyle. (See comment in
// ElementRestyler::Restyle.)
nsTArray<nsRefPtr<nsStyleContext>>& mSwappedStructOwners;
// Whether this is the root of the restyle.
bool mIsRootOfRestyle;
#ifdef ACCESSIBILITY
const DesiredA11yNotifications mDesiredA11yNotifications;