From 57773cd69ed44ea20c8713863aec4a11840124b3 Mon Sep 17 00:00:00 2001 From: Wes Kocher Date: Tue, 16 Aug 2016 11:22:04 -0700 Subject: [PATCH] Backed out 4 changesets (bug 1295192) for being a possible cause of crashtest assertions CLOSED TREE Backed out changeset 7f10779fe019 (bug 1295192) Backed out changeset e683dce4197a (bug 1295192) Backed out changeset 67d12eaa8074 (bug 1295192) Backed out changeset 44f143a01f78 (bug 1295192) --- layout/base/nsDisplayList.cpp | 8 +-- layout/base/nsDisplayList.h | 4 +- layout/generic/nsFrameList.cpp | 2 +- layout/generic/nsFrameList.h | 2 +- layout/generic/nsLineBox.cpp | 2 +- layout/generic/nsLineBox.h | 2 +- layout/style/CounterStyleManager.cpp | 4 +- layout/style/nsCSSRuleProcessor.cpp | 15 ++--- layout/style/nsHTMLStyleSheet.cpp | 3 +- layout/style/nsRuleNode.cpp | 5 +- layout/style/nsRuleNode.h | 10 +-- layout/style/nsStyleContext.cpp | 2 +- layout/style/nsStyleContext.h | 2 +- layout/style/nsStyleStruct.h | 96 ++++++++++++++-------------- 14 files changed, 76 insertions(+), 81 deletions(-) diff --git a/layout/base/nsDisplayList.cpp b/layout/base/nsDisplayList.cpp index 699a4212d363c7..5392998d19a7c9 100644 --- a/layout/base/nsDisplayList.cpp +++ b/layout/base/nsDisplayList.cpp @@ -57,7 +57,6 @@ #include "mozilla/EffectCompositor.h" #include "mozilla/EventStates.h" #include "mozilla/LookAndFeel.h" -#include "mozilla/OperatorNewExtensions.h" #include "mozilla/PendingAnimationTracker.h" #include "mozilla/Preferences.h" #include "mozilla/UniquePtr.h" @@ -110,7 +109,7 @@ SpammyLayoutWarningsEnabled() #endif void* -AnimatedGeometryRoot::operator new(size_t aSize, nsDisplayListBuilder* aBuilder) +AnimatedGeometryRoot::operator new(size_t aSize, nsDisplayListBuilder* aBuilder) CPP_THROW_NEW { return aBuilder->Allocate(aSize); } @@ -1109,7 +1108,7 @@ nsDisplayListBuilder::AllocateDisplayItemClip(const DisplayItemClip& aOriginal) return static_cast(p); } - DisplayItemClip* c = new (KnownNotNull, p) DisplayItemClip(aOriginal); + DisplayItemClip* c = new (p) DisplayItemClip(aOriginal); mDisplayItemClipsToDestroy.AppendElement(c); return c; } @@ -1122,8 +1121,7 @@ nsDisplayListBuilder::AllocateDisplayItemScrollClip(const DisplayItemScrollClip* { void* p = Allocate(sizeof(DisplayItemScrollClip)); DisplayItemScrollClip* c = - new (KnownNotNull, p) DisplayItemScrollClip(aParent, aScrollableFrame, - aClip, aIsAsyncScrollable); + new (p) DisplayItemScrollClip(aParent, aScrollableFrame, aClip, aIsAsyncScrollable); mScrollClipsToDestroy.AppendElement(c); return c; } diff --git a/layout/base/nsDisplayList.h b/layout/base/nsDisplayList.h index f971be06ea68de..259d5efb45c7da 100644 --- a/layout/base/nsDisplayList.h +++ b/layout/base/nsDisplayList.h @@ -144,7 +144,7 @@ struct AnimatedGeometryRoot nsIFrame* operator ->() const { return mFrame; } void* operator new(size_t aSize, - nsDisplayListBuilder* aBuilder); + nsDisplayListBuilder* aBuilder) CPP_THROW_NEW; nsIFrame* mFrame; AnimatedGeometryRoot* mParentAGR; @@ -1357,7 +1357,7 @@ class nsDisplayItem : public nsDisplayItemLink { virtual ~nsDisplayItem() {} void* operator new(size_t aSize, - nsDisplayListBuilder* aBuilder) { + nsDisplayListBuilder* aBuilder) CPP_THROW_NEW { return aBuilder->Allocate(aSize); } diff --git a/layout/generic/nsFrameList.cpp b/layout/generic/nsFrameList.cpp index 2981ee4ec615ab..61c30624268ac4 100644 --- a/layout/generic/nsFrameList.cpp +++ b/layout/generic/nsFrameList.cpp @@ -25,7 +25,7 @@ const AlignedFrameListBytes gEmptyFrameListBytes = { 0 }; } // namespace mozilla void* -nsFrameList::operator new(size_t sz, nsIPresShell* aPresShell) +nsFrameList::operator new(size_t sz, nsIPresShell* aPresShell) CPP_THROW_NEW { return aPresShell->AllocateByObjectID(eArenaObjectID_nsFrameList, sz); } diff --git a/layout/generic/nsFrameList.h b/layout/generic/nsFrameList.h index 7ee45a1ee1a2fe..98dc009255cbe0 100644 --- a/layout/generic/nsFrameList.h +++ b/layout/generic/nsFrameList.h @@ -76,7 +76,7 @@ class nsFrameList { /** * Infallibly allocate a nsFrameList from the shell arena. */ - void* operator new(size_t sz, nsIPresShell* aPresShell); + void* operator new(size_t sz, nsIPresShell* aPresShell) CPP_THROW_NEW; /** * Deallocate this list that was allocated from the shell arena. diff --git a/layout/generic/nsLineBox.cpp b/layout/generic/nsLineBox.cpp index bf01b0b9161ce5..9d29eaf722ad56 100644 --- a/layout/generic/nsLineBox.cpp +++ b/layout/generic/nsLineBox.cpp @@ -147,7 +147,7 @@ nsLineBox::NoteFramesMovedFrom(nsLineBox* aFromLine) } void* -nsLineBox::operator new(size_t sz, nsIPresShell* aPresShell) +nsLineBox::operator new(size_t sz, nsIPresShell* aPresShell) CPP_THROW_NEW { return aPresShell->AllocateByObjectID(eArenaObjectID_nsLineBox, sz); } diff --git a/layout/generic/nsLineBox.h b/layout/generic/nsLineBox.h index f0f645315338d6..5c278978b7c397 100644 --- a/layout/generic/nsLineBox.h +++ b/layout/generic/nsLineBox.h @@ -208,7 +208,7 @@ class nsLineBox final : public nsLineLink { // Infallible overloaded new operator. Uses an arena (which comes from the // presShell) to perform the allocation. - void* operator new(size_t sz, nsIPresShell* aPresShell); + void* operator new(size_t sz, nsIPresShell* aPresShell) CPP_THROW_NEW; void operator delete(void* aPtr, size_t sz) = delete; public: diff --git a/layout/style/CounterStyleManager.cpp b/layout/style/CounterStyleManager.cpp index 8d18fa2c2ce051..d04e42a37c490a 100644 --- a/layout/style/CounterStyleManager.cpp +++ b/layout/style/CounterStyleManager.cpp @@ -980,7 +980,7 @@ class DependentBuiltinCounterStyle final : public BuiltinCounterStyle NS_IMETHOD_(MozExternalRefCountType) AddRef() override; NS_IMETHOD_(MozExternalRefCountType) Release() override; - void* operator new(size_t sz, nsPresContext* aPresContext) + void* operator new(size_t sz, nsPresContext* aPresContext) CPP_THROW_NEW { return aPresContext->PresShell()->AllocateByObjectID( eArenaObjectID_DependentBuiltinCounterStyle, sz); @@ -1101,7 +1101,7 @@ class CustomCounterStyle final : public CounterStyle NS_IMETHOD_(MozExternalRefCountType) AddRef() override; NS_IMETHOD_(MozExternalRefCountType) Release() override; - void* operator new(size_t sz, nsPresContext* aPresContext) + void* operator new(size_t sz, nsPresContext* aPresContext) CPP_THROW_NEW { return aPresContext->PresShell()->AllocateByObjectID( eArenaObjectID_CustomCounterStyle, sz); diff --git a/layout/style/nsCSSRuleProcessor.cpp b/layout/style/nsCSSRuleProcessor.cpp index dbaa3f09a16cfe..bd39ca138965a6 100644 --- a/layout/style/nsCSSRuleProcessor.cpp +++ b/layout/style/nsCSSRuleProcessor.cpp @@ -54,7 +54,6 @@ #include "mozilla/Preferences.h" #include "mozilla/LookAndFeel.h" #include "mozilla/Likely.h" -#include "mozilla/OperatorNewExtensions.h" #include "mozilla/TypedEnumBits.h" #include "RuleProcessorCache.h" #include "nsIDOMMutationEvent.h" @@ -261,7 +260,7 @@ static void RuleHash_InitEntry(PLDHashEntryHdr *hdr, const void *key) { RuleHashTableEntry* entry = static_cast(hdr); - new (KnownNotNull, entry) RuleHashTableEntry(); + new (entry) RuleHashTableEntry(); } static void @@ -279,7 +278,7 @@ RuleHash_MoveEntry(PLDHashTable *table, const PLDHashEntryHdr *from, RuleHashTableEntry *oldEntry = const_cast( static_cast(from)); - RuleHashTableEntry *newEntry = new (KnownNotNull, to) RuleHashTableEntry(); + RuleHashTableEntry *newEntry = new (to) RuleHashTableEntry(); newEntry->mRules.SwapElements(oldEntry->mRules); oldEntry->~RuleHashTableEntry(); } @@ -297,7 +296,7 @@ static void RuleHash_TagTable_InitEntry(PLDHashEntryHdr *hdr, const void *key) { RuleHashTagTableEntry* entry = static_cast(hdr); - new (KnownNotNull, entry) RuleHashTagTableEntry(); + new (entry) RuleHashTagTableEntry(); entry->mTag = const_cast(static_cast(key)); } @@ -316,7 +315,7 @@ RuleHash_TagTable_MoveEntry(PLDHashTable *table, const PLDHashEntryHdr *from, RuleHashTagTableEntry *oldEntry = const_cast( static_cast(from)); - RuleHashTagTableEntry *newEntry = new (KnownNotNull, to) RuleHashTagTableEntry(); + RuleHashTagTableEntry *newEntry = new (to) RuleHashTagTableEntry(); newEntry->mTag.swap(oldEntry->mTag); newEntry->mRules.SwapElements(oldEntry->mRules); oldEntry->~RuleHashTagTableEntry(); @@ -795,7 +794,7 @@ static void AtomSelector_InitEntry(PLDHashEntryHdr *hdr, const void *key) { AtomSelectorEntry *entry = static_cast(hdr); - new (KnownNotNull, entry) AtomSelectorEntry(); + new (entry) AtomSelectorEntry(); entry->mAtom = const_cast(static_cast(key)); } @@ -806,7 +805,7 @@ AtomSelector_MoveEntry(PLDHashTable *table, const PLDHashEntryHdr *from, NS_PRECONDITION(from != to, "This is not going to work!"); AtomSelectorEntry *oldEntry = const_cast(static_cast(from)); - AtomSelectorEntry *newEntry = new (KnownNotNull, to) AtomSelectorEntry(); + AtomSelectorEntry *newEntry = new (to) AtomSelectorEntry(); newEntry->mAtom = oldEntry->mAtom; newEntry->mSelectors.SwapElements(oldEntry->mSelectors); oldEntry->~AtomSelectorEntry(); @@ -3481,7 +3480,7 @@ static void InitWeightEntry(PLDHashEntryHdr *hdr, const void *key) { RuleByWeightEntry* entry = static_cast(hdr); - new (KnownNotNull, entry) RuleByWeightEntry(); + new (entry) RuleByWeightEntry(); } static const PLDHashTableOps gRulesByWeightOps = { diff --git a/layout/style/nsHTMLStyleSheet.cpp b/layout/style/nsHTMLStyleSheet.cpp index d992ec9bc2451d..25f7d322467330 100644 --- a/layout/style/nsHTMLStyleSheet.cpp +++ b/layout/style/nsHTMLStyleSheet.cpp @@ -33,7 +33,6 @@ #include "mozilla/MemoryReporting.h" #include "mozilla/dom/Element.h" #include "nsHashKeys.h" -#include "mozilla/OperatorNewExtensions.h" #include "mozilla/RestyleManagerHandle.h" #include "mozilla/RestyleManagerHandleInlines.h" @@ -237,7 +236,7 @@ LangRuleTable_InitEntry(PLDHashEntryHdr *hdr, const void *key) { const nsString *lang = static_cast(key); - LangRuleTableEntry *entry = new (KnownNotNull, hdr) LangRuleTableEntry(); + LangRuleTableEntry *entry = new (hdr) LangRuleTableEntry(); // Create the unique rule for this language entry->mRule = new nsHTMLStyleSheet::LangRule(*lang); diff --git a/layout/style/nsRuleNode.cpp b/layout/style/nsRuleNode.cpp index bcc4c8d398931b..c9ac383b31335d 100644 --- a/layout/style/nsRuleNode.cpp +++ b/layout/style/nsRuleNode.cpp @@ -18,7 +18,6 @@ #include "mozilla/dom/AnimationEffectReadOnlyBinding.h" // for PlaybackDirection #include "mozilla/Likely.h" #include "mozilla/LookAndFeel.h" -#include "mozilla/OperatorNewExtensions.h" #include "mozilla/unused.h" #include "mozilla/css/Declaration.h" @@ -1521,7 +1520,7 @@ SetFactor(const nsCSSValue& aValue, float& aField, RuleNodeCacheConditions& aCon } void* -nsRuleNode::operator new(size_t sz, nsPresContext* aPresContext) +nsRuleNode::operator new(size_t sz, nsPresContext* aPresContext) CPP_THROW_NEW { // Check the recycle list first. return aPresContext->PresShell()->AllocateByObjectID(eArenaObjectID_nsRuleNode, sz); @@ -2236,7 +2235,7 @@ struct AutoCSSValueArray { // for the count (on Windows!). mArray = static_cast(aStorage); for (size_t i = 0; i < mCount; ++i) { - new (KnownNotNull, mArray + i) nsCSSValue(); + new (mArray + i) nsCSSValue(); } } diff --git a/layout/style/nsRuleNode.h b/layout/style/nsRuleNode.h index dde5bfe0c41f8a..9e7cc7022e85cf 100644 --- a/layout/style/nsRuleNode.h +++ b/layout/style/nsRuleNode.h @@ -36,7 +36,7 @@ struct nsInheritedStyleData nsStyleStructID_Inherited_Start, nsStyleStructID_Inherited_Count> mStyleStructs; - void* operator new(size_t sz, nsPresContext* aContext) { + void* operator new(size_t sz, nsPresContext* aContext) CPP_THROW_NEW { return aContext->PresShell()-> AllocateByObjectID(mozilla::eArenaObjectID_nsInheritedStyleData, sz); } @@ -84,7 +84,7 @@ struct nsResetStyleData } } - void* operator new(size_t sz, nsPresContext* aContext) { + void* operator new(size_t sz, nsPresContext* aContext) CPP_THROW_NEW { return aContext->PresShell()-> AllocateByObjectID(mozilla::eArenaObjectID_nsResetStyleData, sz); } @@ -119,7 +119,7 @@ struct nsConditionalResetStyleData Entry* aNext) : mConditions(aConditions), mStyleStruct(aStyleStruct), mNext(aNext) {} - void* operator new(size_t sz, nsPresContext* aContext) { + void* operator new(size_t sz, nsPresContext* aContext) CPP_THROW_NEW { return aContext->PresShell()->AllocateByObjectID( mozilla::eArenaObjectID_nsConditionalResetStyleDataEntry, sz); } @@ -148,7 +148,7 @@ struct nsConditionalResetStyleData mConditionalBits = 0; } - void* operator new(size_t sz, nsPresContext* aContext) { + void* operator new(size_t sz, nsPresContext* aContext) CPP_THROW_NEW { return aContext->PresShell()->AllocateByObjectID( mozilla::eArenaObjectID_nsConditionalResetStyleData, sz); } @@ -550,7 +550,7 @@ class nsRuleNode : public mozilla::LinkedListElement { public: // Infallible overloaded new operator that allocates from a presShell arena. - void* operator new(size_t sz, nsPresContext* aContext); + void* operator new(size_t sz, nsPresContext* aContext) CPP_THROW_NEW; void Destroy(); // Implemented in nsStyleSet.h, since it needs to know about nsStyleSet. diff --git a/layout/style/nsStyleContext.cpp b/layout/style/nsStyleContext.cpp index 7e56ec1a52c038..b6cf5aaa3e2c77 100644 --- a/layout/style/nsStyleContext.cpp +++ b/layout/style/nsStyleContext.cpp @@ -1336,7 +1336,7 @@ void nsStyleContext::List(FILE* out, int32_t aIndent, bool aListDescendants) // Overloaded new operator. Initializes the memory to 0 and relies on an arena // (which comes from the presShell) to perform the allocation. void* -nsStyleContext::operator new(size_t sz, nsPresContext* aPresContext) +nsStyleContext::operator new(size_t sz, nsPresContext* aPresContext) CPP_THROW_NEW { // Check the recycle list first. return aPresContext->PresShell()-> diff --git a/layout/style/nsStyleContext.h b/layout/style/nsStyleContext.h index 2d6e030b50f18c..9bd38d39905684 100644 --- a/layout/style/nsStyleContext.h +++ b/layout/style/nsStyleContext.h @@ -81,7 +81,7 @@ class nsStyleContext final already_AddRefed aComputedValues, bool aSkipParentDisplayBasedStyleFixup); - void* operator new(size_t sz, nsPresContext* aPresContext); + void* operator new(size_t sz, nsPresContext* aPresContext) CPP_THROW_NEW; void Destroy(); // These two methods are for use by ArenaRefPtr. diff --git a/layout/style/nsStyleStruct.h b/layout/style/nsStyleStruct.h index 9f86175c5c8983..9059f7da2eadb4 100644 --- a/layout/style/nsStyleStruct.h +++ b/layout/style/nsStyleStruct.h @@ -180,8 +180,8 @@ struct MOZ_NEEDS_MEMMOVABLE_MEMBERS nsStyleFont static nscoord UnZoomText(nsPresContext* aPresContext, nscoord aSize); static already_AddRefed GetLanguage(StyleStructContext aPresContext); - void* operator new(size_t sz, nsStyleFont* aSelf) { return aSelf; } - void* operator new(size_t sz, nsPresContext* aContext) { + void* operator new(size_t sz, nsStyleFont* aSelf) CPP_THROW_NEW { return aSelf; } + void* operator new(size_t sz, nsPresContext* aContext) CPP_THROW_NEW { return aContext->PresShell()-> AllocateByObjectID(mozilla::eArenaObjectID_nsStyleFont, sz); } @@ -454,8 +454,8 @@ struct MOZ_NEEDS_MEMMOVABLE_MEMBERS nsStyleColor return nsChangeHint(0); } - void* operator new(size_t sz, nsStyleColor* aSelf) { return aSelf; } - void* operator new(size_t sz, nsPresContext* aContext) { + void* operator new(size_t sz, nsStyleColor* aSelf) CPP_THROW_NEW { return aSelf; } + void* operator new(size_t sz, nsPresContext* aContext) CPP_THROW_NEW { return aContext->PresShell()-> AllocateByObjectID(mozilla::eArenaObjectID_nsStyleColor, sz); } @@ -823,8 +823,8 @@ struct MOZ_NEEDS_MEMMOVABLE_MEMBERS nsStyleBackground { nsStyleBackground(const nsStyleBackground& aOther); ~nsStyleBackground(); - void* operator new(size_t sz, nsStyleBackground* aSelf) { return aSelf; } - void* operator new(size_t sz, nsPresContext* aContext) { + void* operator new(size_t sz, nsStyleBackground* aSelf) CPP_THROW_NEW { return aSelf; } + void* operator new(size_t sz, nsPresContext* aContext) CPP_THROW_NEW { return aContext->PresShell()-> AllocateByObjectID(mozilla::eArenaObjectID_nsStyleBackground, sz); } @@ -883,8 +883,8 @@ struct MOZ_NEEDS_MEMMOVABLE_MEMBERS nsStyleMargin MOZ_COUNT_DTOR(nsStyleMargin); } - void* operator new(size_t sz, nsStyleMargin* aSelf) { return aSelf; } - void* operator new(size_t sz, nsPresContext* aContext) { + void* operator new(size_t sz, nsStyleMargin* aSelf) CPP_THROW_NEW { return aSelf; } + void* operator new(size_t sz, nsPresContext* aContext) CPP_THROW_NEW { return aContext->PresShell()-> AllocateByObjectID(mozilla::eArenaObjectID_nsStyleMargin, sz); } @@ -930,8 +930,8 @@ struct MOZ_NEEDS_MEMMOVABLE_MEMBERS nsStylePadding MOZ_COUNT_DTOR(nsStylePadding); } - void* operator new(size_t sz, nsStylePadding* aSelf) { return aSelf; } - void* operator new(size_t sz, nsPresContext* aContext) { + void* operator new(size_t sz, nsStylePadding* aSelf) CPP_THROW_NEW { return aSelf; } + void* operator new(size_t sz, nsPresContext* aContext) CPP_THROW_NEW { return aContext->PresShell()-> AllocateByObjectID(mozilla::eArenaObjectID_nsStylePadding, sz); } @@ -1137,8 +1137,8 @@ struct MOZ_NEEDS_MEMMOVABLE_MEMBERS nsStyleBorder nsStyleBorder(const nsStyleBorder& aBorder); ~nsStyleBorder(); - void* operator new(size_t sz, nsStyleBorder* aSelf) { return aSelf; } - void* operator new(size_t sz, nsPresContext* aContext) { + void* operator new(size_t sz, nsStyleBorder* aSelf) CPP_THROW_NEW { return aSelf; } + void* operator new(size_t sz, nsPresContext* aContext) CPP_THROW_NEW { return aContext->PresShell()-> AllocateByObjectID(mozilla::eArenaObjectID_nsStyleBorder, sz); } @@ -1370,8 +1370,8 @@ struct MOZ_NEEDS_MEMMOVABLE_MEMBERS nsStyleOutline MOZ_COUNT_DTOR(nsStyleOutline); } - void* operator new(size_t sz, nsStyleOutline* aSelf) { return aSelf; } - void* operator new(size_t sz, nsPresContext* aContext) { + void* operator new(size_t sz, nsStyleOutline* aSelf) CPP_THROW_NEW { return aSelf; } + void* operator new(size_t sz, nsPresContext* aContext) CPP_THROW_NEW { return aContext->PresShell()-> AllocateByObjectID(mozilla::eArenaObjectID_nsStyleOutline, sz); } @@ -1483,8 +1483,8 @@ struct MOZ_NEEDS_MEMMOVABLE_MEMBERS nsStyleList nsStyleList(const nsStyleList& aStyleList); ~nsStyleList(); - void* operator new(size_t sz, nsStyleList* aSelf) { return aSelf; } - void* operator new(size_t sz, nsPresContext* aContext) { + void* operator new(size_t sz, nsStyleList* aSelf) CPP_THROW_NEW { return aSelf; } + void* operator new(size_t sz, nsPresContext* aContext) CPP_THROW_NEW { return aContext->PresShell()-> AllocateByObjectID(mozilla::eArenaObjectID_nsStyleList, sz); } @@ -1710,8 +1710,8 @@ struct MOZ_NEEDS_MEMMOVABLE_MEMBERS nsStylePosition nsStylePosition(const nsStylePosition& aOther); ~nsStylePosition(); - void* operator new(size_t sz, nsStylePosition* aSelf) { return aSelf; } - void* operator new(size_t sz, nsPresContext* aContext) { + void* operator new(size_t sz, nsStylePosition* aSelf) CPP_THROW_NEW { return aSelf; } + void* operator new(size_t sz, nsPresContext* aContext) CPP_THROW_NEW { return aContext->PresShell()-> AllocateByObjectID(mozilla::eArenaObjectID_nsStylePosition, sz); } @@ -1961,8 +1961,8 @@ struct MOZ_NEEDS_MEMMOVABLE_MEMBERS nsStyleTextReset nsStyleTextReset(const nsStyleTextReset& aOther); ~nsStyleTextReset(); - void* operator new(size_t sz, nsStyleTextReset* aSelf) { return aSelf; } - void* operator new(size_t sz, nsPresContext* aContext) { + void* operator new(size_t sz, nsStyleTextReset* aSelf) CPP_THROW_NEW { return aSelf; } + void* operator new(size_t sz, nsPresContext* aContext) CPP_THROW_NEW { return aContext->PresShell()-> AllocateByObjectID(mozilla::eArenaObjectID_nsStyleTextReset, sz); } @@ -2048,8 +2048,8 @@ struct MOZ_NEEDS_MEMMOVABLE_MEMBERS nsStyleText nsStyleText(const nsStyleText& aOther); ~nsStyleText(); - void* operator new(size_t sz, nsStyleText* aSelf) { return aSelf; } - void* operator new(size_t sz, nsPresContext* aContext) { + void* operator new(size_t sz, nsStyleText* aSelf) CPP_THROW_NEW { return aSelf; } + void* operator new(size_t sz, nsPresContext* aContext) CPP_THROW_NEW { return aContext->PresShell()-> AllocateByObjectID(mozilla::eArenaObjectID_nsStyleText, sz); } @@ -2269,8 +2269,8 @@ struct MOZ_NEEDS_MEMMOVABLE_MEMBERS nsStyleVisibility MOZ_COUNT_DTOR(nsStyleVisibility); } - void* operator new(size_t sz, nsStyleVisibility* aSelf) { return aSelf; } - void* operator new(size_t sz, nsPresContext* aContext) { + void* operator new(size_t sz, nsStyleVisibility* aSelf) CPP_THROW_NEW { return aSelf; } + void* operator new(size_t sz, nsPresContext* aContext) CPP_THROW_NEW { return aContext->PresShell()-> AllocateByObjectID(mozilla::eArenaObjectID_nsStyleVisibility, sz); } @@ -2786,8 +2786,8 @@ struct MOZ_NEEDS_MEMMOVABLE_MEMBERS nsStyleDisplay MOZ_COUNT_DTOR(nsStyleDisplay); } - void* operator new(size_t sz, nsStyleDisplay* aSelf) { return aSelf; } - void* operator new(size_t sz, nsPresContext* aContext) { + void* operator new(size_t sz, nsStyleDisplay* aSelf) CPP_THROW_NEW { return aSelf; } + void* operator new(size_t sz, nsPresContext* aContext) CPP_THROW_NEW { return aContext->PresShell()-> AllocateByObjectID(mozilla::eArenaObjectID_nsStyleDisplay, sz); } @@ -3064,8 +3064,8 @@ struct MOZ_NEEDS_MEMMOVABLE_MEMBERS nsStyleTable nsStyleTable(const nsStyleTable& aOther); ~nsStyleTable(); - void* operator new(size_t sz, nsStyleTable* aSelf) { return aSelf; } - void* operator new(size_t sz, nsPresContext* aContext) { + void* operator new(size_t sz, nsStyleTable* aSelf) CPP_THROW_NEW { return aSelf; } + void* operator new(size_t sz, nsPresContext* aContext) CPP_THROW_NEW { return aContext->PresShell()-> AllocateByObjectID(mozilla::eArenaObjectID_nsStyleTable, sz); } @@ -3095,8 +3095,8 @@ struct MOZ_NEEDS_MEMMOVABLE_MEMBERS nsStyleTableBorder nsStyleTableBorder(const nsStyleTableBorder& aOther); ~nsStyleTableBorder(); - void* operator new(size_t sz, nsStyleTableBorder* aSelf) { return aSelf; } - void* operator new(size_t sz, nsPresContext* aContext) { + void* operator new(size_t sz, nsStyleTableBorder* aSelf) CPP_THROW_NEW { return aSelf; } + void* operator new(size_t sz, nsPresContext* aContext) CPP_THROW_NEW { return aContext->PresShell()-> AllocateByObjectID(mozilla::eArenaObjectID_nsStyleTableBorder, sz); } @@ -3196,8 +3196,8 @@ struct MOZ_NEEDS_MEMMOVABLE_MEMBERS nsStyleContent nsStyleContent(const nsStyleContent& aContent); ~nsStyleContent(); - void* operator new(size_t sz, nsStyleContent* aSelf) { return aSelf; } - void* operator new(size_t sz, nsPresContext* aContext) { + void* operator new(size_t sz, nsStyleContent* aSelf) CPP_THROW_NEW { return aSelf; } + void* operator new(size_t sz, nsPresContext* aContext) CPP_THROW_NEW { return aContext->PresShell()-> AllocateByObjectID(mozilla::eArenaObjectID_nsStyleContent, sz); } @@ -3308,8 +3308,8 @@ struct MOZ_NEEDS_MEMMOVABLE_MEMBERS nsStyleUIReset nsStyleUIReset(const nsStyleUIReset& aOther); ~nsStyleUIReset(); - void* operator new(size_t sz, nsStyleUIReset* aSelf) { return aSelf; } - void* operator new(size_t sz, nsPresContext* aContext) { + void* operator new(size_t sz, nsStyleUIReset* aSelf) CPP_THROW_NEW { return aSelf; } + void* operator new(size_t sz, nsPresContext* aContext) CPP_THROW_NEW { return aContext->PresShell()-> AllocateByObjectID(mozilla::eArenaObjectID_nsStyleUIReset, sz); } @@ -3377,8 +3377,8 @@ struct MOZ_NEEDS_MEMMOVABLE_MEMBERS nsStyleUserInterface nsStyleUserInterface(const nsStyleUserInterface& aOther); ~nsStyleUserInterface(); - void* operator new(size_t sz, nsStyleUserInterface* aSelf) { return aSelf; } - void* operator new(size_t sz, nsPresContext* aContext) { + void* operator new(size_t sz, nsStyleUserInterface* aSelf) CPP_THROW_NEW { return aSelf; } + void* operator new(size_t sz, nsPresContext* aContext) CPP_THROW_NEW { return aContext->PresShell()-> AllocateByObjectID(mozilla::eArenaObjectID_nsStyleUserInterface, sz); } @@ -3429,8 +3429,8 @@ struct MOZ_NEEDS_MEMMOVABLE_MEMBERS nsStyleXUL nsStyleXUL(const nsStyleXUL& aSource); ~nsStyleXUL(); - void* operator new(size_t sz, nsStyleXUL* aSelf) { return aSelf; } - void* operator new(size_t sz, nsPresContext* aContext) { + void* operator new(size_t sz, nsStyleXUL* aSelf) CPP_THROW_NEW { return aSelf; } + void* operator new(size_t sz, nsPresContext* aContext) CPP_THROW_NEW { return aContext->PresShell()-> AllocateByObjectID(mozilla::eArenaObjectID_nsStyleXUL, sz); } @@ -3468,8 +3468,8 @@ struct MOZ_NEEDS_MEMMOVABLE_MEMBERS nsStyleColumn nsStyleColumn(const nsStyleColumn& aSource); ~nsStyleColumn(); - void* operator new(size_t sz, nsStyleColumn* aSelf) { return aSelf; } - void* operator new(size_t sz, nsPresContext* aContext) { + void* operator new(size_t sz, nsStyleColumn* aSelf) CPP_THROW_NEW { return aSelf; } + void* operator new(size_t sz, nsPresContext* aContext) CPP_THROW_NEW { return aContext->PresShell()-> AllocateByObjectID(mozilla::eArenaObjectID_nsStyleColumn, sz); } @@ -3566,8 +3566,8 @@ struct MOZ_NEEDS_MEMMOVABLE_MEMBERS nsStyleSVG nsStyleSVG(const nsStyleSVG& aSource); ~nsStyleSVG(); - void* operator new(size_t sz, nsStyleSVG* aSelf) { return aSelf; } - void* operator new(size_t sz, nsPresContext* aContext) { + void* operator new(size_t sz, nsStyleSVG* aSelf) CPP_THROW_NEW { return aSelf; } + void* operator new(size_t sz, nsPresContext* aContext) CPP_THROW_NEW { return aContext->PresShell()-> AllocateByObjectID(mozilla::eArenaObjectID_nsStyleSVG, sz); } @@ -3757,8 +3757,8 @@ struct MOZ_NEEDS_MEMMOVABLE_MEMBERS nsStyleSVGReset nsStyleSVGReset(const nsStyleSVGReset& aSource); ~nsStyleSVGReset(); - void* operator new(size_t sz, nsStyleSVGReset* aSelf) { return aSelf; } - void* operator new(size_t sz, nsPresContext* aContext) { + void* operator new(size_t sz, nsStyleSVGReset* aSelf) CPP_THROW_NEW { return aSelf; } + void* operator new(size_t sz, nsPresContext* aContext) CPP_THROW_NEW { return aContext->PresShell()-> AllocateByObjectID(mozilla::eArenaObjectID_nsStyleSVGReset, sz); } @@ -3808,8 +3808,8 @@ struct MOZ_NEEDS_MEMMOVABLE_MEMBERS nsStyleVariables nsStyleVariables(const nsStyleVariables& aSource); ~nsStyleVariables(); - void* operator new(size_t sz, nsStyleVariables* aSelf) { return aSelf; } - void* operator new(size_t sz, nsPresContext* aContext) { + void* operator new(size_t sz, nsStyleVariables* aSelf) CPP_THROW_NEW { return aSelf; } + void* operator new(size_t sz, nsPresContext* aContext) CPP_THROW_NEW { return aContext->PresShell()-> AllocateByObjectID(mozilla::eArenaObjectID_nsStyleVariables, sz); } @@ -3838,8 +3838,8 @@ struct MOZ_NEEDS_MEMMOVABLE_MEMBERS nsStyleEffects nsStyleEffects(const nsStyleEffects& aSource); ~nsStyleEffects(); - void* operator new(size_t sz, nsStyleEffects* aSelf) { return aSelf; } - void* operator new(size_t sz, nsPresContext* aContext) { + void* operator new(size_t sz, nsStyleEffects* aSelf) CPP_THROW_NEW { return aSelf; } + void* operator new(size_t sz, nsPresContext* aContext) CPP_THROW_NEW { return aContext->PresShell()-> AllocateByObjectID(mozilla::eArenaObjectID_nsStyleEffects, sz); }