Bug 1451169 - Reduce indirection for static atom pointers in nsCSSFrameConstructor.h. r=xidorn

--HG--
extra : rebase_source : c0fc2365461d1fd9a7480911bce0bb66555ab7e1
This commit is contained in:
Nicholas Nethercote 2018-04-03 22:15:30 +10:00
Родитель 36c48819d1
Коммит 915b913107
2 изменённых файлов: 5 добавлений и 6 удалений

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

@ -396,7 +396,7 @@ GetFieldSetBlockFrame(nsIFrame* aFieldsetFrame)
{ _flags, { (FrameCreationFunc)_func }, nullptr, nullptr }
#define FCDATA_WITH_WRAPPING_BLOCK(_flags, _func, _anon_box) \
{ _flags | FCDATA_CREATE_BLOCK_WRAPPER_FOR_ALL_KIDS, \
{ (FrameCreationFunc)_func }, nullptr, &_anon_box }
{ (FrameCreationFunc)_func }, nullptr, _anon_box }
#define UNREACHABLE_FCDATA() \
{ 0, { (FrameCreationFunc)nullptr }, nullptr, nullptr }
@ -3838,8 +3838,7 @@ nsCSSFrameConstructor::ConstructFrameFromItemInternal(FrameConstructionItem& aIt
nsIFrame* possiblyLeafFrame = newFrame;
if (bits & FCDATA_CREATE_BLOCK_WRAPPER_FOR_ALL_KIDS) {
RefPtr<ComputedStyle> outerSC = mPresShell->StyleSet()->
ResolveInheritingAnonymousBoxStyle(*data->mAnonBoxPseudo,
computedStyle);
ResolveInheritingAnonymousBoxStyle(data->mAnonBoxPseudo, computedStyle);
#ifdef DEBUG
nsContainerFrame* containerFrame = do_QueryFrame(newFrame);
MOZ_ASSERT(containerFrame);

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

@ -742,7 +742,7 @@ private:
FrameFullConstructor mFullConstructor;
// For cases when FCDATA_CREATE_BLOCK_WRAPPER_FOR_ALL_KIDS is set, the
// anonymous box type to use for that wrapper.
nsICSSAnonBoxPseudo * const * const mAnonBoxPseudo;
nsICSSAnonBoxPseudo* const mAnonBoxPseudo;
};
/* Structure representing a mapping of an atom to a FrameConstructionData.
@ -752,7 +752,7 @@ private:
struct FrameConstructionDataByTag {
// Pointer to nsStaticAtom* is used because we want to initialize this
// statically, so before our atom tables are set up.
const nsStaticAtom * const * const mTag;
const nsStaticAtom* const* mTag;
const FrameConstructionData mData;
};
@ -783,7 +783,7 @@ private:
for a table pseudo-frame */
struct PseudoParentData {
const FrameConstructionData mFCData;
nsICSSAnonBoxPseudo * const * const mPseudoType;
nsICSSAnonBoxPseudo * const* mPseudoType;
};
/* Array of such structures that we use to properly construct table
pseudo-frames as needed */