diff --git a/mozilla/content/base/src/nsStyleContext.cpp b/mozilla/content/base/src/nsStyleContext.cpp index c0aa662e200..350f26bd8ee 100644 --- a/mozilla/content/base/src/nsStyleContext.cpp +++ b/mozilla/content/base/src/nsStyleContext.cpp @@ -29,15 +29,6 @@ //#define DEBUG_REFS -static NS_DEFINE_IID(kStyleFontSID, NS_STYLEFONT_SID); -static NS_DEFINE_IID(kStyleColorSID, NS_STYLECOLOR_SID); -static NS_DEFINE_IID(kStyleSpacingSID, NS_STYLESPACING_SID); -static NS_DEFINE_IID(kStyleListSID, NS_STYLELIST_SID); -static NS_DEFINE_IID(kStylePositionSID, NS_STYLEPOSITION_SID); -static NS_DEFINE_IID(kStyleTextSID, NS_STYLETEXT_SID); -static NS_DEFINE_IID(kStyleDisplaySID, NS_STYLEDISPLAY_SID); -static NS_DEFINE_IID(kStyleTableSID, NS_STYLETABLE_SID); - static NS_DEFINE_IID(kIStyleContextIID, NS_ISTYLECONTEXT_IID); @@ -141,7 +132,7 @@ static nscoord CalcSideFor(const nsIFrame* aFrame, const nsStyleCoord& aCoord, nsIStyleContext* parentContext; parentFrame->GetStyleContext(nsnull, parentContext); if (nsnull != parentContext) { - nsStyleSpacing* parentSpacing = (nsStyleSpacing*)parentContext->GetData(kStyleSpacingSID); + nsStyleSpacing* parentSpacing = (nsStyleSpacing*)parentContext->GetData(eStyleStruct_Spacing); nsMargin parentMargin; switch (aSpacing) { case NS_SPACING_MARGIN: parentSpacing->CalcMarginFor(parentFrame, parentMargin); @@ -535,7 +526,7 @@ public: virtual PRBool Equals(const nsIStyleContext* aOther) const; virtual PRUint32 HashValue(void) const; - virtual nsStyleStruct* GetData(const nsIID& aSID); + virtual nsStyleStruct* GetData(nsStyleStructID aSID); virtual void InheritFrom(const StyleContextImpl& aParent); virtual void RecalcAutomaticData(nsIPresContext* aPresContext); @@ -708,42 +699,49 @@ PRUint32 StyleContextImpl::HashValue(void) const } -nsStyleStruct* StyleContextImpl::GetData(const nsIID& aSID) +nsStyleStruct* StyleContextImpl::GetData(nsStyleStructID aSID) { - if (aSID.Equals(kStyleFontSID)) { - return &mFont; - } - if (aSID.Equals(kStyleColorSID)) { - return &mColor; - } - if (aSID.Equals(kStyleSpacingSID)) { - return &mSpacing; - } - if (aSID.Equals(kStyleListSID)) { - return &mList; - } - if (aSID.Equals(kStylePositionSID)) { - return &mPosition; - } - if (aSID.Equals(kStyleTextSID)) { - return &mText; - } - if (aSID.Equals(kStyleDisplaySID)) { - return &mDisplay; - } - if (aSID.Equals(kStyleTableSID)) { // this one gets created lazily - if (nsnull == mTable) { - mTable = new StyleTableImpl(); - if (nsnull != mParent) { - StyleContextImpl* parent = (StyleContextImpl*)mParent; - if (nsnull != parent->mTable) { - mTable->InheritFrom(*(parent->mTable)); + nsStyleStruct* result = nsnull; + + switch (aSID) { + case eStyleStruct_Font: + result = &mFont; + break; + case eStyleStruct_Color: + result = &mColor; + break; + case eStyleStruct_Spacing: + result = &mSpacing; + break; + case eStyleStruct_List: + result = &mList; + break; + case eStyleStruct_Position: + result = &mPosition; + break; + case eStyleStruct_Text: + result = &mText; + break; + case eStyleStruct_Display: + result = &mDisplay; + break; + case eStyleStruct_Table: // this one gets created lazily + if (nsnull == mTable) { + mTable = new StyleTableImpl(); + if (nsnull != mParent) { + StyleContextImpl* parent = (StyleContextImpl*)mParent; + if (nsnull != parent->mTable) { + mTable->InheritFrom(*(parent->mTable)); + } } } - } - return mTable; + result = mTable; + break; + default: + NS_ERROR("Invalid style struct id"); + break; } - return nsnull; + return result; } void StyleContextImpl::InheritFrom(const StyleContextImpl& aParent) diff --git a/mozilla/content/html/style/src/nsCSSLayout.cpp b/mozilla/content/html/style/src/nsCSSLayout.cpp index d2fbd5ddc2c..37ac2238de3 100644 --- a/mozilla/content/html/style/src/nsCSSLayout.cpp +++ b/mozilla/content/html/style/src/nsCSSLayout.cpp @@ -27,9 +27,6 @@ #include "nsBlockFrame.h" #include "nsHTMLIIDs.h" -static NS_DEFINE_IID(kStylePositionSID, NS_STYLEPOSITION_SID); -static NS_DEFINE_IID(kStyleTextSID, NS_STYLETEXT_SID); - NS_DEF_PTR(nsIStyleContext); NS_DEF_PTR(nsIContent); @@ -65,7 +62,7 @@ nsCSSLayout::VerticallyAlignChildren(nsIPresContext* aCX, nsIStyleContextPtr kidSC; kid->GetStyleContext(aCX, kidSC.AssignRef()); - nsStyleText* textStyle = (nsStyleText*)kidSC->GetData(kStyleTextSID); + nsStyleText* textStyle = (nsStyleText*)kidSC->GetData(eStyleStruct_Text); nsStyleUnit verticalAlignUnit = textStyle->mVerticalAlign.GetUnit(); PRUint8 verticalAlignEnum = NS_STYLE_VERTICAL_ALIGN_BASELINE; @@ -168,7 +165,7 @@ nsCSSLayout::VerticallyAlignChildren(nsIPresContext* aCX, nsIStyleContextPtr kidSC; kid->GetStyleContext(aCX, kidSC.AssignRef()); - nsStyleText* textStyle = (nsStyleText*)kidSC->GetData(kStyleTextSID); + nsStyleText* textStyle = (nsStyleText*)kidSC->GetData(eStyleStruct_Text); nsStyleUnit verticalAlignUnit = textStyle->mVerticalAlign.GetUnit(); if (eStyleUnit_Percent == verticalAlignUnit) { @@ -258,7 +255,7 @@ nsCSSLayout::RelativePositionChildren(nsIPresContext* aCX, kid->GetStyleContext(aCX, kidSC.AssignRef()); nsStylePosition* kidPosition = (nsStylePosition*) - kidSC->GetData(kStylePositionSID); + kidSC->GetData(eStyleStruct_Position); if (NS_STYLE_POSITION_RELATIVE == kidPosition->mPosition) { kid->GetOrigin(origin); // XXX Check the unit: could be auto or percent (not just length) @@ -329,7 +326,7 @@ nsCSSLayout::GetStyleSize(nsIPresContext* aPresContext, nsIStyleContext* sc = nsnull; aFrame->GetStyleContext(aPresContext, sc); if (nsnull != sc) { - nsStylePosition* pos = (nsStylePosition*) sc->GetData(kStylePositionSID); + nsStylePosition* pos = (nsStylePosition*) sc->GetData(eStyleStruct_Position); if (GetStyleDimension(aPresContext, aFrame, pos, pos->mWidth, aStyleSize.width)) { rv |= NS_SIZE_HAS_WIDTH; diff --git a/mozilla/content/html/style/src/nsCSSStyleRule.cpp b/mozilla/content/html/style/src/nsCSSStyleRule.cpp index fa57553ca9b..f58ef75dfb7 100644 --- a/mozilla/content/html/style/src/nsCSSStyleRule.cpp +++ b/mozilla/content/html/style/src/nsCSSStyleRule.cpp @@ -33,14 +33,6 @@ static NS_DEFINE_IID(kIStyleRuleIID, NS_ISTYLE_RULE_IID); static NS_DEFINE_IID(kICSSDeclarationIID, NS_ICSS_DECLARATION_IID); static NS_DEFINE_IID(kICSSStyleRuleIID, NS_ICSS_STYLE_RULE_IID); -static NS_DEFINE_IID(kStyleColorSID, NS_STYLECOLOR_SID); -static NS_DEFINE_IID(kStyleDisplaySID, NS_STYLEDISPLAY_SID); -static NS_DEFINE_IID(kStyleFontSID, NS_STYLEFONT_SID); -static NS_DEFINE_IID(kStyleListSID, NS_STYLELIST_SID); -static NS_DEFINE_IID(kStylePositionSID, NS_STYLEPOSITION_SID); -static NS_DEFINE_IID(kStyleSpacingSID, NS_STYLESPACING_SID); -static NS_DEFINE_IID(kStyleTextSID, NS_STYLETEXT_SID); - static NS_DEFINE_IID(kCSSFontSID, NS_CSS_FONT_SID); static NS_DEFINE_IID(kCSSColorSID, NS_CSS_COLOR_SID); static NS_DEFINE_IID(kCSSTextSID, NS_CSS_TEXT_SID); @@ -518,7 +510,7 @@ PRBool CSSStyleRuleImpl::SetCoord(const nsCSSValue& aValue, nsStyleCoord& aCoord void CSSStyleRuleImpl::MapStyleInto(nsIStyleContext* aContext, nsIPresContext* aPresContext) { if (nsnull != mDeclaration) { - nsStyleFont* font = (nsStyleFont*)aContext->GetData(kStyleFontSID); + nsStyleFont* font = (nsStyleFont*)aContext->GetData(eStyleStruct_Font); nsCSSFont* ourFont; if (NS_OK == mDeclaration->GetData(kCSSFontSID, (nsCSSStruct**)&ourFont)) { @@ -526,7 +518,7 @@ void CSSStyleRuleImpl::MapStyleInto(nsIStyleContext* aContext, nsIPresContext* a nsStyleFont* parentFont = font; nsIStyleContext* parentContext = aContext->GetParent(); if (nsnull != parentContext) { - parentFont = (nsStyleFont*)parentContext->GetData(kStyleFontSID); + parentFont = (nsStyleFont*)parentContext->GetData(eStyleStruct_Font); } // font-family: string list @@ -628,7 +620,7 @@ void CSSStyleRuleImpl::MapStyleInto(nsIStyleContext* aContext, nsIPresContext* a if (NS_OK == mDeclaration->GetData(kCSSTextSID, (nsCSSStruct**)&ourText)) { if (nsnull != ourText) { // Get our text style and our parent's text style - nsStyleText* text = (nsStyleText*) aContext->GetData(kStyleTextSID); + nsStyleText* text = (nsStyleText*) aContext->GetData(eStyleStruct_Text); // letter-spacing SetCoord(ourText->mLetterSpacing, text->mLetterSpacing, SETCOORD_LH | SETCOORD_NORMAL, @@ -678,7 +670,7 @@ void CSSStyleRuleImpl::MapStyleInto(nsIStyleContext* aContext, nsIPresContext* a if (nsnull != ourDisplay) { // Get our style and our parent's style nsStyleDisplay* display = (nsStyleDisplay*) - aContext->GetData(kStyleDisplaySID); + aContext->GetData(eStyleStruct_Display); // display if (ourDisplay->mDisplay.GetUnit() == eCSSUnit_Enumerated) { @@ -706,7 +698,7 @@ void CSSStyleRuleImpl::MapStyleInto(nsIStyleContext* aContext, nsIPresContext* a nsCSSColor* ourColor; if (NS_OK == mDeclaration->GetData(kCSSColorSID, (nsCSSStruct**)&ourColor)) { if (nsnull != ourColor) { - nsStyleColor* color = (nsStyleColor*)aContext->GetData(kStyleColorSID); + nsStyleColor* color = (nsStyleColor*)aContext->GetData(eStyleStruct_Color); // color: color if (ourColor->mColor.GetUnit() == eCSSUnit_Color) { @@ -790,7 +782,7 @@ void CSSStyleRuleImpl::MapStyleInto(nsIStyleContext* aContext, nsIPresContext* a if (NS_OK == mDeclaration->GetData(kCSSMarginSID, (nsCSSStruct**)&ourMargin)) { if (nsnull != ourMargin) { nsStyleSpacing* spacing = (nsStyleSpacing*) - aContext->GetData(kStyleSpacingSID); + aContext->GetData(eStyleStruct_Spacing); // margin: length, percent, auto, inherit if (nsnull != ourMargin->mMargin) { @@ -861,7 +853,7 @@ void CSSStyleRuleImpl::MapStyleInto(nsIStyleContext* aContext, nsIPresContext* a } // border-color - nsStyleColor* color = (nsStyleColor*)aContext->GetData(kStyleColorSID); + nsStyleColor* color = (nsStyleColor*)aContext->GetData(eStyleStruct_Color); if (nsnull != ourMargin->mColor) { nsCSSRect* ourColor = ourMargin->mColor; if (ourColor->mTop.GetUnit() == eCSSUnit_Color) { @@ -883,7 +875,7 @@ void CSSStyleRuleImpl::MapStyleInto(nsIStyleContext* aContext, nsIPresContext* a nsCSSPosition* ourPosition; if (NS_OK == mDeclaration->GetData(kCSSPositionSID, (nsCSSStruct**)&ourPosition)) { if (nsnull != ourPosition) { - nsStylePosition* position = (nsStylePosition*)aContext->GetData(kStylePositionSID); + nsStylePosition* position = (nsStylePosition*)aContext->GetData(eStyleStruct_Position); // position: normal, enum, inherit if (ourPosition->mPosition.GetUnit() == eCSSUnit_Normal) { @@ -896,7 +888,7 @@ void CSSStyleRuleImpl::MapStyleInto(nsIStyleContext* aContext, nsIPresContext* a // explicit inheritance nsIStyleContext* parentContext = aContext->GetParent(); if (nsnull != parentContext) { - nsStylePosition* parentPosition = (nsStylePosition*)parentContext->GetData(kStylePositionSID); + nsStylePosition* parentPosition = (nsStylePosition*)parentContext->GetData(eStyleStruct_Position); position->mPosition = parentPosition->mPosition; } } @@ -968,7 +960,7 @@ void CSSStyleRuleImpl::MapStyleInto(nsIStyleContext* aContext, nsIPresContext* a nsCSSList* ourList; if (NS_OK == mDeclaration->GetData(kCSSListSID, (nsCSSStruct**)&ourList)) { if (nsnull != ourList) { - nsStyleList* list = (nsStyleList*)aContext->GetData(kStyleListSID); + nsStyleList* list = (nsStyleList*)aContext->GetData(eStyleStruct_List); // list-style-type: enum if (ourList->mType.GetUnit() == eCSSUnit_Enumerated) { diff --git a/mozilla/layout/base/public/Makefile b/mozilla/layout/base/public/Makefile index 374eac56d51..9989047db98 100644 --- a/mozilla/layout/base/public/Makefile +++ b/mozilla/layout/base/public/Makefile @@ -34,6 +34,7 @@ EXPORTS = \ nsISelection.h \ nsISpaceManager.h \ nsStyleCoord.h \ + nsStyleStruct.h \ nsIStyleContext.h \ nsIStyleRule.h \ nsIStyleSet.h \ diff --git a/mozilla/layout/base/public/makefile.win b/mozilla/layout/base/public/makefile.win index c53987bf6c0..f78dcd8853e 100644 --- a/mozilla/layout/base/public/makefile.win +++ b/mozilla/layout/base/public/makefile.win @@ -33,6 +33,7 @@ EXPORTS = \ nsISelection.h \ nsISpaceManager.h \ nsStyleCoord.h \ + nsStyleStruct.h \ nsIStyleContext.h \ nsIStyleRule.h \ nsIStyleSet.h \ diff --git a/mozilla/layout/base/public/nsIFrame.h b/mozilla/layout/base/public/nsIFrame.h index 44d6e03e983..a9578c11133 100644 --- a/mozilla/layout/base/public/nsIFrame.h +++ b/mozilla/layout/base/public/nsIFrame.h @@ -23,6 +23,7 @@ #include "nsISupports.h" #include "nsSize.h" #include "nsGUIEvent.h" +#include "nsStyleStruct.h" class nsIContent; class nsIPresContext; @@ -168,7 +169,7 @@ public: /** * Get the style data associated with this frame */ - NS_IMETHOD GetStyleData(const nsIID& aSID, nsStyleStruct*& aStyleStruct) const = 0; + NS_IMETHOD GetStyleData(nsStyleStructID aSID, nsStyleStruct*& aStyleStruct) const = 0; /** * Accessor functions for geometric and content parent. diff --git a/mozilla/layout/base/public/nsIStyleContext.h b/mozilla/layout/base/public/nsIStyleContext.h index 77f941abf16..d27eb6d9a72 100644 --- a/mozilla/layout/base/public/nsIStyleContext.h +++ b/mozilla/layout/base/public/nsIStyleContext.h @@ -25,44 +25,13 @@ #include "nsMargin.h" #include "nsFont.h" #include "nsStyleCoord.h" +#include "nsStyleStruct.h" class nsIFrame; class nsIPresContext; class nsIContent; class nsISupportsArray; -// SID e31e1bc0-ca9b-11d1-8031-006008159b5a -#define NS_STYLEFONT_SID \ -{0xe31e1bc0, 0xca9b, 0x11d1, {0x80, 0x31, 0x00, 0x60, 0x08, 0x15, 0x9b, 0x5a}} - -// SID 05953860-ca9c-11d1-8031-006008159b5a -#define NS_STYLECOLOR_SID \ -{0x05953860, 0xca9c, 0x11d1, {0x80, 0x31, 0x00, 0x60, 0x08, 0x15, 0x9b, 0x5a}} - -// SID 0ba04d20-d89e-11d1-8031-006008159b5a -#define NS_STYLESPACING_SID \ -{0x0ba04d20, 0xd89e, 0x11d1, {0x80, 0x31, 0x00, 0x60, 0x08, 0x15, 0x9b, 0x5a}} - -// SID 4fb83b60-cf27-11d1-8031-006008159b5a -#define NS_STYLELIST_SID \ -{0x4fb83b60, 0xcf27, 0x11d1, {0x80, 0x31, 0x00, 0x60, 0x08, 0x15, 0x9b, 0x5a}} - -// SID AD5993F0-DA2B-11d1-80B9-00805F8A274D -#define NS_STYLEPOSITION_SID \ -{0xad5993f0, 0xda2b, 0x11d1, {0x80, 0xb9, 0x00, 0x80, 0x5f, 0x8a, 0x27, 0x4d}} - -// SID 3C29D620-DAF5-11D1-932B-00805F8ADD32 -#define NS_STYLETEXT_SID \ -{0x3c29d620, 0xdaf5, 0x11d1, {0x93, 0x2b, 0x00, 0x80, 0x5f, 0x8a, 0xdd, 0x32}} - -// SID 3C29D621-DAF5-11D1-932B-00805F8ADD32 -#define NS_STYLEDISPLAY_SID \ -{0x3c29d621, 0xdaf5, 0x11d1, {0x93, 0x2b, 0x00, 0x80, 0x5f, 0x8a, 0xdd, 0x32}} - -// SID 8a9d1f50-e094-11d1-8031-006008159b5a -#define NS_STYLETABLE_SID \ -{0x8a9d1f50, 0xe094, 0x11d1, {0x80, 0x31, 0x00, 0x60, 0x08, 0x15, 0x9b, 0x5a}} - // Indicies into border/padding/margin arrays #define NS_SIDE_TOP 0 @@ -72,9 +41,6 @@ class nsISupportsArray; // The lifetime of these objects is managed by the nsIStyleContext. -struct nsStyleStruct { -}; - struct nsStyleFont : public nsStyleStruct { nsFont mFont; PRUint8 mThreeD; // XXX fold this into nsFont @@ -210,7 +176,7 @@ public: virtual PRInt32 GetStyleRuleCount(void) const = 0; // get a style data struct by ID, may return null - virtual nsStyleStruct* GetData(const nsIID& aSID) = 0; + virtual nsStyleStruct* GetData(nsStyleStructID aSID) = 0; // call if you change style data after creation virtual void RecalcAutomaticData(nsIPresContext* aPresContext) = 0; diff --git a/mozilla/layout/base/src/nsContainerFrame.cpp b/mozilla/layout/base/src/nsContainerFrame.cpp index cd4c865f3f6..9ee173b525c 100644 --- a/mozilla/layout/base/src/nsContainerFrame.cpp +++ b/mozilla/layout/base/src/nsContainerFrame.cpp @@ -37,9 +37,6 @@ static NS_DEFINE_IID(kIRunaroundIID, NS_IRUNAROUND_IID); -static NS_DEFINE_IID(kStyleDisplaySID, NS_STYLEDISPLAY_SID); -static NS_DEFINE_IID(kStylePositionSID, NS_STYLEPOSITION_SID); - nsContainerFrame::nsContainerFrame(nsIContent* aContent, nsIFrame* aParent) : nsSplittableFrame(aContent, aParent), mLastContentIsComplete(PR_TRUE) @@ -230,7 +227,7 @@ void nsContainerFrame::PaintChildren(nsIPresContext& aPresContext, { // Set clip rect so that children don't leak out of us nsStylePosition* pos = - (nsStylePosition*)mStyleContext->GetData(kStylePositionSID); + (nsStylePosition*)mStyleContext->GetData(eStyleStruct_Position); PRBool hidden = PR_FALSE; if (NS_STYLE_OVERFLOW_HIDDEN == pos->mOverflow) { aRenderingContext.PushState(); @@ -513,7 +510,7 @@ nsReflowStatus nsContainerFrame::ReflowChild(nsIFrame* aKidFrame, nsStyleDisplay* display; // XXX Handle the case of multiple frames - trapezoid->frame->GetStyleData(kStyleDisplaySID, (nsStyleStruct*&)display); + trapezoid->frame->GetStyleData(eStyleStruct_Display, (nsStyleStruct*&)display); if (NS_STYLE_FLOAT_RIGHT == display->mFloats) { break; } @@ -535,7 +532,7 @@ nsReflowStatus nsContainerFrame::ReflowChild(nsIFrame* aKidFrame, trapezoid->GetRect(availBand); // XXX Handle the case of multiple frames - trapezoid->frame->GetStyleData(kStyleDisplaySID, (nsStyleStruct*&)display); + trapezoid->frame->GetStyleData(eStyleStruct_Display, (nsStyleStruct*&)display); if (NS_STYLE_FLOAT_LEFT == display->mFloats) { availBand.x = availBand.XMost(); } diff --git a/mozilla/layout/base/src/nsFrame.cpp b/mozilla/layout/base/src/nsFrame.cpp index 8251ec34b37..06e2056c496 100644 --- a/mozilla/layout/base/src/nsFrame.cpp +++ b/mozilla/layout/base/src/nsFrame.cpp @@ -60,9 +60,6 @@ PRInt32 fTrackerAddListMax = 0; PRBool gTrackerDebug = PR_FALSE; PRBool gCalcDebug = PR_FALSE; -static NS_DEFINE_IID(kStylePositionSID, NS_STYLEPOSITION_SID); -static NS_DEFINE_IID(kStyleDisplaySID, NS_STYLEDISPLAY_SID); - // [HACK] Foward Declarations void BuildContentList(nsIContent*aContent); PRBool IsInRange(nsIContent * aStartContent, nsIContent * aEndContent, nsIContent * aContent); @@ -304,7 +301,7 @@ NS_METHOD nsFrame::DidSetStyleContext(nsIPresContext* aPresContext) return NS_OK; } -NS_METHOD nsFrame::GetStyleData(const nsIID& aSID, nsStyleStruct*& aStyleStruct) const +NS_METHOD nsFrame::GetStyleData(nsStyleStructID aSID, nsStyleStruct*& aStyleStruct) const { NS_ASSERTION(mStyleContext!=nsnull,"null style context"); if (mStyleContext) { @@ -1272,13 +1269,13 @@ NS_METHOD nsFrame::GetWindow(nsIWidget*& aWindow) const NS_METHOD nsFrame::IsPercentageBase(PRBool& aBase) const { nsStylePosition* position; - GetStyleData(kStylePositionSID, (nsStyleStruct*&)position); + GetStyleData(eStyleStruct_Position, (nsStyleStruct*&)position); if (position->mPosition != NS_STYLE_POSITION_NORMAL) { aBase = PR_TRUE; } else { nsStyleDisplay* display; - GetStyleData(kStyleDisplaySID, (nsStyleStruct*&)display); + GetStyleData(eStyleStruct_Display, (nsStyleStruct*&)display); if ((display->mDisplay == NS_STYLE_DISPLAY_BLOCK) || (display->mDisplay == NS_STYLE_DISPLAY_LIST_ITEM)) { aBase = PR_TRUE; diff --git a/mozilla/layout/base/src/nsFrame.h b/mozilla/layout/base/src/nsFrame.h index 7ddb450e318..bf379ea369c 100644 --- a/mozilla/layout/base/src/nsFrame.h +++ b/mozilla/layout/base/src/nsFrame.h @@ -91,7 +91,7 @@ public: NS_IMETHOD SetStyleContext(nsIPresContext* aPresContext, nsIStyleContext* aContext); // Get the style struct associated with this frame - NS_IMETHOD GetStyleData(const nsIID& aSID, nsStyleStruct*& aStyleStruct) const; + NS_IMETHOD GetStyleData(nsStyleStructID aSID, nsStyleStruct*& aStyleStruct) const; // Geometric and content parent diff --git a/mozilla/layout/base/src/nsStyleContext.cpp b/mozilla/layout/base/src/nsStyleContext.cpp index c0aa662e200..350f26bd8ee 100644 --- a/mozilla/layout/base/src/nsStyleContext.cpp +++ b/mozilla/layout/base/src/nsStyleContext.cpp @@ -29,15 +29,6 @@ //#define DEBUG_REFS -static NS_DEFINE_IID(kStyleFontSID, NS_STYLEFONT_SID); -static NS_DEFINE_IID(kStyleColorSID, NS_STYLECOLOR_SID); -static NS_DEFINE_IID(kStyleSpacingSID, NS_STYLESPACING_SID); -static NS_DEFINE_IID(kStyleListSID, NS_STYLELIST_SID); -static NS_DEFINE_IID(kStylePositionSID, NS_STYLEPOSITION_SID); -static NS_DEFINE_IID(kStyleTextSID, NS_STYLETEXT_SID); -static NS_DEFINE_IID(kStyleDisplaySID, NS_STYLEDISPLAY_SID); -static NS_DEFINE_IID(kStyleTableSID, NS_STYLETABLE_SID); - static NS_DEFINE_IID(kIStyleContextIID, NS_ISTYLECONTEXT_IID); @@ -141,7 +132,7 @@ static nscoord CalcSideFor(const nsIFrame* aFrame, const nsStyleCoord& aCoord, nsIStyleContext* parentContext; parentFrame->GetStyleContext(nsnull, parentContext); if (nsnull != parentContext) { - nsStyleSpacing* parentSpacing = (nsStyleSpacing*)parentContext->GetData(kStyleSpacingSID); + nsStyleSpacing* parentSpacing = (nsStyleSpacing*)parentContext->GetData(eStyleStruct_Spacing); nsMargin parentMargin; switch (aSpacing) { case NS_SPACING_MARGIN: parentSpacing->CalcMarginFor(parentFrame, parentMargin); @@ -535,7 +526,7 @@ public: virtual PRBool Equals(const nsIStyleContext* aOther) const; virtual PRUint32 HashValue(void) const; - virtual nsStyleStruct* GetData(const nsIID& aSID); + virtual nsStyleStruct* GetData(nsStyleStructID aSID); virtual void InheritFrom(const StyleContextImpl& aParent); virtual void RecalcAutomaticData(nsIPresContext* aPresContext); @@ -708,42 +699,49 @@ PRUint32 StyleContextImpl::HashValue(void) const } -nsStyleStruct* StyleContextImpl::GetData(const nsIID& aSID) +nsStyleStruct* StyleContextImpl::GetData(nsStyleStructID aSID) { - if (aSID.Equals(kStyleFontSID)) { - return &mFont; - } - if (aSID.Equals(kStyleColorSID)) { - return &mColor; - } - if (aSID.Equals(kStyleSpacingSID)) { - return &mSpacing; - } - if (aSID.Equals(kStyleListSID)) { - return &mList; - } - if (aSID.Equals(kStylePositionSID)) { - return &mPosition; - } - if (aSID.Equals(kStyleTextSID)) { - return &mText; - } - if (aSID.Equals(kStyleDisplaySID)) { - return &mDisplay; - } - if (aSID.Equals(kStyleTableSID)) { // this one gets created lazily - if (nsnull == mTable) { - mTable = new StyleTableImpl(); - if (nsnull != mParent) { - StyleContextImpl* parent = (StyleContextImpl*)mParent; - if (nsnull != parent->mTable) { - mTable->InheritFrom(*(parent->mTable)); + nsStyleStruct* result = nsnull; + + switch (aSID) { + case eStyleStruct_Font: + result = &mFont; + break; + case eStyleStruct_Color: + result = &mColor; + break; + case eStyleStruct_Spacing: + result = &mSpacing; + break; + case eStyleStruct_List: + result = &mList; + break; + case eStyleStruct_Position: + result = &mPosition; + break; + case eStyleStruct_Text: + result = &mText; + break; + case eStyleStruct_Display: + result = &mDisplay; + break; + case eStyleStruct_Table: // this one gets created lazily + if (nsnull == mTable) { + mTable = new StyleTableImpl(); + if (nsnull != mParent) { + StyleContextImpl* parent = (StyleContextImpl*)mParent; + if (nsnull != parent->mTable) { + mTable->InheritFrom(*(parent->mTable)); + } } } - } - return mTable; + result = mTable; + break; + default: + NS_ERROR("Invalid style struct id"); + break; } - return nsnull; + return result; } void StyleContextImpl::InheritFrom(const StyleContextImpl& aParent) diff --git a/mozilla/layout/generic/nsBlockFrame.cpp b/mozilla/layout/generic/nsBlockFrame.cpp index 23b029f3560..784fae9fd1d 100644 --- a/mozilla/layout/generic/nsBlockFrame.cpp +++ b/mozilla/layout/generic/nsBlockFrame.cpp @@ -33,10 +33,6 @@ // XXX what do we do with catastrophic errors (rv < 0)? What is the // state of the reflow world after such an error? -static NS_DEFINE_IID(kStyleDisplaySID, NS_STYLEDISPLAY_SID); -static NS_DEFINE_IID(kStylePositionSID, NS_STYLEPOSITION_SID); -static NS_DEFINE_IID(kStyleSpacingSID, NS_STYLESPACING_SID); - static NS_DEFINE_IID(kIAnchoredItemsIID, NS_IANCHOREDITEMS_IID); static NS_DEFINE_IID(kIRunaroundIID, NS_IRUNAROUND_IID); static NS_DEFINE_IID(kIFloaterContainerIID, NS_IFLOATERCONTAINER_IID); @@ -63,7 +59,7 @@ void nsBlockBandData::ComputeAvailSpaceRect() nsStyleDisplay* display; // XXX Handle the case of multiple frames - trapezoid->frame->GetStyleData(kStyleDisplaySID, (nsStyleStruct*&)display); + trapezoid->frame->GetStyleData(eStyleStruct_Display, (nsStyleStruct*&)display); if (NS_STYLE_FLOAT_RIGHT == display->mFloats) { break; } @@ -85,7 +81,7 @@ void nsBlockBandData::ComputeAvailSpaceRect() trapezoid->GetRect(availSpace); // XXX Handle the case of multiple frames - trapezoid->frame->GetStyleData(kStyleDisplaySID, (nsStyleStruct*&)display); + trapezoid->frame->GetStyleData(eStyleStruct_Display, (nsStyleStruct*&)display); if (NS_STYLE_FLOAT_LEFT == display->mFloats) { availSpace.x = availSpace.XMost(); } @@ -167,7 +163,7 @@ nsresult nsBlockReflowState::RecoverState(nsLineData* aLine) nsStyleSpacing* kidSpacing; nsIFrame* kid = prevLine->mFirstChild; - kid->GetStyleData(kStyleSpacingSID, (nsStyleStruct*&)kidSpacing); + kid->GetStyleData(eStyleStruct_Spacing, (nsStyleStruct*&)kidSpacing); nsMargin kidMargin; kidSpacing->CalcMarginFor(kid, kidMargin); if (kidMargin.bottom < 0) { @@ -948,9 +944,9 @@ nsBlockFrame::InitializeState(nsIPresContext* aPresContext, // Apply border and padding adjustments for regular frames only if (!aState.mBlockIsPseudo) { nsStyleSpacing* mySpacing = (nsStyleSpacing*) - mStyleContext->GetData(kStyleSpacingSID); + mStyleContext->GetData(eStyleStruct_Spacing); nsStylePosition* myPosition = (nsStylePosition*) - mStyleContext->GetData(kStylePositionSID); + mStyleContext->GetData(eStyleStruct_Position); mySpacing->CalcBorderPaddingFor(this, aState.mBorderPadding); aState.mY = aState.mBorderPadding.top; @@ -1507,7 +1503,7 @@ nsBlockFrame::PlaceFloater(nsIPresContext* aPresContext, // Get the type of floater nsStyleDisplay* floaterDisplay; - aFloater->GetStyleData(kStyleDisplaySID, (nsStyleStruct*&)floaterDisplay); + aFloater->GetStyleData(eStyleStruct_Display, (nsStyleStruct*&)floaterDisplay); // Commit some space in the space manager and adjust our current // band of available space. @@ -1568,7 +1564,7 @@ nsBlockFrame::PlaceBelowCurrentLineFloaters(nsBlockReflowState& aState, // Get the type of floater nsStyleDisplay* sd; - floater->GetStyleData(kStyleDisplaySID, (nsStyleStruct*&)sd); + floater->GetStyleData(eStyleStruct_Display, (nsStyleStruct*&)sd); floater->GetRect(region); // XXX GetAvailableSpace() is translating availSpace by aState.mY... diff --git a/mozilla/layout/generic/nsBlockReflowState.cpp b/mozilla/layout/generic/nsBlockReflowState.cpp index 23b029f3560..784fae9fd1d 100644 --- a/mozilla/layout/generic/nsBlockReflowState.cpp +++ b/mozilla/layout/generic/nsBlockReflowState.cpp @@ -33,10 +33,6 @@ // XXX what do we do with catastrophic errors (rv < 0)? What is the // state of the reflow world after such an error? -static NS_DEFINE_IID(kStyleDisplaySID, NS_STYLEDISPLAY_SID); -static NS_DEFINE_IID(kStylePositionSID, NS_STYLEPOSITION_SID); -static NS_DEFINE_IID(kStyleSpacingSID, NS_STYLESPACING_SID); - static NS_DEFINE_IID(kIAnchoredItemsIID, NS_IANCHOREDITEMS_IID); static NS_DEFINE_IID(kIRunaroundIID, NS_IRUNAROUND_IID); static NS_DEFINE_IID(kIFloaterContainerIID, NS_IFLOATERCONTAINER_IID); @@ -63,7 +59,7 @@ void nsBlockBandData::ComputeAvailSpaceRect() nsStyleDisplay* display; // XXX Handle the case of multiple frames - trapezoid->frame->GetStyleData(kStyleDisplaySID, (nsStyleStruct*&)display); + trapezoid->frame->GetStyleData(eStyleStruct_Display, (nsStyleStruct*&)display); if (NS_STYLE_FLOAT_RIGHT == display->mFloats) { break; } @@ -85,7 +81,7 @@ void nsBlockBandData::ComputeAvailSpaceRect() trapezoid->GetRect(availSpace); // XXX Handle the case of multiple frames - trapezoid->frame->GetStyleData(kStyleDisplaySID, (nsStyleStruct*&)display); + trapezoid->frame->GetStyleData(eStyleStruct_Display, (nsStyleStruct*&)display); if (NS_STYLE_FLOAT_LEFT == display->mFloats) { availSpace.x = availSpace.XMost(); } @@ -167,7 +163,7 @@ nsresult nsBlockReflowState::RecoverState(nsLineData* aLine) nsStyleSpacing* kidSpacing; nsIFrame* kid = prevLine->mFirstChild; - kid->GetStyleData(kStyleSpacingSID, (nsStyleStruct*&)kidSpacing); + kid->GetStyleData(eStyleStruct_Spacing, (nsStyleStruct*&)kidSpacing); nsMargin kidMargin; kidSpacing->CalcMarginFor(kid, kidMargin); if (kidMargin.bottom < 0) { @@ -948,9 +944,9 @@ nsBlockFrame::InitializeState(nsIPresContext* aPresContext, // Apply border and padding adjustments for regular frames only if (!aState.mBlockIsPseudo) { nsStyleSpacing* mySpacing = (nsStyleSpacing*) - mStyleContext->GetData(kStyleSpacingSID); + mStyleContext->GetData(eStyleStruct_Spacing); nsStylePosition* myPosition = (nsStylePosition*) - mStyleContext->GetData(kStylePositionSID); + mStyleContext->GetData(eStyleStruct_Position); mySpacing->CalcBorderPaddingFor(this, aState.mBorderPadding); aState.mY = aState.mBorderPadding.top; @@ -1507,7 +1503,7 @@ nsBlockFrame::PlaceFloater(nsIPresContext* aPresContext, // Get the type of floater nsStyleDisplay* floaterDisplay; - aFloater->GetStyleData(kStyleDisplaySID, (nsStyleStruct*&)floaterDisplay); + aFloater->GetStyleData(eStyleStruct_Display, (nsStyleStruct*&)floaterDisplay); // Commit some space in the space manager and adjust our current // band of available space. @@ -1568,7 +1564,7 @@ nsBlockFrame::PlaceBelowCurrentLineFloaters(nsBlockReflowState& aState, // Get the type of floater nsStyleDisplay* sd; - floater->GetStyleData(kStyleDisplaySID, (nsStyleStruct*&)sd); + floater->GetStyleData(eStyleStruct_Display, (nsStyleStruct*&)sd); floater->GetRect(region); // XXX GetAvailableSpace() is translating availSpace by aState.mY... diff --git a/mozilla/layout/generic/nsBlockReflowState.h b/mozilla/layout/generic/nsBlockReflowState.h index 23b029f3560..784fae9fd1d 100644 --- a/mozilla/layout/generic/nsBlockReflowState.h +++ b/mozilla/layout/generic/nsBlockReflowState.h @@ -33,10 +33,6 @@ // XXX what do we do with catastrophic errors (rv < 0)? What is the // state of the reflow world after such an error? -static NS_DEFINE_IID(kStyleDisplaySID, NS_STYLEDISPLAY_SID); -static NS_DEFINE_IID(kStylePositionSID, NS_STYLEPOSITION_SID); -static NS_DEFINE_IID(kStyleSpacingSID, NS_STYLESPACING_SID); - static NS_DEFINE_IID(kIAnchoredItemsIID, NS_IANCHOREDITEMS_IID); static NS_DEFINE_IID(kIRunaroundIID, NS_IRUNAROUND_IID); static NS_DEFINE_IID(kIFloaterContainerIID, NS_IFLOATERCONTAINER_IID); @@ -63,7 +59,7 @@ void nsBlockBandData::ComputeAvailSpaceRect() nsStyleDisplay* display; // XXX Handle the case of multiple frames - trapezoid->frame->GetStyleData(kStyleDisplaySID, (nsStyleStruct*&)display); + trapezoid->frame->GetStyleData(eStyleStruct_Display, (nsStyleStruct*&)display); if (NS_STYLE_FLOAT_RIGHT == display->mFloats) { break; } @@ -85,7 +81,7 @@ void nsBlockBandData::ComputeAvailSpaceRect() trapezoid->GetRect(availSpace); // XXX Handle the case of multiple frames - trapezoid->frame->GetStyleData(kStyleDisplaySID, (nsStyleStruct*&)display); + trapezoid->frame->GetStyleData(eStyleStruct_Display, (nsStyleStruct*&)display); if (NS_STYLE_FLOAT_LEFT == display->mFloats) { availSpace.x = availSpace.XMost(); } @@ -167,7 +163,7 @@ nsresult nsBlockReflowState::RecoverState(nsLineData* aLine) nsStyleSpacing* kidSpacing; nsIFrame* kid = prevLine->mFirstChild; - kid->GetStyleData(kStyleSpacingSID, (nsStyleStruct*&)kidSpacing); + kid->GetStyleData(eStyleStruct_Spacing, (nsStyleStruct*&)kidSpacing); nsMargin kidMargin; kidSpacing->CalcMarginFor(kid, kidMargin); if (kidMargin.bottom < 0) { @@ -948,9 +944,9 @@ nsBlockFrame::InitializeState(nsIPresContext* aPresContext, // Apply border and padding adjustments for regular frames only if (!aState.mBlockIsPseudo) { nsStyleSpacing* mySpacing = (nsStyleSpacing*) - mStyleContext->GetData(kStyleSpacingSID); + mStyleContext->GetData(eStyleStruct_Spacing); nsStylePosition* myPosition = (nsStylePosition*) - mStyleContext->GetData(kStylePositionSID); + mStyleContext->GetData(eStyleStruct_Position); mySpacing->CalcBorderPaddingFor(this, aState.mBorderPadding); aState.mY = aState.mBorderPadding.top; @@ -1507,7 +1503,7 @@ nsBlockFrame::PlaceFloater(nsIPresContext* aPresContext, // Get the type of floater nsStyleDisplay* floaterDisplay; - aFloater->GetStyleData(kStyleDisplaySID, (nsStyleStruct*&)floaterDisplay); + aFloater->GetStyleData(eStyleStruct_Display, (nsStyleStruct*&)floaterDisplay); // Commit some space in the space manager and adjust our current // band of available space. @@ -1568,7 +1564,7 @@ nsBlockFrame::PlaceBelowCurrentLineFloaters(nsBlockReflowState& aState, // Get the type of floater nsStyleDisplay* sd; - floater->GetStyleData(kStyleDisplaySID, (nsStyleStruct*&)sd); + floater->GetStyleData(eStyleStruct_Display, (nsStyleStruct*&)sd); floater->GetRect(region); // XXX GetAvailableSpace() is translating availSpace by aState.mY... diff --git a/mozilla/layout/generic/nsHTMLContainerFrame.cpp b/mozilla/layout/generic/nsHTMLContainerFrame.cpp index fb3d16292c5..a3074c3aa6c 100644 --- a/mozilla/layout/generic/nsHTMLContainerFrame.cpp +++ b/mozilla/layout/generic/nsHTMLContainerFrame.cpp @@ -36,11 +36,6 @@ #include "nsPlaceholderFrame.h" #include "nsIContentDelegate.h" -static NS_DEFINE_IID(kStyleSpacingSID, NS_STYLESPACING_SID); -static NS_DEFINE_IID(kStyleColorSID, NS_STYLECOLOR_SID); -static NS_DEFINE_IID(kStylePositionSID, NS_STYLEPOSITION_SID); -static NS_DEFINE_IID(kStyleDisplaySID, NS_STYLEDISPLAY_SID); - NS_DEF_PTR(nsIStyleContext); nsHTMLContainerFrame::nsHTMLContainerFrame(nsIContent* aContent, nsIFrame* aParent) @@ -60,9 +55,9 @@ NS_METHOD nsHTMLContainerFrame::Paint(nsIPresContext& aPresContext, if (PR_FALSE == IsPseudoFrame()) { PRIntn skipSides = GetSkipSides(); nsStyleColor* color = - (nsStyleColor*)mStyleContext->GetData(kStyleColorSID); + (nsStyleColor*)mStyleContext->GetData(eStyleStruct_Color); nsStyleSpacing* spacing = - (nsStyleSpacing*)mStyleContext->GetData(kStyleSpacingSID); + (nsStyleSpacing*)mStyleContext->GetData(eStyleStruct_Spacing); nsCSSRendering::PaintBackground(aPresContext, aRenderingContext, this, aDirtyRect, mRect, *color); nsCSSRendering::PaintBorder(aPresContext, aRenderingContext, this, @@ -145,7 +140,7 @@ NS_METHOD nsHTMLContainerFrame::GetCursorAt(nsIPresContext& aPresContext, { // Get my cursor nsStyleColor* styleColor = (nsStyleColor*) - mStyleContext->GetData(kStyleColorSID); + mStyleContext->GetData(eStyleStruct_Color); PRInt32 myCursor = styleColor->mCursor; // Get child's cursor, if any @@ -251,9 +246,9 @@ nsHTMLContainerFrame::CreateFrameFor(nsIPresContext* aPresContext, { // Get the style data for the frame nsStylePosition* position = (nsStylePosition*) - aStyleContext->GetData(kStylePositionSID); + aStyleContext->GetData(eStyleStruct_Position); nsStyleDisplay* display = (nsStyleDisplay*) - aStyleContext->GetData(kStyleDisplaySID); + aStyleContext->GetData(eStyleStruct_Display); nsIFrame* frame = nsnull; // See whether it wants any special handling diff --git a/mozilla/layout/generic/nsIFrame.h b/mozilla/layout/generic/nsIFrame.h index 44d6e03e983..a9578c11133 100644 --- a/mozilla/layout/generic/nsIFrame.h +++ b/mozilla/layout/generic/nsIFrame.h @@ -23,6 +23,7 @@ #include "nsISupports.h" #include "nsSize.h" #include "nsGUIEvent.h" +#include "nsStyleStruct.h" class nsIContent; class nsIPresContext; @@ -168,7 +169,7 @@ public: /** * Get the style data associated with this frame */ - NS_IMETHOD GetStyleData(const nsIID& aSID, nsStyleStruct*& aStyleStruct) const = 0; + NS_IMETHOD GetStyleData(nsStyleStructID aSID, nsStyleStruct*& aStyleStruct) const = 0; /** * Accessor functions for geometric and content parent. diff --git a/mozilla/layout/generic/nsInlineFrame.cpp b/mozilla/layout/generic/nsInlineFrame.cpp index be177d28030..9657529484f 100644 --- a/mozilla/layout/generic/nsInlineFrame.cpp +++ b/mozilla/layout/generic/nsInlineFrame.cpp @@ -45,11 +45,6 @@ #define DEFAULT_ASCENT_LEN 10 -static NS_DEFINE_IID(kStylePositionSID, NS_STYLEPOSITION_SID); -static NS_DEFINE_IID(kStyleFontSID, NS_STYLEFONT_SID); -static NS_DEFINE_IID(kStyleDisplaySID, NS_STYLEDISPLAY_SID); -static NS_DEFINE_IID(kStyleSpacingSID, NS_STYLESPACING_SID); - NS_DEF_PTR(nsIStyleContext); NS_DEF_PTR(nsIContent); NS_DEF_PTR(nsIContentDelegate); @@ -593,9 +588,9 @@ nsReflowStatus nsInlineFrame::ReflowUnmappedChildren(nsIPresContext* aPresContex // Figure out how we should treat the child nsIFrame* kidFrame; nsStyleDisplay* kidDisplay = - (nsStyleDisplay*)kidStyleContext->GetData(kStyleDisplaySID); + (nsStyleDisplay*)kidStyleContext->GetData(eStyleStruct_Display); nsStylePosition* kidPosition = (nsStylePosition*) - kidStyleContext->GetData(kStylePositionSID); + kidStyleContext->GetData(eStyleStruct_Position); // Check whether it wants to floated or absolutely positioned nsresult rv; @@ -736,9 +731,9 @@ NS_METHOD nsInlineFrame::ResizeReflow(nsIPresContext* aPresContext, // Get the style molecule nsStyleFont* styleFont = (nsStyleFont*) - mStyleContext->GetData(kStyleFontSID); + mStyleContext->GetData(eStyleStruct_Font); nsStyleSpacing* styleSpacing = (nsStyleSpacing*) - mStyleContext->GetData(kStyleSpacingSID); + mStyleContext->GetData(eStyleStruct_Spacing); // Check for an overflow list MoveOverflowToChildList(); @@ -994,9 +989,9 @@ NS_METHOD nsInlineFrame::IncrementalReflow(nsIPresContext* aPresContext, // Get the style molecule nsStyleFont* styleFont = - (nsStyleFont*)mStyleContext->GetData(kStyleFontSID); + (nsStyleFont*)mStyleContext->GetData(eStyleStruct_Font); nsStyleSpacing* styleSpacing = - (nsStyleSpacing*)mStyleContext->GetData(kStyleSpacingSID); + (nsStyleSpacing*)mStyleContext->GetData(eStyleStruct_Spacing); nscoord lineHeight; PRInt32 kidIndex; diff --git a/mozilla/layout/generic/nsLeafFrame.cpp b/mozilla/layout/generic/nsLeafFrame.cpp index 84609de9711..94dd7de19be 100644 --- a/mozilla/layout/generic/nsLeafFrame.cpp +++ b/mozilla/layout/generic/nsLeafFrame.cpp @@ -19,10 +19,6 @@ #include "nsIStyleContext.h" #include "nsCSSRendering.h" -static NS_DEFINE_IID(kStyleColorSID, NS_STYLECOLOR_SID); -static NS_DEFINE_IID(kStylePositionSID, NS_STYLEPOSITION_SID); -static NS_DEFINE_IID(kStyleSpacingSID, NS_STYLESPACING_SID); - nsLeafFrame::nsLeafFrame(nsIContent* aContent, nsIFrame* aParentFrame) : nsFrame(aContent, aParentFrame) { @@ -37,9 +33,9 @@ NS_METHOD nsLeafFrame::Paint(nsIPresContext& aPresContext, const nsRect& aDirtyRect) { nsStyleColor* myColor = - (nsStyleColor*)mStyleContext->GetData(kStyleColorSID); + (nsStyleColor*)mStyleContext->GetData(eStyleStruct_Color); nsStyleSpacing* mySpacing = - (nsStyleSpacing*)mStyleContext->GetData(kStyleSpacingSID); + (nsStyleSpacing*)mStyleContext->GetData(eStyleStruct_Spacing); nsCSSRendering::PaintBackground(aPresContext, aRenderingContext, this, aDirtyRect, mRect, *myColor); nsCSSRendering::PaintBorder(aPresContext, aRenderingContext, this, @@ -91,7 +87,7 @@ void nsLeafFrame::AddBordersAndPadding(nsIPresContext* aPresContext, nsReflowMetrics& aDesiredSize) { nsStyleSpacing* space = - (nsStyleSpacing*)mStyleContext->GetData(kStyleSpacingSID); + (nsStyleSpacing*)mStyleContext->GetData(eStyleStruct_Spacing); nsMargin borderPadding; space->CalcBorderPaddingFor(this, borderPadding); aDesiredSize.width += borderPadding.left + borderPadding.right; @@ -104,7 +100,7 @@ void nsLeafFrame::GetInnerArea(nsIPresContext* aPresContext, nsRect& aInnerArea) const { nsStyleSpacing* space = - (nsStyleSpacing*)mStyleContext->GetData(kStyleSpacingSID); + (nsStyleSpacing*)mStyleContext->GetData(eStyleStruct_Spacing); nsMargin borderPadding; space->CalcBorderPaddingFor(this, borderPadding); aInnerArea.x = borderPadding.left; diff --git a/mozilla/layout/generic/nsLineLayout.cpp b/mozilla/layout/generic/nsLineLayout.cpp index 483bfe0b73c..a3fe701abd6 100644 --- a/mozilla/layout/generic/nsLineLayout.cpp +++ b/mozilla/layout/generic/nsLineLayout.cpp @@ -32,12 +32,6 @@ #undef NOISY_REFLOW -static NS_DEFINE_IID(kStyleDisplaySID, NS_STYLEDISPLAY_SID); -static NS_DEFINE_IID(kStyleFontSID, NS_STYLEFONT_SID); -static NS_DEFINE_IID(kStylePositionSID, NS_STYLEPOSITION_SID); -static NS_DEFINE_IID(kStyleSpacingSID, NS_STYLESPACING_SID); -static NS_DEFINE_IID(kStyleTextSID, NS_STYLETEXT_SID); - NS_DEF_PTR(nsIContent); NS_DEF_PTR(nsIStyleContext); @@ -317,7 +311,7 @@ nsLineLayout::WordBreakReflow() return rv; } nsStyleSpacing* kidSpacing = (nsStyleSpacing*) - kidSC->GetData(kStyleSpacingSID); + kidSC->GetData(eStyleStruct_Spacing); nsMargin kidMargin; kidSpacing->CalcMarginFor(frame, kidMargin); kidAvailSize.width -= kidMargin.left + kidMargin.right; @@ -443,9 +437,9 @@ nsLineLayout::ReflowMappedChild(nsReflowCommand* aReflowCommand) return rv; } nsStyleSpacing* kidSpacing = (nsStyleSpacing*) - kidSC->GetData(kStyleSpacingSID); + kidSC->GetData(eStyleStruct_Spacing); nsStyleDisplay* kidDisplay = (nsStyleDisplay*) - kidSC->GetData(kStyleDisplaySID); + kidSC->GetData(eStyleStruct_Display); PRBool isBlock = PR_FALSE; switch (kidDisplay->mDisplay) { case NS_STYLE_DISPLAY_BLOCK: @@ -546,7 +540,7 @@ nsLineLayout::ReflowChild(nsReflowCommand* aReflowCommand) // XXX floating frames // XXX break-before nsStyleDisplay * kidDisplay = (nsStyleDisplay*) - kidSC->GetData(kStyleDisplaySID); + kidSC->GetData(eStyleStruct_Display); PRBool isBlock = PR_FALSE; PRBool isFirstChild = PRBool(mKidFrame == mLine->mFirstChild); switch (kidDisplay->mDisplay) { @@ -578,7 +572,7 @@ nsLineLayout::ReflowChild(nsReflowCommand* aReflowCommand) kidAvailSize.width = mReflowData.mAvailWidth; kidAvailSize.height = mMaxHeight; nsStyleSpacing* kidSpacing = (nsStyleSpacing*) - kidSC->GetData(kStyleSpacingSID); + kidSC->GetData(eStyleStruct_Spacing); nsMargin kidMargin; kidSpacing->CalcMarginFor(mKidFrame, kidMargin); if (!mUnconstrainedWidth) { @@ -1103,7 +1097,7 @@ nsLineLayout::PullUpChildren() return rv; } nsStyleDisplay* kidDisplay = (nsStyleDisplay*) - kidSC->GetData(kStyleDisplaySID); + kidSC->GetData(eStyleStruct_Display); if (IsBlock(kidDisplay)) { if ((nsnull != mLine->mPrevLine) || (0 != mLine->mChildCount)) { goto done; @@ -1209,9 +1203,9 @@ nsLineLayout::CreateFrameFor(nsIContent* aKid) return NS_ERROR_OUT_OF_MEMORY; } nsStylePosition* kidPosition = (nsStylePosition*) - kidSC->GetData(kStylePositionSID); + kidSC->GetData(eStyleStruct_Position); nsStyleDisplay* kidDisplay = (nsStyleDisplay*) - kidSC->GetData(kStyleDisplaySID); + kidSC->GetData(eStyleStruct_Display); // Check whether it wants to floated or absolutely positioned PRBool isBlock = PR_FALSE; @@ -1431,9 +1425,9 @@ nsLineLayout::AlignChildren() nsIStyleContextPtr blockSC; mBlock->GetStyleContext(mPresContext, blockSC.AssignRef()); nsStyleFont* blockFont = (nsStyleFont*) - blockSC->GetData(kStyleFontSID); + blockSC->GetData(eStyleStruct_Font); nsStyleText* blockText = (nsStyleText*) - blockSC->GetData(kStyleTextSID); + blockSC->GetData(eStyleStruct_Text); // First vertically align the children on the line; this will // compute the actual line height for us. diff --git a/mozilla/layout/html/base/src/nsAbsoluteFrame.cpp b/mozilla/layout/html/base/src/nsAbsoluteFrame.cpp index 7a84392b781..123cbb281d5 100644 --- a/mozilla/layout/html/base/src/nsAbsoluteFrame.cpp +++ b/mozilla/layout/html/base/src/nsAbsoluteFrame.cpp @@ -28,7 +28,6 @@ #include "nsStyleConsts.h" #include "nsViewsCID.h" -static NS_DEFINE_IID(kStylePositionSID, NS_STYLEPOSITION_SID); static NS_DEFINE_IID(kIScrollableViewIID, NS_ISCROLLABLEVIEW_IID); NS_DEF_PTR(nsIStyleContext); @@ -144,7 +143,7 @@ void AbsoluteFrame::ComputeViewBounds(const nsRect& aContainingInnerRect, { // Compute the offset and size of the view based on the position properties // and the inner rect of the containing block - nsStylePosition* position = (nsStylePosition*)mStyleContext->GetData(kStylePositionSID); + nsStylePosition* position = (nsStylePosition*)mStyleContext->GetData(eStyleStruct_Position); // x-offset if (eStyleUnit_Auto == position->mLeftOffset.GetUnit()) { @@ -219,7 +218,7 @@ nsIFrame* AbsoluteFrame::GetContainingBlock() nsStylePosition* position; // Get the style data - result->GetStyleData(kStylePositionSID, (nsStyleStruct*&)position); + result->GetStyleData(eStyleStruct_Position, (nsStyleStruct*&)position); if (position->mPosition == NS_STYLE_POSITION_ABSOLUTE) { break; @@ -282,7 +281,7 @@ NS_METHOD AbsoluteFrame::ResizeReflow(nsIPresContext* aPresContext, containingRect.x = containingRect.y = 0; // Use the position properties to determine the offset and size - nsStylePosition* position = (nsStylePosition*)mStyleContext->GetData(kStylePositionSID); + nsStylePosition* position = (nsStylePosition*)mStyleContext->GetData(eStyleStruct_Position); nsRect rect; ComputeViewBounds(containingRect, position, rect); diff --git a/mozilla/layout/html/base/src/nsBRPart.cpp b/mozilla/layout/html/base/src/nsBRPart.cpp index 721e77cb709..f254047d6cc 100644 --- a/mozilla/layout/html/base/src/nsBRPart.cpp +++ b/mozilla/layout/html/base/src/nsBRPart.cpp @@ -30,8 +30,6 @@ #include "nsIFontMetrics.h" #include "nsIRenderingContext.h" -static NS_DEFINE_IID(kStyleFontSID, NS_STYLEFONT_SID); -static NS_DEFINE_IID(kStyleColorSID, NS_STYLECOLOR_SID); class BRFrame : public nsFrame { @@ -69,7 +67,7 @@ NS_METHOD BRFrame::Paint(nsIPresContext& aPresContext, { if (nsIFrame::GetShowFrameBorders()) { nsStyleColor* color = (nsStyleColor*) - mStyleContext->GetData(kStyleColorSID); + mStyleContext->GetData(eStyleStruct_Color); float p2t = aPresContext.GetPixelsToTwips(); aRenderingContext.SetColor(color->mColor); aRenderingContext.FillRect(0, 0, nscoord(5 * p2t), mRect.height); @@ -81,7 +79,7 @@ NS_METHOD BRFrame::GetReflowMetrics(nsIPresContext* aPresContext, nsReflowMetric { // We have no width, but we're the height of the default font nsStyleFont* font = - (nsStyleFont*)mStyleContext->GetData(kStyleFontSID); + (nsStyleFont*)mStyleContext->GetData(eStyleStruct_Font); nsIFontMetrics* fm = aPresContext->GetMetricsFor(font->mFont); aMetrics.width = 0; diff --git a/mozilla/layout/html/base/src/nsBlockFrame.cpp b/mozilla/layout/html/base/src/nsBlockFrame.cpp index 23b029f3560..784fae9fd1d 100644 --- a/mozilla/layout/html/base/src/nsBlockFrame.cpp +++ b/mozilla/layout/html/base/src/nsBlockFrame.cpp @@ -33,10 +33,6 @@ // XXX what do we do with catastrophic errors (rv < 0)? What is the // state of the reflow world after such an error? -static NS_DEFINE_IID(kStyleDisplaySID, NS_STYLEDISPLAY_SID); -static NS_DEFINE_IID(kStylePositionSID, NS_STYLEPOSITION_SID); -static NS_DEFINE_IID(kStyleSpacingSID, NS_STYLESPACING_SID); - static NS_DEFINE_IID(kIAnchoredItemsIID, NS_IANCHOREDITEMS_IID); static NS_DEFINE_IID(kIRunaroundIID, NS_IRUNAROUND_IID); static NS_DEFINE_IID(kIFloaterContainerIID, NS_IFLOATERCONTAINER_IID); @@ -63,7 +59,7 @@ void nsBlockBandData::ComputeAvailSpaceRect() nsStyleDisplay* display; // XXX Handle the case of multiple frames - trapezoid->frame->GetStyleData(kStyleDisplaySID, (nsStyleStruct*&)display); + trapezoid->frame->GetStyleData(eStyleStruct_Display, (nsStyleStruct*&)display); if (NS_STYLE_FLOAT_RIGHT == display->mFloats) { break; } @@ -85,7 +81,7 @@ void nsBlockBandData::ComputeAvailSpaceRect() trapezoid->GetRect(availSpace); // XXX Handle the case of multiple frames - trapezoid->frame->GetStyleData(kStyleDisplaySID, (nsStyleStruct*&)display); + trapezoid->frame->GetStyleData(eStyleStruct_Display, (nsStyleStruct*&)display); if (NS_STYLE_FLOAT_LEFT == display->mFloats) { availSpace.x = availSpace.XMost(); } @@ -167,7 +163,7 @@ nsresult nsBlockReflowState::RecoverState(nsLineData* aLine) nsStyleSpacing* kidSpacing; nsIFrame* kid = prevLine->mFirstChild; - kid->GetStyleData(kStyleSpacingSID, (nsStyleStruct*&)kidSpacing); + kid->GetStyleData(eStyleStruct_Spacing, (nsStyleStruct*&)kidSpacing); nsMargin kidMargin; kidSpacing->CalcMarginFor(kid, kidMargin); if (kidMargin.bottom < 0) { @@ -948,9 +944,9 @@ nsBlockFrame::InitializeState(nsIPresContext* aPresContext, // Apply border and padding adjustments for regular frames only if (!aState.mBlockIsPseudo) { nsStyleSpacing* mySpacing = (nsStyleSpacing*) - mStyleContext->GetData(kStyleSpacingSID); + mStyleContext->GetData(eStyleStruct_Spacing); nsStylePosition* myPosition = (nsStylePosition*) - mStyleContext->GetData(kStylePositionSID); + mStyleContext->GetData(eStyleStruct_Position); mySpacing->CalcBorderPaddingFor(this, aState.mBorderPadding); aState.mY = aState.mBorderPadding.top; @@ -1507,7 +1503,7 @@ nsBlockFrame::PlaceFloater(nsIPresContext* aPresContext, // Get the type of floater nsStyleDisplay* floaterDisplay; - aFloater->GetStyleData(kStyleDisplaySID, (nsStyleStruct*&)floaterDisplay); + aFloater->GetStyleData(eStyleStruct_Display, (nsStyleStruct*&)floaterDisplay); // Commit some space in the space manager and adjust our current // band of available space. @@ -1568,7 +1564,7 @@ nsBlockFrame::PlaceBelowCurrentLineFloaters(nsBlockReflowState& aState, // Get the type of floater nsStyleDisplay* sd; - floater->GetStyleData(kStyleDisplaySID, (nsStyleStruct*&)sd); + floater->GetStyleData(eStyleStruct_Display, (nsStyleStruct*&)sd); floater->GetRect(region); // XXX GetAvailableSpace() is translating availSpace by aState.mY... diff --git a/mozilla/layout/html/base/src/nsBlockReflowState.cpp b/mozilla/layout/html/base/src/nsBlockReflowState.cpp index 23b029f3560..784fae9fd1d 100644 --- a/mozilla/layout/html/base/src/nsBlockReflowState.cpp +++ b/mozilla/layout/html/base/src/nsBlockReflowState.cpp @@ -33,10 +33,6 @@ // XXX what do we do with catastrophic errors (rv < 0)? What is the // state of the reflow world after such an error? -static NS_DEFINE_IID(kStyleDisplaySID, NS_STYLEDISPLAY_SID); -static NS_DEFINE_IID(kStylePositionSID, NS_STYLEPOSITION_SID); -static NS_DEFINE_IID(kStyleSpacingSID, NS_STYLESPACING_SID); - static NS_DEFINE_IID(kIAnchoredItemsIID, NS_IANCHOREDITEMS_IID); static NS_DEFINE_IID(kIRunaroundIID, NS_IRUNAROUND_IID); static NS_DEFINE_IID(kIFloaterContainerIID, NS_IFLOATERCONTAINER_IID); @@ -63,7 +59,7 @@ void nsBlockBandData::ComputeAvailSpaceRect() nsStyleDisplay* display; // XXX Handle the case of multiple frames - trapezoid->frame->GetStyleData(kStyleDisplaySID, (nsStyleStruct*&)display); + trapezoid->frame->GetStyleData(eStyleStruct_Display, (nsStyleStruct*&)display); if (NS_STYLE_FLOAT_RIGHT == display->mFloats) { break; } @@ -85,7 +81,7 @@ void nsBlockBandData::ComputeAvailSpaceRect() trapezoid->GetRect(availSpace); // XXX Handle the case of multiple frames - trapezoid->frame->GetStyleData(kStyleDisplaySID, (nsStyleStruct*&)display); + trapezoid->frame->GetStyleData(eStyleStruct_Display, (nsStyleStruct*&)display); if (NS_STYLE_FLOAT_LEFT == display->mFloats) { availSpace.x = availSpace.XMost(); } @@ -167,7 +163,7 @@ nsresult nsBlockReflowState::RecoverState(nsLineData* aLine) nsStyleSpacing* kidSpacing; nsIFrame* kid = prevLine->mFirstChild; - kid->GetStyleData(kStyleSpacingSID, (nsStyleStruct*&)kidSpacing); + kid->GetStyleData(eStyleStruct_Spacing, (nsStyleStruct*&)kidSpacing); nsMargin kidMargin; kidSpacing->CalcMarginFor(kid, kidMargin); if (kidMargin.bottom < 0) { @@ -948,9 +944,9 @@ nsBlockFrame::InitializeState(nsIPresContext* aPresContext, // Apply border and padding adjustments for regular frames only if (!aState.mBlockIsPseudo) { nsStyleSpacing* mySpacing = (nsStyleSpacing*) - mStyleContext->GetData(kStyleSpacingSID); + mStyleContext->GetData(eStyleStruct_Spacing); nsStylePosition* myPosition = (nsStylePosition*) - mStyleContext->GetData(kStylePositionSID); + mStyleContext->GetData(eStyleStruct_Position); mySpacing->CalcBorderPaddingFor(this, aState.mBorderPadding); aState.mY = aState.mBorderPadding.top; @@ -1507,7 +1503,7 @@ nsBlockFrame::PlaceFloater(nsIPresContext* aPresContext, // Get the type of floater nsStyleDisplay* floaterDisplay; - aFloater->GetStyleData(kStyleDisplaySID, (nsStyleStruct*&)floaterDisplay); + aFloater->GetStyleData(eStyleStruct_Display, (nsStyleStruct*&)floaterDisplay); // Commit some space in the space manager and adjust our current // band of available space. @@ -1568,7 +1564,7 @@ nsBlockFrame::PlaceBelowCurrentLineFloaters(nsBlockReflowState& aState, // Get the type of floater nsStyleDisplay* sd; - floater->GetStyleData(kStyleDisplaySID, (nsStyleStruct*&)sd); + floater->GetStyleData(eStyleStruct_Display, (nsStyleStruct*&)sd); floater->GetRect(region); // XXX GetAvailableSpace() is translating availSpace by aState.mY... diff --git a/mozilla/layout/html/base/src/nsBlockReflowState.h b/mozilla/layout/html/base/src/nsBlockReflowState.h index 23b029f3560..784fae9fd1d 100644 --- a/mozilla/layout/html/base/src/nsBlockReflowState.h +++ b/mozilla/layout/html/base/src/nsBlockReflowState.h @@ -33,10 +33,6 @@ // XXX what do we do with catastrophic errors (rv < 0)? What is the // state of the reflow world after such an error? -static NS_DEFINE_IID(kStyleDisplaySID, NS_STYLEDISPLAY_SID); -static NS_DEFINE_IID(kStylePositionSID, NS_STYLEPOSITION_SID); -static NS_DEFINE_IID(kStyleSpacingSID, NS_STYLESPACING_SID); - static NS_DEFINE_IID(kIAnchoredItemsIID, NS_IANCHOREDITEMS_IID); static NS_DEFINE_IID(kIRunaroundIID, NS_IRUNAROUND_IID); static NS_DEFINE_IID(kIFloaterContainerIID, NS_IFLOATERCONTAINER_IID); @@ -63,7 +59,7 @@ void nsBlockBandData::ComputeAvailSpaceRect() nsStyleDisplay* display; // XXX Handle the case of multiple frames - trapezoid->frame->GetStyleData(kStyleDisplaySID, (nsStyleStruct*&)display); + trapezoid->frame->GetStyleData(eStyleStruct_Display, (nsStyleStruct*&)display); if (NS_STYLE_FLOAT_RIGHT == display->mFloats) { break; } @@ -85,7 +81,7 @@ void nsBlockBandData::ComputeAvailSpaceRect() trapezoid->GetRect(availSpace); // XXX Handle the case of multiple frames - trapezoid->frame->GetStyleData(kStyleDisplaySID, (nsStyleStruct*&)display); + trapezoid->frame->GetStyleData(eStyleStruct_Display, (nsStyleStruct*&)display); if (NS_STYLE_FLOAT_LEFT == display->mFloats) { availSpace.x = availSpace.XMost(); } @@ -167,7 +163,7 @@ nsresult nsBlockReflowState::RecoverState(nsLineData* aLine) nsStyleSpacing* kidSpacing; nsIFrame* kid = prevLine->mFirstChild; - kid->GetStyleData(kStyleSpacingSID, (nsStyleStruct*&)kidSpacing); + kid->GetStyleData(eStyleStruct_Spacing, (nsStyleStruct*&)kidSpacing); nsMargin kidMargin; kidSpacing->CalcMarginFor(kid, kidMargin); if (kidMargin.bottom < 0) { @@ -948,9 +944,9 @@ nsBlockFrame::InitializeState(nsIPresContext* aPresContext, // Apply border and padding adjustments for regular frames only if (!aState.mBlockIsPseudo) { nsStyleSpacing* mySpacing = (nsStyleSpacing*) - mStyleContext->GetData(kStyleSpacingSID); + mStyleContext->GetData(eStyleStruct_Spacing); nsStylePosition* myPosition = (nsStylePosition*) - mStyleContext->GetData(kStylePositionSID); + mStyleContext->GetData(eStyleStruct_Position); mySpacing->CalcBorderPaddingFor(this, aState.mBorderPadding); aState.mY = aState.mBorderPadding.top; @@ -1507,7 +1503,7 @@ nsBlockFrame::PlaceFloater(nsIPresContext* aPresContext, // Get the type of floater nsStyleDisplay* floaterDisplay; - aFloater->GetStyleData(kStyleDisplaySID, (nsStyleStruct*&)floaterDisplay); + aFloater->GetStyleData(eStyleStruct_Display, (nsStyleStruct*&)floaterDisplay); // Commit some space in the space manager and adjust our current // band of available space. @@ -1568,7 +1564,7 @@ nsBlockFrame::PlaceBelowCurrentLineFloaters(nsBlockReflowState& aState, // Get the type of floater nsStyleDisplay* sd; - floater->GetStyleData(kStyleDisplaySID, (nsStyleStruct*&)sd); + floater->GetStyleData(eStyleStruct_Display, (nsStyleStruct*&)sd); floater->GetRect(region); // XXX GetAvailableSpace() is translating availSpace by aState.mY... diff --git a/mozilla/layout/html/base/src/nsBodyFrame.cpp b/mozilla/layout/html/base/src/nsBodyFrame.cpp index 5c168a38a34..377d74a31c1 100644 --- a/mozilla/layout/html/base/src/nsBodyFrame.cpp +++ b/mozilla/layout/html/base/src/nsBodyFrame.cpp @@ -33,8 +33,6 @@ static NS_DEFINE_IID(kIRunaroundIID, NS_IRUNAROUND_IID); static NS_DEFINE_IID(kIAnchoredItemsIID, NS_IANCHOREDITEMS_IID); -static NS_DEFINE_IID(kStyleSpacingSID, NS_STYLESPACING_SID); - nsresult nsBodyFrame::NewFrame(nsIFrame** aInstancePtrResult, nsIContent* aContent, nsIFrame* aParent) @@ -155,7 +153,7 @@ NS_METHOD nsBodyFrame::ResizeReflow(nsIPresContext* aPresContext, // Get our border/padding info nsStyleSpacing* mySpacing = - (nsStyleSpacing*)mStyleContext->GetData(kStyleSpacingSID); + (nsStyleSpacing*)mStyleContext->GetData(eStyleStruct_Spacing); nsMargin borderPadding; mySpacing->CalcBorderPaddingFor(this, borderPadding); @@ -257,7 +255,7 @@ NS_METHOD nsBodyFrame::IncrementalReflow(nsIPresContext* aPresContext, // Get our border/padding info nsStyleSpacing* mySpacing = - (nsStyleSpacing*)mStyleContext->GetData(kStyleSpacingSID); + (nsStyleSpacing*)mStyleContext->GetData(eStyleStruct_Spacing); nsMargin borderPadding; mySpacing->CalcBorderPaddingFor(this, borderPadding); diff --git a/mozilla/layout/html/base/src/nsHRPart.cpp b/mozilla/layout/html/base/src/nsHRPart.cpp index d98a52d5a6d..cc8a0c23072 100644 --- a/mozilla/layout/html/base/src/nsHRPart.cpp +++ b/mozilla/layout/html/base/src/nsHRPart.cpp @@ -32,10 +32,6 @@ #undef DEBUG_HR_REFCNT -static NS_DEFINE_IID(kStyleFontSID, NS_STYLEFONT_SID); -static NS_DEFINE_IID(kStyleColorSID, NS_STYLECOLOR_SID); -static NS_DEFINE_IID(kStyleSpacingSID, NS_STYLESPACING_SID); - // Default alignment value (so we can tell an unset value from a set value) #define ALIGN_UNSET PRUint8(-1) @@ -118,9 +114,9 @@ NS_METHOD HRuleFrame::Paint(nsIPresContext& aPresContext, // Get style data nsStyleSpacing* spacing = - (nsStyleSpacing*)mStyleContext->GetData(kStyleSpacingSID); + (nsStyleSpacing*)mStyleContext->GetData(eStyleStruct_Spacing); nsStyleColor* color = - (nsStyleColor*)mStyleContext->GetData(kStyleColorSID); + (nsStyleColor*)mStyleContext->GetData(eStyleStruct_Color); nsMargin borderPadding; spacing->CalcBorderPaddingFor(this, borderPadding); nscoord x0 = borderPadding.left; @@ -256,7 +252,7 @@ void HRuleFrame::GetDesiredSize(nsIPresContext* aPresContext, { // Get style data nsStyleFont* font = - (nsStyleFont*)mStyleContext->GetData(kStyleFontSID); + (nsStyleFont*)mStyleContext->GetData(eStyleStruct_Font); if (aMaxSize.width == NS_UNCONSTRAINEDSIZE) { aDesiredSize.width = 1; diff --git a/mozilla/layout/html/base/src/nsHTMLContainer.cpp b/mozilla/layout/html/base/src/nsHTMLContainer.cpp index d9dfb75fff0..191a61b9a1a 100644 --- a/mozilla/layout/html/base/src/nsHTMLContainer.cpp +++ b/mozilla/layout/html/base/src/nsHTMLContainer.cpp @@ -34,12 +34,6 @@ #include "nsIURL.h" #include "prprf.h" -static NS_DEFINE_IID(kStyleDisplaySID, NS_STYLEDISPLAY_SID); -static NS_DEFINE_IID(kStyleFontSID, NS_STYLEFONT_SID); -static NS_DEFINE_IID(kStyleColorSID, NS_STYLECOLOR_SID); -static NS_DEFINE_IID(kStyleListSID, NS_STYLELIST_SID); -static NS_DEFINE_IID(kStyleTextSID, NS_STYLETEXT_SID); - nsresult NS_NewHTMLContainer(nsIHTMLContent** aInstancePtrResult, nsIAtom* aTag) @@ -189,7 +183,7 @@ nsHTMLContainer::CreateFrame(nsIPresContext* aPresContext, nsIFrame*& aResult) { nsStyleDisplay* styleDisplay = - (nsStyleDisplay*) aStyleContext->GetData(kStyleDisplaySID); + (nsStyleDisplay*) aStyleContext->GetData(eStyleStruct_Display); // Use style to choose what kind of frame to create nsIFrame* frame = nsnull; @@ -459,7 +453,7 @@ void nsHTMLContainer::MapAttributesInto(nsIStyleContext* aContext, // align: enum GetAttribute(nsHTMLAtoms::align, value); if (value.GetUnit() == eHTMLUnit_Enumerated) { - nsStyleText* text = (nsStyleText*)aContext->GetData(kStyleTextSID); + nsStyleText* text = (nsStyleText*)aContext->GetData(eStyleStruct_Text); text->mTextAlign = value.GetIntValue(); } } @@ -471,11 +465,11 @@ void nsHTMLContainer::MapAttributesInto(nsIStyleContext* aContext, } } else if (mTag == nsHTMLAtoms::font) { - nsStyleFont* font = (nsStyleFont*)aContext->GetData(kStyleFontSID); + nsStyleFont* font = (nsStyleFont*)aContext->GetData(eStyleStruct_Font); nsStyleFont* parentFont = font; nsIStyleContext* parentContext = aContext->GetParent(); if (nsnull != parentContext) { - parentFont = (nsStyleFont*)parentContext->GetData(kStyleFontSID); + parentFont = (nsStyleFont*)parentContext->GetData(eStyleStruct_Font); } // face: string list @@ -571,7 +565,7 @@ void nsHTMLContainer::MapAttributesInto(nsIStyleContext* aContext, // color: color GetAttribute(nsHTMLAtoms::color, value); if (value.GetUnit() == eHTMLUnit_Color) { - nsStyleColor* color = (nsStyleColor*)aContext->GetData(kStyleColorSID); + nsStyleColor* color = (nsStyleColor*)aContext->GetData(eStyleStruct_Color); color->mColor = value.GetColorValue(); } else if (value.GetUnit() == eHTMLUnit_String) { @@ -580,7 +574,7 @@ void nsHTMLContainer::MapAttributesInto(nsIStyleContext* aContext, char cbuf[40]; buffer.ToCString(cbuf, sizeof(cbuf)); - nsStyleColor* color = (nsStyleColor*)aContext->GetData(kStyleColorSID); + nsStyleColor* color = (nsStyleColor*)aContext->GetData(eStyleStruct_Color); NS_ColorNameToRGB(cbuf, &(color->mColor)); } @@ -655,7 +649,7 @@ void nsHTMLContainer::MapAttributesInto(nsIStyleContext* aContext, } } else if (mTag == nsHTMLAtoms::li) { - nsStyleList* list = (nsStyleList*)aContext->GetData(kStyleListSID); + nsStyleList* list = (nsStyleList*)aContext->GetData(eStyleStruct_List); // type: enum GetAttribute(nsHTMLAtoms::type, value); @@ -665,7 +659,7 @@ void nsHTMLContainer::MapAttributesInto(nsIStyleContext* aContext, } else if ((mTag == nsHTMLAtoms::ul) || (mTag == nsHTMLAtoms::ol) || (mTag == nsHTMLAtoms::menu) || (mTag == nsHTMLAtoms::dir)) { - nsStyleList* list = (nsStyleList*)aContext->GetData(kStyleListSID); + nsStyleList* list = (nsStyleList*)aContext->GetData(eStyleStruct_List); // type: enum GetAttribute(nsHTMLAtoms::type, value); @@ -716,7 +710,7 @@ nsHTMLContainer::MapBackgroundAttributesInto(nsIStyleContext* aContext, if (nsnull != docURL) { NS_RELEASE(docURL); } - nsStyleColor* color = (nsStyleColor*)aContext->GetData(kStyleColorSID); + nsStyleColor* color = (nsStyleColor*)aContext->GetData(eStyleStruct_Color); color->mBackgroundImage = absURLSpec; color->mBackgroundFlags &= ~NS_STYLE_BG_IMAGE_NONE; color->mBackgroundRepeat = NS_STYLE_BG_REPEAT_XY; @@ -726,7 +720,7 @@ nsHTMLContainer::MapBackgroundAttributesInto(nsIStyleContext* aContext, // bgcolor if (eContentAttr_HasValue == GetAttribute(nsHTMLAtoms::bgcolor, value)) { if (eHTMLUnit_Color == value.GetUnit()) { - nsStyleColor* color = (nsStyleColor*)aContext->GetData(kStyleColorSID); + nsStyleColor* color = (nsStyleColor*)aContext->GetData(eStyleStruct_Color); color->mBackgroundColor = value.GetColorValue(); color->mBackgroundFlags &= ~NS_STYLE_BG_COLOR_TRANSPARENT; } @@ -736,7 +730,7 @@ nsHTMLContainer::MapBackgroundAttributesInto(nsIStyleContext* aContext, char cbuf[40]; buffer.ToCString(cbuf, sizeof(cbuf)); - nsStyleColor* color = (nsStyleColor*)aContext->GetData(kStyleColorSID); + nsStyleColor* color = (nsStyleColor*)aContext->GetData(eStyleStruct_Color); NS_ColorNameToRGB(cbuf, &(color->mBackgroundColor)); color->mBackgroundFlags &= ~NS_STYLE_BG_COLOR_TRANSPARENT; } diff --git a/mozilla/layout/html/base/src/nsHTMLContainerFrame.cpp b/mozilla/layout/html/base/src/nsHTMLContainerFrame.cpp index fb3d16292c5..a3074c3aa6c 100644 --- a/mozilla/layout/html/base/src/nsHTMLContainerFrame.cpp +++ b/mozilla/layout/html/base/src/nsHTMLContainerFrame.cpp @@ -36,11 +36,6 @@ #include "nsPlaceholderFrame.h" #include "nsIContentDelegate.h" -static NS_DEFINE_IID(kStyleSpacingSID, NS_STYLESPACING_SID); -static NS_DEFINE_IID(kStyleColorSID, NS_STYLECOLOR_SID); -static NS_DEFINE_IID(kStylePositionSID, NS_STYLEPOSITION_SID); -static NS_DEFINE_IID(kStyleDisplaySID, NS_STYLEDISPLAY_SID); - NS_DEF_PTR(nsIStyleContext); nsHTMLContainerFrame::nsHTMLContainerFrame(nsIContent* aContent, nsIFrame* aParent) @@ -60,9 +55,9 @@ NS_METHOD nsHTMLContainerFrame::Paint(nsIPresContext& aPresContext, if (PR_FALSE == IsPseudoFrame()) { PRIntn skipSides = GetSkipSides(); nsStyleColor* color = - (nsStyleColor*)mStyleContext->GetData(kStyleColorSID); + (nsStyleColor*)mStyleContext->GetData(eStyleStruct_Color); nsStyleSpacing* spacing = - (nsStyleSpacing*)mStyleContext->GetData(kStyleSpacingSID); + (nsStyleSpacing*)mStyleContext->GetData(eStyleStruct_Spacing); nsCSSRendering::PaintBackground(aPresContext, aRenderingContext, this, aDirtyRect, mRect, *color); nsCSSRendering::PaintBorder(aPresContext, aRenderingContext, this, @@ -145,7 +140,7 @@ NS_METHOD nsHTMLContainerFrame::GetCursorAt(nsIPresContext& aPresContext, { // Get my cursor nsStyleColor* styleColor = (nsStyleColor*) - mStyleContext->GetData(kStyleColorSID); + mStyleContext->GetData(eStyleStruct_Color); PRInt32 myCursor = styleColor->mCursor; // Get child's cursor, if any @@ -251,9 +246,9 @@ nsHTMLContainerFrame::CreateFrameFor(nsIPresContext* aPresContext, { // Get the style data for the frame nsStylePosition* position = (nsStylePosition*) - aStyleContext->GetData(kStylePositionSID); + aStyleContext->GetData(eStyleStruct_Position); nsStyleDisplay* display = (nsStyleDisplay*) - aStyleContext->GetData(kStyleDisplaySID); + aStyleContext->GetData(eStyleStruct_Display); nsIFrame* frame = nsnull; // See whether it wants any special handling diff --git a/mozilla/layout/html/base/src/nsHTMLImage.cpp b/mozilla/layout/html/base/src/nsHTMLImage.cpp index a5b9a93536e..fe68b3da0f9 100644 --- a/mozilla/layout/html/base/src/nsHTMLImage.cpp +++ b/mozilla/layout/html/base/src/nsHTMLImage.cpp @@ -41,9 +41,6 @@ #define BROKEN_IMAGE_URL "resource:/html/broken-image.gif" static NS_DEFINE_IID(kIHTMLDocumentIID, NS_IHTMLDOCUMENT_IID); -static NS_DEFINE_IID(kStyleColorSID, NS_STYLECOLOR_SID); -static NS_DEFINE_IID(kStyleDisplaySID, NS_STYLEDISPLAY_SID); -static NS_DEFINE_IID(kStyleTextSID, NS_STYLETEXT_SID); class ImageFrame : public nsLeafFrame { public: @@ -462,7 +459,7 @@ ImageFrame::GetCursorAt(nsIPresContext& aPresContext, aCursor = NS_STYLE_CURSOR_INHERIT; nsStyleColor* styleColor = (nsStyleColor*) - mStyleContext->GetData(kStyleColorSID); + mStyleContext->GetData(eStyleStruct_Color); if (styleColor->mCursor != NS_STYLE_CURSOR_INHERIT) { // If we have a particular cursor, use it *aFrame = this; @@ -708,9 +705,9 @@ void ImagePart::MapAttributesInto(nsIStyleContext* aContext, { if (ALIGN_UNSET != mAlign) { nsStyleDisplay* display = (nsStyleDisplay*) - aContext->GetData(kStyleDisplaySID); + aContext->GetData(eStyleStruct_Display); nsStyleText* text = (nsStyleText*) - aContext->GetData(kStyleTextSID); + aContext->GetData(eStyleStruct_Text); switch (mAlign) { case NS_STYLE_TEXT_ALIGN_LEFT: display->mFloats = NS_STYLE_FLOAT_LEFT; diff --git a/mozilla/layout/html/base/src/nsHTMLTagContent.cpp b/mozilla/layout/html/base/src/nsHTMLTagContent.cpp index e24c5bef451..9b9f28d7e7e 100644 --- a/mozilla/layout/html/base/src/nsHTMLTagContent.cpp +++ b/mozilla/layout/html/base/src/nsHTMLTagContent.cpp @@ -31,10 +31,6 @@ static NS_DEFINE_IID(kIStyleRuleIID, NS_ISTYLE_RULE_IID); static NS_DEFINE_IID(kIDOMElementIID, NS_IDOMELEMENT_IID); static NS_DEFINE_IID(kIScriptObjectOwner, NS_ISCRIPTOBJECTOWNER_IID); -static NS_DEFINE_IID(kStyleColorSID, NS_STYLECOLOR_SID); -static NS_DEFINE_IID(kStylePositionSID, NS_STYLEPOSITION_SID); -static NS_DEFINE_IID(kStyleSpacingSID, NS_STYLESPACING_SID); - nsHTMLTagContent::nsHTMLTagContent() { } @@ -682,7 +678,7 @@ nsHTMLTagContent::MapImagePropertiesInto(nsIStyleContext* aContext, float p2t = aPresContext->GetPixelsToTwips(); nsStylePosition* pos = (nsStylePosition*) - aContext->GetData(kStylePositionSID); + aContext->GetData(eStyleStruct_Position); // width: value GetAttribute(nsHTMLAtoms::width, value); @@ -731,7 +727,7 @@ nsHTMLTagContent::MapImageBorderInto(nsIStyleContext* aContext, // Fixup border-padding sums: subtract out the old size and then // add in the new size. nsStyleSpacing* spacing = (nsStyleSpacing*) - aContext->GetData(kStyleSpacingSID); + aContext->GetData(eStyleStruct_Spacing); nsStyleCoord coord; coord.SetCoordValue(twips); spacing->mBorder.SetTop(coord); @@ -754,7 +750,7 @@ nsHTMLTagContent::MapImageBorderInto(nsIStyleContext* aContext, else { // Color is inherited from "color" nsStyleColor* styleColor = (nsStyleColor*) - aContext->GetData(kStyleColorSID); + aContext->GetData(eStyleStruct_Color); nscolor color = styleColor->mColor; spacing->mBorderColor[0] = color; spacing->mBorderColor[1] = color; diff --git a/mozilla/layout/html/base/src/nsInlineFrame.cpp b/mozilla/layout/html/base/src/nsInlineFrame.cpp index be177d28030..9657529484f 100644 --- a/mozilla/layout/html/base/src/nsInlineFrame.cpp +++ b/mozilla/layout/html/base/src/nsInlineFrame.cpp @@ -45,11 +45,6 @@ #define DEFAULT_ASCENT_LEN 10 -static NS_DEFINE_IID(kStylePositionSID, NS_STYLEPOSITION_SID); -static NS_DEFINE_IID(kStyleFontSID, NS_STYLEFONT_SID); -static NS_DEFINE_IID(kStyleDisplaySID, NS_STYLEDISPLAY_SID); -static NS_DEFINE_IID(kStyleSpacingSID, NS_STYLESPACING_SID); - NS_DEF_PTR(nsIStyleContext); NS_DEF_PTR(nsIContent); NS_DEF_PTR(nsIContentDelegate); @@ -593,9 +588,9 @@ nsReflowStatus nsInlineFrame::ReflowUnmappedChildren(nsIPresContext* aPresContex // Figure out how we should treat the child nsIFrame* kidFrame; nsStyleDisplay* kidDisplay = - (nsStyleDisplay*)kidStyleContext->GetData(kStyleDisplaySID); + (nsStyleDisplay*)kidStyleContext->GetData(eStyleStruct_Display); nsStylePosition* kidPosition = (nsStylePosition*) - kidStyleContext->GetData(kStylePositionSID); + kidStyleContext->GetData(eStyleStruct_Position); // Check whether it wants to floated or absolutely positioned nsresult rv; @@ -736,9 +731,9 @@ NS_METHOD nsInlineFrame::ResizeReflow(nsIPresContext* aPresContext, // Get the style molecule nsStyleFont* styleFont = (nsStyleFont*) - mStyleContext->GetData(kStyleFontSID); + mStyleContext->GetData(eStyleStruct_Font); nsStyleSpacing* styleSpacing = (nsStyleSpacing*) - mStyleContext->GetData(kStyleSpacingSID); + mStyleContext->GetData(eStyleStruct_Spacing); // Check for an overflow list MoveOverflowToChildList(); @@ -994,9 +989,9 @@ NS_METHOD nsInlineFrame::IncrementalReflow(nsIPresContext* aPresContext, // Get the style molecule nsStyleFont* styleFont = - (nsStyleFont*)mStyleContext->GetData(kStyleFontSID); + (nsStyleFont*)mStyleContext->GetData(eStyleStruct_Font); nsStyleSpacing* styleSpacing = - (nsStyleSpacing*)mStyleContext->GetData(kStyleSpacingSID); + (nsStyleSpacing*)mStyleContext->GetData(eStyleStruct_Spacing); nscoord lineHeight; PRInt32 kidIndex; diff --git a/mozilla/layout/html/base/src/nsLeafFrame.cpp b/mozilla/layout/html/base/src/nsLeafFrame.cpp index 84609de9711..94dd7de19be 100644 --- a/mozilla/layout/html/base/src/nsLeafFrame.cpp +++ b/mozilla/layout/html/base/src/nsLeafFrame.cpp @@ -19,10 +19,6 @@ #include "nsIStyleContext.h" #include "nsCSSRendering.h" -static NS_DEFINE_IID(kStyleColorSID, NS_STYLECOLOR_SID); -static NS_DEFINE_IID(kStylePositionSID, NS_STYLEPOSITION_SID); -static NS_DEFINE_IID(kStyleSpacingSID, NS_STYLESPACING_SID); - nsLeafFrame::nsLeafFrame(nsIContent* aContent, nsIFrame* aParentFrame) : nsFrame(aContent, aParentFrame) { @@ -37,9 +33,9 @@ NS_METHOD nsLeafFrame::Paint(nsIPresContext& aPresContext, const nsRect& aDirtyRect) { nsStyleColor* myColor = - (nsStyleColor*)mStyleContext->GetData(kStyleColorSID); + (nsStyleColor*)mStyleContext->GetData(eStyleStruct_Color); nsStyleSpacing* mySpacing = - (nsStyleSpacing*)mStyleContext->GetData(kStyleSpacingSID); + (nsStyleSpacing*)mStyleContext->GetData(eStyleStruct_Spacing); nsCSSRendering::PaintBackground(aPresContext, aRenderingContext, this, aDirtyRect, mRect, *myColor); nsCSSRendering::PaintBorder(aPresContext, aRenderingContext, this, @@ -91,7 +87,7 @@ void nsLeafFrame::AddBordersAndPadding(nsIPresContext* aPresContext, nsReflowMetrics& aDesiredSize) { nsStyleSpacing* space = - (nsStyleSpacing*)mStyleContext->GetData(kStyleSpacingSID); + (nsStyleSpacing*)mStyleContext->GetData(eStyleStruct_Spacing); nsMargin borderPadding; space->CalcBorderPaddingFor(this, borderPadding); aDesiredSize.width += borderPadding.left + borderPadding.right; @@ -104,7 +100,7 @@ void nsLeafFrame::GetInnerArea(nsIPresContext* aPresContext, nsRect& aInnerArea) const { nsStyleSpacing* space = - (nsStyleSpacing*)mStyleContext->GetData(kStyleSpacingSID); + (nsStyleSpacing*)mStyleContext->GetData(eStyleStruct_Spacing); nsMargin borderPadding; space->CalcBorderPaddingFor(this, borderPadding); aInnerArea.x = borderPadding.left; diff --git a/mozilla/layout/html/base/src/nsLineLayout.cpp b/mozilla/layout/html/base/src/nsLineLayout.cpp index 483bfe0b73c..a3fe701abd6 100644 --- a/mozilla/layout/html/base/src/nsLineLayout.cpp +++ b/mozilla/layout/html/base/src/nsLineLayout.cpp @@ -32,12 +32,6 @@ #undef NOISY_REFLOW -static NS_DEFINE_IID(kStyleDisplaySID, NS_STYLEDISPLAY_SID); -static NS_DEFINE_IID(kStyleFontSID, NS_STYLEFONT_SID); -static NS_DEFINE_IID(kStylePositionSID, NS_STYLEPOSITION_SID); -static NS_DEFINE_IID(kStyleSpacingSID, NS_STYLESPACING_SID); -static NS_DEFINE_IID(kStyleTextSID, NS_STYLETEXT_SID); - NS_DEF_PTR(nsIContent); NS_DEF_PTR(nsIStyleContext); @@ -317,7 +311,7 @@ nsLineLayout::WordBreakReflow() return rv; } nsStyleSpacing* kidSpacing = (nsStyleSpacing*) - kidSC->GetData(kStyleSpacingSID); + kidSC->GetData(eStyleStruct_Spacing); nsMargin kidMargin; kidSpacing->CalcMarginFor(frame, kidMargin); kidAvailSize.width -= kidMargin.left + kidMargin.right; @@ -443,9 +437,9 @@ nsLineLayout::ReflowMappedChild(nsReflowCommand* aReflowCommand) return rv; } nsStyleSpacing* kidSpacing = (nsStyleSpacing*) - kidSC->GetData(kStyleSpacingSID); + kidSC->GetData(eStyleStruct_Spacing); nsStyleDisplay* kidDisplay = (nsStyleDisplay*) - kidSC->GetData(kStyleDisplaySID); + kidSC->GetData(eStyleStruct_Display); PRBool isBlock = PR_FALSE; switch (kidDisplay->mDisplay) { case NS_STYLE_DISPLAY_BLOCK: @@ -546,7 +540,7 @@ nsLineLayout::ReflowChild(nsReflowCommand* aReflowCommand) // XXX floating frames // XXX break-before nsStyleDisplay * kidDisplay = (nsStyleDisplay*) - kidSC->GetData(kStyleDisplaySID); + kidSC->GetData(eStyleStruct_Display); PRBool isBlock = PR_FALSE; PRBool isFirstChild = PRBool(mKidFrame == mLine->mFirstChild); switch (kidDisplay->mDisplay) { @@ -578,7 +572,7 @@ nsLineLayout::ReflowChild(nsReflowCommand* aReflowCommand) kidAvailSize.width = mReflowData.mAvailWidth; kidAvailSize.height = mMaxHeight; nsStyleSpacing* kidSpacing = (nsStyleSpacing*) - kidSC->GetData(kStyleSpacingSID); + kidSC->GetData(eStyleStruct_Spacing); nsMargin kidMargin; kidSpacing->CalcMarginFor(mKidFrame, kidMargin); if (!mUnconstrainedWidth) { @@ -1103,7 +1097,7 @@ nsLineLayout::PullUpChildren() return rv; } nsStyleDisplay* kidDisplay = (nsStyleDisplay*) - kidSC->GetData(kStyleDisplaySID); + kidSC->GetData(eStyleStruct_Display); if (IsBlock(kidDisplay)) { if ((nsnull != mLine->mPrevLine) || (0 != mLine->mChildCount)) { goto done; @@ -1209,9 +1203,9 @@ nsLineLayout::CreateFrameFor(nsIContent* aKid) return NS_ERROR_OUT_OF_MEMORY; } nsStylePosition* kidPosition = (nsStylePosition*) - kidSC->GetData(kStylePositionSID); + kidSC->GetData(eStyleStruct_Position); nsStyleDisplay* kidDisplay = (nsStyleDisplay*) - kidSC->GetData(kStyleDisplaySID); + kidSC->GetData(eStyleStruct_Display); // Check whether it wants to floated or absolutely positioned PRBool isBlock = PR_FALSE; @@ -1431,9 +1425,9 @@ nsLineLayout::AlignChildren() nsIStyleContextPtr blockSC; mBlock->GetStyleContext(mPresContext, blockSC.AssignRef()); nsStyleFont* blockFont = (nsStyleFont*) - blockSC->GetData(kStyleFontSID); + blockSC->GetData(eStyleStruct_Font); nsStyleText* blockText = (nsStyleText*) - blockSC->GetData(kStyleTextSID); + blockSC->GetData(eStyleStruct_Text); // First vertically align the children on the line; this will // compute the actual line height for us. diff --git a/mozilla/layout/html/base/src/nsListItemFrame.cpp b/mozilla/layout/html/base/src/nsListItemFrame.cpp index f06b5bb13d3..0aae1a897f5 100644 --- a/mozilla/layout/html/base/src/nsListItemFrame.cpp +++ b/mozilla/layout/html/base/src/nsListItemFrame.cpp @@ -40,10 +40,6 @@ // 4. number bullets correctly when dealing with
  • // 5. size and render circle, square, disc bullets like nav4 does -static NS_DEFINE_IID(kStyleFontSID, NS_STYLEFONT_SID); -static NS_DEFINE_IID(kStyleColorSID, NS_STYLECOLOR_SID); -static NS_DEFINE_IID(kStyleListSID, NS_STYLELIST_SID); - /** * A pseudo-frame class that reflows the list item bullet. */ @@ -98,11 +94,11 @@ NS_METHOD BulletFrame::Paint(nsIPresContext& aCX, const nsRect& aDirtyRect) { nsStyleFont* myFont = - (nsStyleFont*)mStyleContext->GetData(kStyleFontSID); + (nsStyleFont*)mStyleContext->GetData(eStyleStruct_Font); nsStyleColor* myColor = - (nsStyleColor*)mStyleContext->GetData(kStyleColorSID); + (nsStyleColor*)mStyleContext->GetData(eStyleStruct_Color); nsStyleList* myList = - (nsStyleList*)mStyleContext->GetData(kStyleListSID); + (nsStyleList*)mStyleContext->GetData(eStyleStruct_List); nsIFontMetrics* fm = aCX.GetMetricsFor(myFont->mFont); nscoord pad; @@ -353,9 +349,9 @@ void BulletFrame::GetBulletSize(nsIPresContext* aCX, const nsSize& aMaxSize) { nsStyleList* myList = - (nsStyleList*)mStyleContext->GetData(kStyleListSID); + (nsStyleList*)mStyleContext->GetData(eStyleStruct_List); nsStyleFont* myFont = - (nsStyleFont*)mStyleContext->GetData(kStyleFontSID); + (nsStyleFont*)mStyleContext->GetData(eStyleStruct_Font); nscoord pad; @@ -455,7 +451,7 @@ void nsListItemFrame::PlaceOutsideBullet(nsIFrame* aBullet, // Get bullet style (which is our style) nsStyleFont* font = - (nsStyleFont*)mStyleContext->GetData(kStyleFontSID); + (nsStyleFont*)mStyleContext->GetData(eStyleStruct_Font); nsIFontMetrics* fm = aCX->GetMetricsFor(font->mFont); nscoord kidAscent = fm->GetMaxAscent(); nscoord dx = fm->GetHeight() / 2; // from old layout engine @@ -470,7 +466,7 @@ void nsListItemFrame::PlaceOutsideBullet(nsIFrame* aBullet, nsIContent* kidContent = firstKid->GetContent(); nsIStyleContext* kidStyleContext = firstKid->GetStyleContext(aCX); nsStyleFont* kidFont = - (nsStyleFont*)kidStyleContext->GetData(kStyleFontSID); + (nsStyleFont*)kidStyleContext->GetData(eStyleStruct_Font); nsPoint origin; firstKid->GetOrigin(origin); // XXX this is wrong if the first kid was relative positioned! @@ -580,7 +576,7 @@ NS_METHOD nsListItemFrame::ResizeReflow(nsIPresContext* aCX, // Get bullet style (which is our style) nsStyleList* myList = - (nsStyleList*)mStyleContext->GetData(kStyleListSID); + (nsStyleList*)mStyleContext->GetData(eStyleStruct_List); if (NS_STYLE_LIST_STYLE_POSITION_INSIDE == myList->mListStylePosition) { insideBullet = PR_TRUE; } diff --git a/mozilla/layout/html/base/src/nsTextContent.cpp b/mozilla/layout/html/base/src/nsTextContent.cpp index bd25889682d..0cf10c3eff7 100644 --- a/mozilla/layout/html/base/src/nsTextContent.cpp +++ b/mozilla/layout/html/base/src/nsTextContent.cpp @@ -86,9 +86,6 @@ PRBool IsInRange(nsIContent * aStart, nsIContent * aEnd, nsIContent * aContent); static NS_DEFINE_IID(kITextContentIID, NS_ITEXTCONTENT_IID); #endif -static NS_DEFINE_IID(kStyleFontSID, NS_STYLEFONT_SID); -static NS_DEFINE_IID(kStyleTextSID, NS_STYLETEXT_SID); -static NS_DEFINE_IID(kStyleColorSID, NS_STYLECOLOR_SID); static NS_DEFINE_IID(kIScriptObjectOwner, NS_ISCRIPTOBJECTOWNER_IID); class TextFrame; @@ -434,9 +431,9 @@ NS_METHOD TextFrame::Paint(nsIPresContext& aPresContext, // Get style data nsStyleColor* color = - (nsStyleColor*)mStyleContext->GetData(kStyleColorSID); + (nsStyleColor*)mStyleContext->GetData(eStyleStruct_Color); nsStyleFont* font = - (nsStyleFont*)mStyleContext->GetData(kStyleFontSID); + (nsStyleFont*)mStyleContext->GetData(eStyleStruct_Font); // Set font and color aRenderingContext.SetColor(color->mColor); @@ -554,11 +551,11 @@ void TextFrame::PaintRegularText(nsIPresContext& aPresContext, // Render the text aRenderingContext.DrawString(s0, s - s0, dx, dy, mRect.width); - nsStyleColor* color = (nsStyleColor*)mStyleContext->GetData(kStyleColorSID); + nsStyleColor* color = (nsStyleColor*)mStyleContext->GetData(eStyleStruct_Color); aRenderingContext.SetColor(color->mColor); } else { // Render the text - nsStyleColor* color = (nsStyleColor*)mStyleContext->GetData(kStyleColorSID); + nsStyleColor* color = (nsStyleColor*)mStyleContext->GetData(eStyleStruct_Color); aRenderingContext.SetColor(color->mColor); aRenderingContext.DrawString(s0, s - s0, dx, dy, mRect.width); } @@ -631,11 +628,11 @@ void TextFrame::PaintRegularText(nsIPresContext& aPresContext, // Render the text aRenderingContext.DrawString(s0, s - s0, dx, dy, mRect.width); - nsStyleColor* color = (nsStyleColor*)mStyleContext->GetData(kStyleColorSID); + nsStyleColor* color = (nsStyleColor*)mStyleContext->GetData(eStyleStruct_Color); aRenderingContext.SetColor(color->mColor); } else { // Render the text - nsStyleColor* color = (nsStyleColor*)mStyleContext->GetData(kStyleColorSID); + nsStyleColor* color = (nsStyleColor*)mStyleContext->GetData(eStyleStruct_Color); aRenderingContext.SetColor(color->mColor); aRenderingContext.DrawString(s0, s - s0, dx, dy, mRect.width); } @@ -721,7 +718,7 @@ NS_METHOD TextFrame::GetReflowMetrics(nsIPresContext* aCX, aMetrics.height = mRect.height; nsStyleFont* font = - (nsStyleFont*)mStyleContext->GetData(kStyleFontSID); + (nsStyleFont*)mStyleContext->GetData(eStyleStruct_Font); nsIFontMetrics* fm = aCX->GetMetricsFor(font->mFont); aMetrics.ascent = fm->GetMaxAscent(); aMetrics.descent = fm->GetMaxDescent(); @@ -769,7 +766,7 @@ NS_METHOD TextFrame::ResizeReflow(nsIPresContext* aCX, } nsStyleFont* font = - (nsStyleFont*)mStyleContext->GetData(kStyleFontSID); + (nsStyleFont*)mStyleContext->GetData(eStyleStruct_Font); // Initialize mFlags (without destroying the TEXT_BLINK_ON bit) bits // that are filled in by the reflow routines. @@ -782,7 +779,7 @@ NS_METHOD TextFrame::ResizeReflow(nsIPresContext* aCX, } nsStyleText* text = - (nsStyleText*)mStyleContext->GetData(kStyleTextSID); + (nsStyleText*)mStyleContext->GetData(eStyleStruct_Text); if (NS_STYLE_WHITESPACE_PRE == text->mWhiteSpace) { // Use a specialized routine for pre-formatted text @@ -1057,7 +1054,7 @@ NS_METHOD TextFrame::JustifyReflow(nsIPresContext* aCX, nscoord aAvailableSpace) } nsStyleFont* font = - (nsStyleFont*)mStyleContext->GetData(kStyleFontSID); + (nsStyleFont*)mStyleContext->GetData(eStyleStruct_Font); nsIFontMetrics* fm = aCX->GetMetricsFor(font->mFont); PRInt32 spaceWidth = fm->GetWidth(' '); @@ -1323,8 +1320,8 @@ void TextFrame::CalcCursorPosition(nsIPresContext& aCX, nsIStyleContext * styleContext; aNewFrame->GetStyleContext(&aCX, styleContext); - nsStyleFont *font = (nsStyleFont*)styleContext->GetData(kStyleFontSID); - nsStyleText *styleText = (nsStyleText*)styleContext->GetData(kStyleTextSID); + nsStyleFont *font = (nsStyleFont*)styleContext->GetData(eStyleStruct_Font); + nsStyleText *styleText = (nsStyleText*)styleContext->GetData(eStyleStruct_Text); NS_RELEASE(styleContext); nsIFontMetrics* fm = aCX.GetMetricsFor(font->mFont); diff --git a/mozilla/layout/html/forms/src/nsInput.cpp b/mozilla/layout/html/forms/src/nsInput.cpp index edaa9fb5c00..721eed88d7d 100644 --- a/mozilla/layout/html/forms/src/nsInput.cpp +++ b/mozilla/layout/html/forms/src/nsInput.cpp @@ -37,8 +37,6 @@ #include "nsStyleConsts.h" #define ALIGN_UNSET PRUint8(-1) -static NS_DEFINE_IID(kStyleDisplaySID, NS_STYLEDISPLAY_SID); -static NS_DEFINE_IID(kStyleTextSID, NS_STYLETEXT_SID); // Note: we inherit a base class operator new that zeros our memory nsInput::nsInput(nsIAtom* aTag, nsIFormManager* aManager) @@ -91,9 +89,9 @@ void nsInput::MapAttributesInto(nsIStyleContext* aContext, { if (ALIGN_UNSET != mAlign) { nsStyleDisplay* display = (nsStyleDisplay*) - aContext->GetData(kStyleDisplaySID); + aContext->GetData(eStyleStruct_Display); nsStyleText* text = (nsStyleText*) - aContext->GetData(kStyleTextSID); + aContext->GetData(eStyleStruct_Text); switch (mAlign) { case NS_STYLE_TEXT_ALIGN_LEFT: display->mFloats = NS_STYLE_FLOAT_LEFT; diff --git a/mozilla/layout/html/forms/src/nsInputFrame.cpp b/mozilla/layout/html/forms/src/nsInputFrame.cpp index b8f654522e2..49e9f0454a6 100644 --- a/mozilla/layout/html/forms/src/nsInputFrame.cpp +++ b/mozilla/layout/html/forms/src/nsInputFrame.cpp @@ -47,9 +47,6 @@ #include "nsStyleConsts.h" #include "nsUnitConversion.h" #include "nsCSSLayout.h" -static NS_DEFINE_IID(kStyleFontSID, NS_STYLEFONT_SID); -static NS_DEFINE_IID(kStylePositionSID, NS_STYLEPOSITION_SID); -static NS_DEFINE_IID(kStyleSpacingSID, NS_STYLESPACING_SID); struct nsInputCallbackData { @@ -439,7 +436,7 @@ nsInputFrame::GetTextSize(nsIPresContext& aPresContext, nsIFrame* aFrame, //printf("\n GetTextSize %s", aString.ToNewCString()); nsIStyleContext* styleContext; aFrame->GetStyleContext(&aPresContext, styleContext); - nsStyleFont* styleFont = (nsStyleFont*)styleContext->GetData(kStyleFontSID); + nsStyleFont* styleFont = (nsStyleFont*)styleContext->GetData(eStyleStruct_Font); NS_RELEASE(styleContext); nsIDeviceContext* deviceContext = aPresContext.GetDeviceContext(); nsIFontCache* fontCache = deviceContext->GetFontCache(); @@ -591,7 +588,7 @@ nsInputFrame::CalculateSize (nsIPresContext* aPresContext, nsInputFrame* aFrame, nsFont& nsInputFrame::GetFont(nsIPresContext* aPresContext) { - nsStyleFont* styleFont = (nsStyleFont*)mStyleContext->GetData(kStyleFontSID); + nsStyleFont* styleFont = (nsStyleFont*)mStyleContext->GetData(eStyleStruct_Font); return styleFont->mFont; } diff --git a/mozilla/layout/html/style/src/nsCSSLayout.cpp b/mozilla/layout/html/style/src/nsCSSLayout.cpp index d2fbd5ddc2c..37ac2238de3 100644 --- a/mozilla/layout/html/style/src/nsCSSLayout.cpp +++ b/mozilla/layout/html/style/src/nsCSSLayout.cpp @@ -27,9 +27,6 @@ #include "nsBlockFrame.h" #include "nsHTMLIIDs.h" -static NS_DEFINE_IID(kStylePositionSID, NS_STYLEPOSITION_SID); -static NS_DEFINE_IID(kStyleTextSID, NS_STYLETEXT_SID); - NS_DEF_PTR(nsIStyleContext); NS_DEF_PTR(nsIContent); @@ -65,7 +62,7 @@ nsCSSLayout::VerticallyAlignChildren(nsIPresContext* aCX, nsIStyleContextPtr kidSC; kid->GetStyleContext(aCX, kidSC.AssignRef()); - nsStyleText* textStyle = (nsStyleText*)kidSC->GetData(kStyleTextSID); + nsStyleText* textStyle = (nsStyleText*)kidSC->GetData(eStyleStruct_Text); nsStyleUnit verticalAlignUnit = textStyle->mVerticalAlign.GetUnit(); PRUint8 verticalAlignEnum = NS_STYLE_VERTICAL_ALIGN_BASELINE; @@ -168,7 +165,7 @@ nsCSSLayout::VerticallyAlignChildren(nsIPresContext* aCX, nsIStyleContextPtr kidSC; kid->GetStyleContext(aCX, kidSC.AssignRef()); - nsStyleText* textStyle = (nsStyleText*)kidSC->GetData(kStyleTextSID); + nsStyleText* textStyle = (nsStyleText*)kidSC->GetData(eStyleStruct_Text); nsStyleUnit verticalAlignUnit = textStyle->mVerticalAlign.GetUnit(); if (eStyleUnit_Percent == verticalAlignUnit) { @@ -258,7 +255,7 @@ nsCSSLayout::RelativePositionChildren(nsIPresContext* aCX, kid->GetStyleContext(aCX, kidSC.AssignRef()); nsStylePosition* kidPosition = (nsStylePosition*) - kidSC->GetData(kStylePositionSID); + kidSC->GetData(eStyleStruct_Position); if (NS_STYLE_POSITION_RELATIVE == kidPosition->mPosition) { kid->GetOrigin(origin); // XXX Check the unit: could be auto or percent (not just length) @@ -329,7 +326,7 @@ nsCSSLayout::GetStyleSize(nsIPresContext* aPresContext, nsIStyleContext* sc = nsnull; aFrame->GetStyleContext(aPresContext, sc); if (nsnull != sc) { - nsStylePosition* pos = (nsStylePosition*) sc->GetData(kStylePositionSID); + nsStylePosition* pos = (nsStylePosition*) sc->GetData(eStyleStruct_Position); if (GetStyleDimension(aPresContext, aFrame, pos, pos->mWidth, aStyleSize.width)) { rv |= NS_SIZE_HAS_WIDTH; diff --git a/mozilla/layout/html/style/src/nsCSSStyleRule.cpp b/mozilla/layout/html/style/src/nsCSSStyleRule.cpp index fa57553ca9b..f58ef75dfb7 100644 --- a/mozilla/layout/html/style/src/nsCSSStyleRule.cpp +++ b/mozilla/layout/html/style/src/nsCSSStyleRule.cpp @@ -33,14 +33,6 @@ static NS_DEFINE_IID(kIStyleRuleIID, NS_ISTYLE_RULE_IID); static NS_DEFINE_IID(kICSSDeclarationIID, NS_ICSS_DECLARATION_IID); static NS_DEFINE_IID(kICSSStyleRuleIID, NS_ICSS_STYLE_RULE_IID); -static NS_DEFINE_IID(kStyleColorSID, NS_STYLECOLOR_SID); -static NS_DEFINE_IID(kStyleDisplaySID, NS_STYLEDISPLAY_SID); -static NS_DEFINE_IID(kStyleFontSID, NS_STYLEFONT_SID); -static NS_DEFINE_IID(kStyleListSID, NS_STYLELIST_SID); -static NS_DEFINE_IID(kStylePositionSID, NS_STYLEPOSITION_SID); -static NS_DEFINE_IID(kStyleSpacingSID, NS_STYLESPACING_SID); -static NS_DEFINE_IID(kStyleTextSID, NS_STYLETEXT_SID); - static NS_DEFINE_IID(kCSSFontSID, NS_CSS_FONT_SID); static NS_DEFINE_IID(kCSSColorSID, NS_CSS_COLOR_SID); static NS_DEFINE_IID(kCSSTextSID, NS_CSS_TEXT_SID); @@ -518,7 +510,7 @@ PRBool CSSStyleRuleImpl::SetCoord(const nsCSSValue& aValue, nsStyleCoord& aCoord void CSSStyleRuleImpl::MapStyleInto(nsIStyleContext* aContext, nsIPresContext* aPresContext) { if (nsnull != mDeclaration) { - nsStyleFont* font = (nsStyleFont*)aContext->GetData(kStyleFontSID); + nsStyleFont* font = (nsStyleFont*)aContext->GetData(eStyleStruct_Font); nsCSSFont* ourFont; if (NS_OK == mDeclaration->GetData(kCSSFontSID, (nsCSSStruct**)&ourFont)) { @@ -526,7 +518,7 @@ void CSSStyleRuleImpl::MapStyleInto(nsIStyleContext* aContext, nsIPresContext* a nsStyleFont* parentFont = font; nsIStyleContext* parentContext = aContext->GetParent(); if (nsnull != parentContext) { - parentFont = (nsStyleFont*)parentContext->GetData(kStyleFontSID); + parentFont = (nsStyleFont*)parentContext->GetData(eStyleStruct_Font); } // font-family: string list @@ -628,7 +620,7 @@ void CSSStyleRuleImpl::MapStyleInto(nsIStyleContext* aContext, nsIPresContext* a if (NS_OK == mDeclaration->GetData(kCSSTextSID, (nsCSSStruct**)&ourText)) { if (nsnull != ourText) { // Get our text style and our parent's text style - nsStyleText* text = (nsStyleText*) aContext->GetData(kStyleTextSID); + nsStyleText* text = (nsStyleText*) aContext->GetData(eStyleStruct_Text); // letter-spacing SetCoord(ourText->mLetterSpacing, text->mLetterSpacing, SETCOORD_LH | SETCOORD_NORMAL, @@ -678,7 +670,7 @@ void CSSStyleRuleImpl::MapStyleInto(nsIStyleContext* aContext, nsIPresContext* a if (nsnull != ourDisplay) { // Get our style and our parent's style nsStyleDisplay* display = (nsStyleDisplay*) - aContext->GetData(kStyleDisplaySID); + aContext->GetData(eStyleStruct_Display); // display if (ourDisplay->mDisplay.GetUnit() == eCSSUnit_Enumerated) { @@ -706,7 +698,7 @@ void CSSStyleRuleImpl::MapStyleInto(nsIStyleContext* aContext, nsIPresContext* a nsCSSColor* ourColor; if (NS_OK == mDeclaration->GetData(kCSSColorSID, (nsCSSStruct**)&ourColor)) { if (nsnull != ourColor) { - nsStyleColor* color = (nsStyleColor*)aContext->GetData(kStyleColorSID); + nsStyleColor* color = (nsStyleColor*)aContext->GetData(eStyleStruct_Color); // color: color if (ourColor->mColor.GetUnit() == eCSSUnit_Color) { @@ -790,7 +782,7 @@ void CSSStyleRuleImpl::MapStyleInto(nsIStyleContext* aContext, nsIPresContext* a if (NS_OK == mDeclaration->GetData(kCSSMarginSID, (nsCSSStruct**)&ourMargin)) { if (nsnull != ourMargin) { nsStyleSpacing* spacing = (nsStyleSpacing*) - aContext->GetData(kStyleSpacingSID); + aContext->GetData(eStyleStruct_Spacing); // margin: length, percent, auto, inherit if (nsnull != ourMargin->mMargin) { @@ -861,7 +853,7 @@ void CSSStyleRuleImpl::MapStyleInto(nsIStyleContext* aContext, nsIPresContext* a } // border-color - nsStyleColor* color = (nsStyleColor*)aContext->GetData(kStyleColorSID); + nsStyleColor* color = (nsStyleColor*)aContext->GetData(eStyleStruct_Color); if (nsnull != ourMargin->mColor) { nsCSSRect* ourColor = ourMargin->mColor; if (ourColor->mTop.GetUnit() == eCSSUnit_Color) { @@ -883,7 +875,7 @@ void CSSStyleRuleImpl::MapStyleInto(nsIStyleContext* aContext, nsIPresContext* a nsCSSPosition* ourPosition; if (NS_OK == mDeclaration->GetData(kCSSPositionSID, (nsCSSStruct**)&ourPosition)) { if (nsnull != ourPosition) { - nsStylePosition* position = (nsStylePosition*)aContext->GetData(kStylePositionSID); + nsStylePosition* position = (nsStylePosition*)aContext->GetData(eStyleStruct_Position); // position: normal, enum, inherit if (ourPosition->mPosition.GetUnit() == eCSSUnit_Normal) { @@ -896,7 +888,7 @@ void CSSStyleRuleImpl::MapStyleInto(nsIStyleContext* aContext, nsIPresContext* a // explicit inheritance nsIStyleContext* parentContext = aContext->GetParent(); if (nsnull != parentContext) { - nsStylePosition* parentPosition = (nsStylePosition*)parentContext->GetData(kStylePositionSID); + nsStylePosition* parentPosition = (nsStylePosition*)parentContext->GetData(eStyleStruct_Position); position->mPosition = parentPosition->mPosition; } } @@ -968,7 +960,7 @@ void CSSStyleRuleImpl::MapStyleInto(nsIStyleContext* aContext, nsIPresContext* a nsCSSList* ourList; if (NS_OK == mDeclaration->GetData(kCSSListSID, (nsCSSStruct**)&ourList)) { if (nsnull != ourList) { - nsStyleList* list = (nsStyleList*)aContext->GetData(kStyleListSID); + nsStyleList* list = (nsStyleList*)aContext->GetData(eStyleStruct_List); // list-style-type: enum if (ourList->mType.GetUnit() == eCSSUnit_Enumerated) { diff --git a/mozilla/layout/html/table/src/BasicTableLayoutStrategy.cpp b/mozilla/layout/html/table/src/BasicTableLayoutStrategy.cpp index b8647909d02..ac51142aa1e 100644 --- a/mozilla/layout/html/table/src/BasicTableLayoutStrategy.cpp +++ b/mozilla/layout/html/table/src/BasicTableLayoutStrategy.cpp @@ -31,10 +31,6 @@ NS_DEF_PTR(nsTableCol); NS_DEF_PTR(nsTableCell); NS_DEF_PTR(nsIStyleContext); -static NS_DEFINE_IID(kStyleColorSID, NS_STYLECOLOR_SID); -static NS_DEFINE_IID(kStylePositionSID, NS_STYLEPOSITION_SID); -static NS_DEFINE_IID(kStyleSpacingSID, NS_STYLESPACING_SID); - #ifdef NS_DEBUG static PRBool gsDebug = PR_FALSE; @@ -188,7 +184,7 @@ PRBool BasicTableLayoutStrategy::AssignFixedColumnWidths(nsIPresContext* aPresCo nsIStyleContextPtr colSC; colFrame->GetStyleContext(aPresContext, colSC.AssignRef()); nsStylePosition* colPosition = (nsStylePosition*) - colSC->GetData(kStylePositionSID); + colSC->GetData(eStyleStruct_Position); // Get column width if it has one PRBool haveColWidth = PR_FALSE; @@ -271,7 +267,7 @@ PRBool BasicTableLayoutStrategy::AssignFixedColumnWidths(nsIPresContext* aPresCo nsIStyleContextPtr cellSC; cellFrame->GetStyleContext(aPresContext, cellSC.AssignRef()); nsStylePosition* cellPosition = (nsStylePosition*) - cellSC->GetData(kStylePositionSID); + cellSC->GetData(eStyleStruct_Position); switch (cellPosition->mWidth.GetUnit()) { case eStyleUnit_Coord: haveCellWidth = PR_TRUE; @@ -674,7 +670,7 @@ PRBool BasicTableLayoutStrategy::BalanceColumnsConstrained( nsIPresContext* aPre #if XXX_bug_kipp_about_this // XXX BUG: mStyleContext is for the table frame not for the column. nsStyleMolecule* colStyle = - (nsStyleMolecule*)mStyleContext->GetData(kStyleMoleculeSID); + (nsStyleMolecule*)mStyleContext->GetData(eStyleStruct_Molecule); #else nsStylePosition* colPosition = nsnull; #endif diff --git a/mozilla/layout/html/table/src/nsCellLayoutData.cpp b/mozilla/layout/html/table/src/nsCellLayoutData.cpp index e984f28e8dd..d5739ea458e 100644 --- a/mozilla/layout/html/table/src/nsCellLayoutData.cpp +++ b/mozilla/layout/html/table/src/nsCellLayoutData.cpp @@ -26,8 +26,6 @@ #include /* XXX */ // for printf -static NS_DEFINE_IID(kStyleSpacingSID, NS_STYLESPACING_SID); - nsCellLayoutData::nsCellLayoutData(nsTableCellFrame *aCellFrame, nsReflowMetrics * aDesiredSize, nsSize * aMaxElementSize) @@ -125,7 +123,7 @@ nscoord nsCellLayoutData::GetMargin(nsIFrame* aFrame, PRUint8 aEdge) const if (aFrame) { nsStyleSpacing* spacing; - aFrame->GetStyleData(kStyleSpacingSID, (nsStyleStruct*&)spacing); + aFrame->GetStyleData(eStyleStruct_Spacing, (nsStyleStruct*&)spacing); nsMargin margin; spacing->CalcMarginFor(aFrame, margin); switch (aEdge) @@ -163,7 +161,7 @@ nscoord nsCellLayoutData::GetBorderWidth(nsIFrame* aFrame, PRUint8 aEdge) const if (aFrame) { nsStyleSpacing* spacing; - aFrame->GetStyleData(kStyleSpacingSID, (nsStyleStruct*&)spacing); + aFrame->GetStyleData(eStyleStruct_Spacing, (nsStyleStruct*&)spacing); nsMargin border; spacing->CalcBorderFor(aFrame, border); switch (aEdge) @@ -201,7 +199,7 @@ nscoord nsCellLayoutData::GetPadding(nsIFrame* aFrame, PRUint8 aEdge) const if (aFrame) { nsStyleSpacing* spacing; - aFrame->GetStyleData(kStyleSpacingSID, (nsStyleStruct*&)spacing); + aFrame->GetStyleData(eStyleStruct_Spacing, (nsStyleStruct*&)spacing); nsMargin padding; spacing->CalcPaddingFor(aFrame, padding); switch (aEdge) @@ -303,8 +301,8 @@ nsIFrame* nsCellLayoutData::CompareCellBorders(nsIFrame* aFrame1, { nsStyleSpacing* border1; nsStyleSpacing* border2; - aFrame1->GetStyleData(kStyleSpacingSID, (nsStyleStruct*&)border1); - aFrame2->GetStyleData(kStyleSpacingSID, (nsStyleStruct*&)border2); + aFrame1->GetStyleData(eStyleStruct_Spacing, (nsStyleStruct*&)border1); + aFrame2->GetStyleData(eStyleStruct_Spacing, (nsStyleStruct*&)border2); if (border1->mBorderStyle[aEdge1] >= border2->mBorderStyle[aEdge2]) result = aFrame1; else @@ -528,7 +526,7 @@ void nsCellLayoutData::CalculateMargins(nsTableFrame* aTableFrame, // By default the margin is just the margin found in the // table cells style nsStyleSpacing* spacing; - mCellFrame->GetStyleData(kStyleSpacingSID, (nsStyleStruct*&)spacing); + mCellFrame->GetStyleData(eStyleStruct_Spacing, (nsStyleStruct*&)spacing); spacing->CalcMarginFor(mCellFrame, mMargin); // Left and Top Margins are collapsed with their neightbors diff --git a/mozilla/layout/html/table/src/nsTableCaptionFrame.cpp b/mozilla/layout/html/table/src/nsTableCaptionFrame.cpp index af07a247469..408bffc3970 100644 --- a/mozilla/layout/html/table/src/nsTableCaptionFrame.cpp +++ b/mozilla/layout/html/table/src/nsTableCaptionFrame.cpp @@ -33,10 +33,6 @@ static PRBool gsDebug = PR_FALSE; static const PRBool gsDebug = PR_FALSE; #endif -static NS_DEFINE_IID(kStyleColorSID, NS_STYLECOLOR_SID); -static NS_DEFINE_IID(kStyleSpacingSID, NS_STYLESPACING_SID); -static NS_DEFINE_IID(kStyleTextSID, NS_STYLETEXT_SID); - /** */ nsTableCaptionFrame::nsTableCaptionFrame(nsIContent* aContent, @@ -103,9 +99,9 @@ NS_METHOD nsTableCaptionFrame::Paint(nsIPresContext& aPresContext, const nsRect& aDirtyRect) { nsStyleSpacing* mySpacing = - (nsStyleSpacing*)mStyleContext->GetData(kStyleSpacingSID); + (nsStyleSpacing*)mStyleContext->GetData(eStyleStruct_Spacing); nsStyleColor* myColor = - (nsStyleColor*)mStyleContext->GetData(kStyleColorSID); + (nsStyleColor*)mStyleContext->GetData(eStyleStruct_Color); NS_ASSERTION(nsnull!=myColor, "bad style color"); NS_ASSERTION(nsnull!=mySpacing, "bad style spacing"); if (nsnull==mySpacing) return NS_OK; @@ -133,9 +129,9 @@ void nsTableCaptionFrame::VerticallyAlignChild(nsIPresContext* aPresContext) { nsStyleText* textStyle = - (nsStyleText*)mStyleContext->GetData(kStyleTextSID); + (nsStyleText*)mStyleContext->GetData(eStyleStruct_Text); nsStyleSpacing* spacing = - (nsStyleSpacing*)mStyleContext->GetData(kStyleSpacingSID); + (nsStyleSpacing*)mStyleContext->GetData(eStyleStruct_Spacing); nsMargin borderPadding; spacing->CalcBorderPaddingFor(this, borderPadding); @@ -212,7 +208,7 @@ NS_METHOD nsTableCaptionFrame::ResizeReflow(nsIPresContext* aPresContext, // Compute the insets (sum of border and padding) nsStyleSpacing* spacing = - (nsStyleSpacing*)mStyleContext->GetData(kStyleSpacingSID); + (nsStyleSpacing*)mStyleContext->GetData(eStyleStruct_Spacing); nsMargin borderPadding; spacing->CalcBorderPaddingFor(this, borderPadding); nscoord topInset = borderPadding.top; diff --git a/mozilla/layout/html/table/src/nsTableCell.cpp b/mozilla/layout/html/table/src/nsTableCell.cpp index cb9d81d362d..a0bc8f87b6e 100644 --- a/mozilla/layout/html/table/src/nsTableCell.cpp +++ b/mozilla/layout/html/table/src/nsTableCell.cpp @@ -31,9 +31,6 @@ #include "nsHTMLAtoms.h" static NS_DEFINE_IID(kISupportsIID, NS_ISUPPORTS_IID); -static NS_DEFINE_IID(kStyleTextSID, NS_STYLETEXT_SID); -static NS_DEFINE_IID(kStyleSpacingSID, NS_STYLETEXT_SID); -static NS_DEFINE_IID(kStyleBorderSID, NS_STYLETEXT_SID); #ifdef NS_DEBUG static PRBool gsDebug = PR_TRUE; @@ -210,7 +207,7 @@ void nsTableCell::MapAttributesInto(nsIStyleContext* aContext, GetAttribute(nsHTMLAtoms::align, value); if (value.GetUnit() == eHTMLUnit_Enumerated) { - nsStyleText* text = (nsStyleText*)aContext->GetData(kStyleTextSID); + nsStyleText* text = (nsStyleText*)aContext->GetData(eStyleStruct_Text); text->mTextAlign = value.GetIntValue(); } MapBackgroundAttributesInto(aContext, aPresContext); diff --git a/mozilla/layout/html/table/src/nsTableCellFrame.cpp b/mozilla/layout/html/table/src/nsTableCellFrame.cpp index ff16e4b381e..2266baf6f9e 100644 --- a/mozilla/layout/html/table/src/nsTableCellFrame.cpp +++ b/mozilla/layout/html/table/src/nsTableCellFrame.cpp @@ -36,10 +36,6 @@ static PRBool gsDebug = PR_FALSE; static const PRBool gsDebug = PR_FALSE; #endif -static NS_DEFINE_IID(kStyleSpacingSID, NS_STYLESPACING_SID); -static NS_DEFINE_IID(kStyleColorSID, NS_STYLECOLOR_SID); -static NS_DEFINE_IID(kStyleTextSID, NS_STYLETEXT_SID); - /** */ nsTableCellFrame::nsTableCellFrame(nsIContent* aContent, @@ -57,9 +53,9 @@ NS_METHOD nsTableCellFrame::Paint(nsIPresContext& aPresContext, const nsRect& aDirtyRect) { nsStyleColor* myColor = - (nsStyleColor*)mStyleContext->GetData(kStyleColorSID); + (nsStyleColor*)mStyleContext->GetData(eStyleStruct_Color); nsStyleSpacing* mySpacing = - (nsStyleSpacing*)mStyleContext->GetData(kStyleSpacingSID); + (nsStyleSpacing*)mStyleContext->GetData(eStyleStruct_Spacing); NS_ASSERTION(nsnull!=myColor, "bad style color"); NS_ASSERTION(nsnull!=mySpacing, "bad style spacing"); @@ -93,9 +89,9 @@ NS_METHOD nsTableCellFrame::Paint(nsIPresContext& aPresContext, void nsTableCellFrame::VerticallyAlignChild(nsIPresContext* aPresContext) { nsStyleSpacing* spacing = - (nsStyleSpacing*)mStyleContext->GetData(kStyleSpacingSID); + (nsStyleSpacing*)mStyleContext->GetData(eStyleStruct_Spacing); nsStyleText* textStyle = - (nsStyleText*)mStyleContext->GetData(kStyleTextSID); + (nsStyleText*)mStyleContext->GetData(eStyleStruct_Text); nsMargin borderPadding; spacing->CalcBorderPaddingFor(this, borderPadding); @@ -235,7 +231,7 @@ NS_METHOD nsTableCellFrame::ResizeReflow(nsIPresContext* aPresContext, // Compute the insets (sum of border and padding) nsStyleSpacing* spacing = - (nsStyleSpacing*)mStyleContext->GetData(kStyleSpacingSID); + (nsStyleSpacing*)mStyleContext->GetData(eStyleStruct_Spacing); nsMargin borderPadding; spacing->CalcBorderPaddingFor(this, borderPadding); @@ -433,7 +429,7 @@ void nsTableCellFrame::MapBorderMarginPadding(nsIPresContext* aPresContext) spacing_result = table->GetAttribute(nsHTMLAtoms::cellspacing,spacing_value); border_result = table->GetAttribute(nsHTMLAtoms::border,border_value); - nsStyleSpacing* spacingData = (nsStyleSpacing*)mStyleContext->GetData(kStyleSpacingSID); + nsStyleSpacing* spacingData = (nsStyleSpacing*)mStyleContext->GetData(eStyleStruct_Spacing); // check to see if cellpadding or cellspacing is defined if (spacing_result == eContentAttr_HasValue || padding_result == eContentAttr_HasValue) @@ -480,7 +476,7 @@ void nsTableCellFrame::MapTextAttributes(nsIPresContext* aPresContext) ((nsTableCell*)mContent)->GetAttribute(nsHTMLAtoms::align, value); if (value.GetUnit() == eHTMLUnit_Enumerated) { - nsStyleText* text = (nsStyleText*)mStyleContext->GetData(kStyleTextSID); + nsStyleText* text = (nsStyleText*)mStyleContext->GetData(eStyleStruct_Text); text->mTextAlign = value.GetIntValue(); } } diff --git a/mozilla/layout/html/table/src/nsTableFrame.cpp b/mozilla/layout/html/table/src/nsTableFrame.cpp index 1dc4f2f2325..25805736323 100644 --- a/mozilla/layout/html/table/src/nsTableFrame.cpp +++ b/mozilla/layout/html/table/src/nsTableFrame.cpp @@ -60,10 +60,6 @@ static const PRBool gsDebugMBP = PR_FALSE; #define max(x, y) ((x) > (y) ? (x) : (y)) #endif -static NS_DEFINE_IID(kStyleColorSID, NS_STYLECOLOR_SID); -static NS_DEFINE_IID(kStylePositionSID, NS_STYLEPOSITION_SID); -static NS_DEFINE_IID(kStyleSpacingSID, NS_STYLESPACING_SID); - NS_DEF_PTR(nsIStyleContext); NS_DEF_PTR(nsIContent); NS_DEF_PTR(nsTableContent); @@ -428,9 +424,9 @@ NS_METHOD nsTableFrame::Paint(nsIPresContext& aPresContext, { // table paint code is concerned primarily with borders and bg color nsStyleColor* myColor = - (nsStyleColor*)mStyleContext->GetData(kStyleColorSID); + (nsStyleColor*)mStyleContext->GetData(eStyleStruct_Color); nsStyleSpacing* mySpacing = - (nsStyleSpacing*)mStyleContext->GetData(kStyleSpacingSID); + (nsStyleSpacing*)mStyleContext->GetData(eStyleStruct_Spacing); NS_ASSERTION(nsnull != myColor, "null style color"); NS_ASSERTION(nsnull != mySpacing, "null style spacing"); if (nsnull!=mySpacing) @@ -590,7 +586,7 @@ nsReflowStatus nsTableFrame::ResizeReflowPass1(nsIPresContext* aPresContext, // Compute the insets (sum of border and padding) nsStyleSpacing* spacing = - (nsStyleSpacing*)mStyleContext->GetData(kStyleSpacingSID); + (nsStyleSpacing*)mStyleContext->GetData(eStyleStruct_Spacing); nsMargin borderPadding; spacing->CalcBorderPaddingFor(this, borderPadding); nscoord topInset = borderPadding.top; @@ -754,7 +750,7 @@ nsReflowStatus nsTableFrame::ResizeReflowPass2(nsIPresContext* aPresContext, MoveOverflowToChildList(); nsStyleSpacing* mySpacing = (nsStyleSpacing*) - mStyleContext->GetData(kStyleSpacingSID); + mStyleContext->GetData(eStyleStruct_Spacing); nsMargin myBorderPadding; mySpacing->CalcBorderPaddingFor(this, myBorderPadding); @@ -994,7 +990,7 @@ PRBool nsTableFrame::ReflowMappedChildren( nsIPresContext* aPresContext, kidFrame->GetStyleContext(aPresContext, kidSC.AssignRef()); nsStyleSpacing* kidSpacing = (nsStyleSpacing*) - kidSC->GetData(kStyleSpacingSID); + kidSC->GetData(eStyleStruct_Spacing); nsMargin kidMargin; kidSpacing->CalcMarginFor(kidFrame, kidMargin); @@ -1524,7 +1520,7 @@ void nsTableFrame::BalanceColumnWidths(nsIPresContext* aPresContext, PRInt32 totalFixedWidth = 0; nsStyleSpacing* spacing = - (nsStyleSpacing*)mStyleContext->GetData(kStyleSpacingSID); + (nsStyleSpacing*)mStyleContext->GetData(eStyleStruct_Spacing); nsMargin borderPadding; spacing->CalcBorderPaddingFor(this, borderPadding); @@ -1532,7 +1528,7 @@ void nsTableFrame::BalanceColumnWidths(nsIPresContext* aPresContext, // default case, get 100% of available space PRInt32 maxWidth; nsStylePosition* position = - (nsStylePosition*)mStyleContext->GetData(kStylePositionSID); + (nsStylePosition*)mStyleContext->GetData(eStyleStruct_Position); switch (position->mWidth.GetUnit()) { case eStyleUnit_Coord: maxWidth = position->mWidth.GetCoordValue(); @@ -1591,7 +1587,7 @@ void nsTableFrame::SetTableWidth(nsIPresContext* aPresContext) // Compute the insets (sum of border and padding) nsStyleSpacing* spacing = - (nsStyleSpacing*)mStyleContext->GetData(kStyleSpacingSID); + (nsStyleSpacing*)mStyleContext->GetData(eStyleStruct_Spacing); nsMargin borderPadding; spacing->CalcBorderPaddingFor(this, borderPadding); @@ -1625,7 +1621,7 @@ void nsTableFrame::ShrinkWrapChildren(nsIPresContext* aPresContext, PRInt32 tableHeight = 0; nsStyleSpacing* spacing = (nsStyleSpacing*) - mStyleContext->GetData(kStyleSpacingSID); + mStyleContext->GetData(eStyleStruct_Spacing); nsMargin borderPadding; spacing->CalcBorderPaddingFor(this, borderPadding); @@ -2215,7 +2211,7 @@ nsresult nsTableFrame::NewFrame(nsIFrame** aInstancePtrResult, nsColLayoutData * colData = (nsColLayoutData *)(columnLayoutData->ElementAt(colIndex)); nsTableColPtr col = colData->GetCol(); // col: ADDREF++ nsStyleMolecule* colStyle = - (nsStyleMolecule*)mStyleContext->GetData(kStyleMoleculeSID); + (nsStyleMolecule*)mStyleContext->GetData(eStyleStruct_Molecule); if (PR_TRUE==IsProportionalWidth(colStyle)) { PRInt32 percentage = (100*mColumnWidths[colIndex]) / aMaxWidth; diff --git a/mozilla/layout/html/table/src/nsTableOuterFrame.cpp b/mozilla/layout/html/table/src/nsTableOuterFrame.cpp index 12835be870a..65e2e24e2c0 100644 --- a/mozilla/layout/html/table/src/nsTableOuterFrame.cpp +++ b/mozilla/layout/html/table/src/nsTableOuterFrame.cpp @@ -43,8 +43,6 @@ static PRBool gsDebug = PR_FALSE; static const PRBool gsDebug = PR_FALSE; #endif -static NS_DEFINE_IID(kStyleTextSID, NS_STYLETEXT_SID); -static NS_DEFINE_IID(kStyleSpacingSID, NS_STYLESPACING_SID); static NS_DEFINE_IID(kITableContentIID, NS_ITABLECONTENT_IID); NS_DEF_PTR(nsIStyleContext); @@ -462,7 +460,7 @@ PRBool nsTableOuterFrame::ReflowMappedChildren( nsIPresContext* aPresContex kidFrame->GetStyleContext(aPresContext, kidSC.AssignRef()); nsStyleSpacing* kidSpacing = - (nsStyleSpacing*)kidSC->GetData(kStyleSpacingSID); + (nsStyleSpacing*)kidSC->GetData(eStyleStruct_Spacing); nsMargin kidMargin; kidSpacing->CalcMarginFor(kidFrame, kidMargin); nscoord topMargin = GetTopMarginFor(aPresContext, aState, kidMargin); @@ -896,7 +894,7 @@ nsTableOuterFrame::ReflowChild( nsIFrame* aKidFrame, aKidFrame->GetStyleContext(aPresContext, captionStyleContext.AssignRef()); NS_ASSERTION(captionStyleContext.IsNotNull(), "null style context for caption"); nsStyleText* captionStyle = - (nsStyleText*)captionStyleContext->GetData(kStyleTextSID); + (nsStyleText*)captionStyleContext->GetData(eStyleStruct_Text); NS_ASSERTION(nsnull != captionStyle, "null style molecule for caption"); if ((eStyleUnit_Enumerated == captionStyle->mVerticalAlign.GetUnit()) && (NS_STYLE_VERTICAL_ALIGN_BOTTOM==captionStyle->mVerticalAlign.GetIntValue())) @@ -979,7 +977,7 @@ void nsTableOuterFrame::CreateChildFrames(nsIPresContext* aPresContext) aPresContext->ResolveStyleContextFor(caption, this); NS_ASSERTION(captionStyleContext.IsNotNull(), "bad style context for caption."); nsStyleText* captionStyle = - (nsStyleText*)captionStyleContext->GetData(kStyleTextSID); + (nsStyleText*)captionStyleContext->GetData(eStyleStruct_Text); captionFrame->SetStyleContext(aPresContext,captionStyleContext); mChildCount++; // Link child frame into the list of children @@ -1066,7 +1064,7 @@ nsTableOuterFrame::ResizeReflowTopCaptionsPass2(nsIPresContext* aPresContext, captionFrame->GetStyleContext(aPresContext, captionStyleContext.AssignRef()); NS_ASSERTION(captionStyleContext.IsNotNull(), "null style context for caption"); nsStyleText* captionStyle = - (nsStyleText*)captionStyleContext->GetData(kStyleTextSID); + (nsStyleText*)captionStyleContext->GetData(eStyleStruct_Text); NS_ASSERTION(nsnull != captionStyle, "null style molecule for caption"); if ((eStyleUnit_Enumerated == captionStyle->mVerticalAlign.GetUnit()) && @@ -1133,7 +1131,7 @@ nsTableOuterFrame::ResizeReflowBottomCaptionsPass2(nsIPresContext* aPresContext nsIStyleContextPtr captionStyleContext = captionFrame->GetStyleContext(aPresContext); NS_ASSERTION(nsnull != captionStyleContext, "null style context for caption"); nsStyleMolecule* captionStyle = - (nsStyleMolecule*)captionStyleContext->GetData(kStyleMoleculeSID); + (nsStyleMolecule*)captionStyleContext->GetData(eStyleStruct_Molecule); NS_ASSERTION(nsnull != captionStyle, "null style molecule for caption"); */ // reflow the caption diff --git a/mozilla/layout/html/table/src/nsTablePart.cpp b/mozilla/layout/html/table/src/nsTablePart.cpp index 670f707a4d4..67c4f50443f 100644 --- a/mozilla/layout/html/table/src/nsTablePart.cpp +++ b/mozilla/layout/html/table/src/nsTablePart.cpp @@ -38,9 +38,6 @@ static NS_DEFINE_IID(kISupportsIID, NS_ISUPPORTS_IID); static NS_DEFINE_IID(kITableContentIID, NS_ITABLECONTENT_IID); -static NS_DEFINE_IID(kStylePositionSID, NS_STYLEPOSITION_SID); -static NS_DEFINE_IID(kStyleSpacingSID, NS_STYLESPACING_SID); -static NS_DEFINE_IID(kStyleDisplaySID, NS_STYLEDISPLAY_SID); #ifdef NS_DEBUG static PRBool gsDebug = PR_FALSE; @@ -1078,7 +1075,7 @@ void nsTablePart::MapAttributesInto(nsIStyleContext* aContext, GetAttribute(nsHTMLAtoms::width, value); if (value.GetUnit() != eHTMLUnit_Null) { nsStylePosition* position = (nsStylePosition*) - aContext->GetData(kStylePositionSID); + aContext->GetData(eStyleStruct_Position); switch (value.GetUnit()) { case eHTMLUnit_Percent: position->mWidth.SetPercentValue(value.GetPercentValue()); @@ -1097,7 +1094,7 @@ void nsTablePart::MapAttributesInto(nsIStyleContext* aContext, GetAttribute(nsHTMLAtoms::align, value); if (value.GetUnit() != eHTMLUnit_Null) { NS_ASSERTION(value.GetUnit() == eHTMLUnit_Enumerated, "unexpected unit"); - nsStyleDisplay* display = (nsStyleDisplay*)aContext->GetData(kStyleDisplaySID); + nsStyleDisplay* display = (nsStyleDisplay*)aContext->GetData(eStyleStruct_Display); switch (value.GetIntValue()) { case NS_STYLE_TEXT_ALIGN_LEFT: @@ -1126,7 +1123,7 @@ void nsTablePart::GetTableBorder(nsIHTMLContent* aContent, if ((value.GetUnit() == eHTMLUnit_Pixel) || (value.GetUnit() == eHTMLUnit_Empty)) { nsStyleSpacing* spacing = (nsStyleSpacing*) - aContext->GetData(kStyleSpacingSID); + aContext->GetData(eStyleStruct_Spacing); float p2t = aPresContext->GetPixelsToTwips(); nsStyleCoord twips; if (aForCell || (value.GetUnit() == eHTMLUnit_Empty)) { diff --git a/mozilla/layout/html/table/src/nsTableRowFrame.cpp b/mozilla/layout/html/table/src/nsTableRowFrame.cpp index fff95e20091..581e5745a33 100644 --- a/mozilla/layout/html/table/src/nsTableRowFrame.cpp +++ b/mozilla/layout/html/table/src/nsTableRowFrame.cpp @@ -38,8 +38,6 @@ static const PRBool gsDebug1 = PR_FALSE; static const PRBool gsDebug2 = PR_FALSE; #endif -static NS_DEFINE_IID(kStyleSpacingSID, NS_STYLESPACING_SID); - /* ----------- RowReflowState ---------- */ struct RowReflowState { @@ -280,7 +278,7 @@ PRBool nsTableRowFrame::ReflowMappedChildren(nsIPresContext* aPresContext, nsIStyleContext* kidSC; kidFrame->GetStyleContext(aPresContext, kidSC); nsStyleSpacing* kidSpacing = (nsStyleSpacing*) - kidSC->GetData(kStyleSpacingSID); + kidSC->GetData(eStyleStruct_Spacing); nsMargin kidMargin; kidSpacing->CalcMarginFor(kidFrame, kidMargin); nscoord topMargin = GetTopMarginFor(aPresContext, aState, kidMargin); @@ -806,7 +804,7 @@ nsTableRowFrame::ReflowUnmappedChildren( nsIPresContext* aPresContext, nsIStyleContext* kidStyleContext = aPresContext->ResolveStyleContextFor(cell, this); nsStyleSpacing* kidSpacing = (nsStyleSpacing*) - kidStyleContext->GetData(kStyleSpacingSID); + kidStyleContext->GetData(eStyleStruct_Spacing); nsMargin kidMargin; kidSpacing->CalcMarginFor(this, kidMargin); nscoord topMargin = GetTopMarginFor(aPresContext, aState, kidMargin); diff --git a/mozilla/layout/html/table/src/nsTableRowGroupFrame.cpp b/mozilla/layout/html/table/src/nsTableRowGroupFrame.cpp index fd37369b329..e22a7d3c297 100644 --- a/mozilla/layout/html/table/src/nsTableRowGroupFrame.cpp +++ b/mozilla/layout/html/table/src/nsTableRowGroupFrame.cpp @@ -37,8 +37,6 @@ static const PRBool gsDebug1 = PR_FALSE; static const PRBool gsDebug2 = PR_FALSE; #endif -static NS_DEFINE_IID(kStyleSpacingSID, NS_STYLESPACING_SID); - NS_DEF_PTR(nsIStyleContext); NS_DEF_PTR(nsIContent); @@ -281,7 +279,7 @@ PRBool nsTableRowGroupFrame::ReflowMappedChildren( nsIPresContext* aPresCon kidFrame->GetStyleContext(aPresContext, kidSC.AssignRef()); nsStyleSpacing* kidSpacing = (nsStyleSpacing*) - kidSC->GetData(kStyleSpacingSID); + kidSC->GetData(eStyleStruct_Spacing); nsMargin kidMargin; kidSpacing->CalcMarginFor(this, kidMargin); nscoord topMargin = GetTopMarginFor(aPresContext, aState, kidMargin); @@ -737,7 +735,7 @@ nsTableRowGroupFrame::ReflowUnmappedChildren(nsIPresContext* aPresContext, nsIStyleContextPtr kidSC = aPresContext->ResolveStyleContextFor(kid, this); nsStyleSpacing* kidSpacing = (nsStyleSpacing*) - kidSC->GetData(kStyleSpacingSID); + kidSC->GetData(eStyleStruct_Spacing); nsMargin kidMargin; kidSpacing->CalcMarginFor(this, kidMargin); nscoord topMargin = GetTopMarginFor(aPresContext, aState, kidMargin); diff --git a/mozilla/layout/style/nsCSSStyleRule.cpp b/mozilla/layout/style/nsCSSStyleRule.cpp index fa57553ca9b..f58ef75dfb7 100644 --- a/mozilla/layout/style/nsCSSStyleRule.cpp +++ b/mozilla/layout/style/nsCSSStyleRule.cpp @@ -33,14 +33,6 @@ static NS_DEFINE_IID(kIStyleRuleIID, NS_ISTYLE_RULE_IID); static NS_DEFINE_IID(kICSSDeclarationIID, NS_ICSS_DECLARATION_IID); static NS_DEFINE_IID(kICSSStyleRuleIID, NS_ICSS_STYLE_RULE_IID); -static NS_DEFINE_IID(kStyleColorSID, NS_STYLECOLOR_SID); -static NS_DEFINE_IID(kStyleDisplaySID, NS_STYLEDISPLAY_SID); -static NS_DEFINE_IID(kStyleFontSID, NS_STYLEFONT_SID); -static NS_DEFINE_IID(kStyleListSID, NS_STYLELIST_SID); -static NS_DEFINE_IID(kStylePositionSID, NS_STYLEPOSITION_SID); -static NS_DEFINE_IID(kStyleSpacingSID, NS_STYLESPACING_SID); -static NS_DEFINE_IID(kStyleTextSID, NS_STYLETEXT_SID); - static NS_DEFINE_IID(kCSSFontSID, NS_CSS_FONT_SID); static NS_DEFINE_IID(kCSSColorSID, NS_CSS_COLOR_SID); static NS_DEFINE_IID(kCSSTextSID, NS_CSS_TEXT_SID); @@ -518,7 +510,7 @@ PRBool CSSStyleRuleImpl::SetCoord(const nsCSSValue& aValue, nsStyleCoord& aCoord void CSSStyleRuleImpl::MapStyleInto(nsIStyleContext* aContext, nsIPresContext* aPresContext) { if (nsnull != mDeclaration) { - nsStyleFont* font = (nsStyleFont*)aContext->GetData(kStyleFontSID); + nsStyleFont* font = (nsStyleFont*)aContext->GetData(eStyleStruct_Font); nsCSSFont* ourFont; if (NS_OK == mDeclaration->GetData(kCSSFontSID, (nsCSSStruct**)&ourFont)) { @@ -526,7 +518,7 @@ void CSSStyleRuleImpl::MapStyleInto(nsIStyleContext* aContext, nsIPresContext* a nsStyleFont* parentFont = font; nsIStyleContext* parentContext = aContext->GetParent(); if (nsnull != parentContext) { - parentFont = (nsStyleFont*)parentContext->GetData(kStyleFontSID); + parentFont = (nsStyleFont*)parentContext->GetData(eStyleStruct_Font); } // font-family: string list @@ -628,7 +620,7 @@ void CSSStyleRuleImpl::MapStyleInto(nsIStyleContext* aContext, nsIPresContext* a if (NS_OK == mDeclaration->GetData(kCSSTextSID, (nsCSSStruct**)&ourText)) { if (nsnull != ourText) { // Get our text style and our parent's text style - nsStyleText* text = (nsStyleText*) aContext->GetData(kStyleTextSID); + nsStyleText* text = (nsStyleText*) aContext->GetData(eStyleStruct_Text); // letter-spacing SetCoord(ourText->mLetterSpacing, text->mLetterSpacing, SETCOORD_LH | SETCOORD_NORMAL, @@ -678,7 +670,7 @@ void CSSStyleRuleImpl::MapStyleInto(nsIStyleContext* aContext, nsIPresContext* a if (nsnull != ourDisplay) { // Get our style and our parent's style nsStyleDisplay* display = (nsStyleDisplay*) - aContext->GetData(kStyleDisplaySID); + aContext->GetData(eStyleStruct_Display); // display if (ourDisplay->mDisplay.GetUnit() == eCSSUnit_Enumerated) { @@ -706,7 +698,7 @@ void CSSStyleRuleImpl::MapStyleInto(nsIStyleContext* aContext, nsIPresContext* a nsCSSColor* ourColor; if (NS_OK == mDeclaration->GetData(kCSSColorSID, (nsCSSStruct**)&ourColor)) { if (nsnull != ourColor) { - nsStyleColor* color = (nsStyleColor*)aContext->GetData(kStyleColorSID); + nsStyleColor* color = (nsStyleColor*)aContext->GetData(eStyleStruct_Color); // color: color if (ourColor->mColor.GetUnit() == eCSSUnit_Color) { @@ -790,7 +782,7 @@ void CSSStyleRuleImpl::MapStyleInto(nsIStyleContext* aContext, nsIPresContext* a if (NS_OK == mDeclaration->GetData(kCSSMarginSID, (nsCSSStruct**)&ourMargin)) { if (nsnull != ourMargin) { nsStyleSpacing* spacing = (nsStyleSpacing*) - aContext->GetData(kStyleSpacingSID); + aContext->GetData(eStyleStruct_Spacing); // margin: length, percent, auto, inherit if (nsnull != ourMargin->mMargin) { @@ -861,7 +853,7 @@ void CSSStyleRuleImpl::MapStyleInto(nsIStyleContext* aContext, nsIPresContext* a } // border-color - nsStyleColor* color = (nsStyleColor*)aContext->GetData(kStyleColorSID); + nsStyleColor* color = (nsStyleColor*)aContext->GetData(eStyleStruct_Color); if (nsnull != ourMargin->mColor) { nsCSSRect* ourColor = ourMargin->mColor; if (ourColor->mTop.GetUnit() == eCSSUnit_Color) { @@ -883,7 +875,7 @@ void CSSStyleRuleImpl::MapStyleInto(nsIStyleContext* aContext, nsIPresContext* a nsCSSPosition* ourPosition; if (NS_OK == mDeclaration->GetData(kCSSPositionSID, (nsCSSStruct**)&ourPosition)) { if (nsnull != ourPosition) { - nsStylePosition* position = (nsStylePosition*)aContext->GetData(kStylePositionSID); + nsStylePosition* position = (nsStylePosition*)aContext->GetData(eStyleStruct_Position); // position: normal, enum, inherit if (ourPosition->mPosition.GetUnit() == eCSSUnit_Normal) { @@ -896,7 +888,7 @@ void CSSStyleRuleImpl::MapStyleInto(nsIStyleContext* aContext, nsIPresContext* a // explicit inheritance nsIStyleContext* parentContext = aContext->GetParent(); if (nsnull != parentContext) { - nsStylePosition* parentPosition = (nsStylePosition*)parentContext->GetData(kStylePositionSID); + nsStylePosition* parentPosition = (nsStylePosition*)parentContext->GetData(eStyleStruct_Position); position->mPosition = parentPosition->mPosition; } } @@ -968,7 +960,7 @@ void CSSStyleRuleImpl::MapStyleInto(nsIStyleContext* aContext, nsIPresContext* a nsCSSList* ourList; if (NS_OK == mDeclaration->GetData(kCSSListSID, (nsCSSStruct**)&ourList)) { if (nsnull != ourList) { - nsStyleList* list = (nsStyleList*)aContext->GetData(kStyleListSID); + nsStyleList* list = (nsStyleList*)aContext->GetData(eStyleStruct_List); // list-style-type: enum if (ourList->mType.GetUnit() == eCSSUnit_Enumerated) { diff --git a/mozilla/layout/style/nsStyleContext.cpp b/mozilla/layout/style/nsStyleContext.cpp index c0aa662e200..350f26bd8ee 100644 --- a/mozilla/layout/style/nsStyleContext.cpp +++ b/mozilla/layout/style/nsStyleContext.cpp @@ -29,15 +29,6 @@ //#define DEBUG_REFS -static NS_DEFINE_IID(kStyleFontSID, NS_STYLEFONT_SID); -static NS_DEFINE_IID(kStyleColorSID, NS_STYLECOLOR_SID); -static NS_DEFINE_IID(kStyleSpacingSID, NS_STYLESPACING_SID); -static NS_DEFINE_IID(kStyleListSID, NS_STYLELIST_SID); -static NS_DEFINE_IID(kStylePositionSID, NS_STYLEPOSITION_SID); -static NS_DEFINE_IID(kStyleTextSID, NS_STYLETEXT_SID); -static NS_DEFINE_IID(kStyleDisplaySID, NS_STYLEDISPLAY_SID); -static NS_DEFINE_IID(kStyleTableSID, NS_STYLETABLE_SID); - static NS_DEFINE_IID(kIStyleContextIID, NS_ISTYLECONTEXT_IID); @@ -141,7 +132,7 @@ static nscoord CalcSideFor(const nsIFrame* aFrame, const nsStyleCoord& aCoord, nsIStyleContext* parentContext; parentFrame->GetStyleContext(nsnull, parentContext); if (nsnull != parentContext) { - nsStyleSpacing* parentSpacing = (nsStyleSpacing*)parentContext->GetData(kStyleSpacingSID); + nsStyleSpacing* parentSpacing = (nsStyleSpacing*)parentContext->GetData(eStyleStruct_Spacing); nsMargin parentMargin; switch (aSpacing) { case NS_SPACING_MARGIN: parentSpacing->CalcMarginFor(parentFrame, parentMargin); @@ -535,7 +526,7 @@ public: virtual PRBool Equals(const nsIStyleContext* aOther) const; virtual PRUint32 HashValue(void) const; - virtual nsStyleStruct* GetData(const nsIID& aSID); + virtual nsStyleStruct* GetData(nsStyleStructID aSID); virtual void InheritFrom(const StyleContextImpl& aParent); virtual void RecalcAutomaticData(nsIPresContext* aPresContext); @@ -708,42 +699,49 @@ PRUint32 StyleContextImpl::HashValue(void) const } -nsStyleStruct* StyleContextImpl::GetData(const nsIID& aSID) +nsStyleStruct* StyleContextImpl::GetData(nsStyleStructID aSID) { - if (aSID.Equals(kStyleFontSID)) { - return &mFont; - } - if (aSID.Equals(kStyleColorSID)) { - return &mColor; - } - if (aSID.Equals(kStyleSpacingSID)) { - return &mSpacing; - } - if (aSID.Equals(kStyleListSID)) { - return &mList; - } - if (aSID.Equals(kStylePositionSID)) { - return &mPosition; - } - if (aSID.Equals(kStyleTextSID)) { - return &mText; - } - if (aSID.Equals(kStyleDisplaySID)) { - return &mDisplay; - } - if (aSID.Equals(kStyleTableSID)) { // this one gets created lazily - if (nsnull == mTable) { - mTable = new StyleTableImpl(); - if (nsnull != mParent) { - StyleContextImpl* parent = (StyleContextImpl*)mParent; - if (nsnull != parent->mTable) { - mTable->InheritFrom(*(parent->mTable)); + nsStyleStruct* result = nsnull; + + switch (aSID) { + case eStyleStruct_Font: + result = &mFont; + break; + case eStyleStruct_Color: + result = &mColor; + break; + case eStyleStruct_Spacing: + result = &mSpacing; + break; + case eStyleStruct_List: + result = &mList; + break; + case eStyleStruct_Position: + result = &mPosition; + break; + case eStyleStruct_Text: + result = &mText; + break; + case eStyleStruct_Display: + result = &mDisplay; + break; + case eStyleStruct_Table: // this one gets created lazily + if (nsnull == mTable) { + mTable = new StyleTableImpl(); + if (nsnull != mParent) { + StyleContextImpl* parent = (StyleContextImpl*)mParent; + if (nsnull != parent->mTable) { + mTable->InheritFrom(*(parent->mTable)); + } } } - } - return mTable; + result = mTable; + break; + default: + NS_ERROR("Invalid style struct id"); + break; } - return nsnull; + return result; } void StyleContextImpl::InheritFrom(const StyleContextImpl& aParent) diff --git a/mozilla/layout/tables/BasicTableLayoutStrategy.cpp b/mozilla/layout/tables/BasicTableLayoutStrategy.cpp index b8647909d02..ac51142aa1e 100644 --- a/mozilla/layout/tables/BasicTableLayoutStrategy.cpp +++ b/mozilla/layout/tables/BasicTableLayoutStrategy.cpp @@ -31,10 +31,6 @@ NS_DEF_PTR(nsTableCol); NS_DEF_PTR(nsTableCell); NS_DEF_PTR(nsIStyleContext); -static NS_DEFINE_IID(kStyleColorSID, NS_STYLECOLOR_SID); -static NS_DEFINE_IID(kStylePositionSID, NS_STYLEPOSITION_SID); -static NS_DEFINE_IID(kStyleSpacingSID, NS_STYLESPACING_SID); - #ifdef NS_DEBUG static PRBool gsDebug = PR_FALSE; @@ -188,7 +184,7 @@ PRBool BasicTableLayoutStrategy::AssignFixedColumnWidths(nsIPresContext* aPresCo nsIStyleContextPtr colSC; colFrame->GetStyleContext(aPresContext, colSC.AssignRef()); nsStylePosition* colPosition = (nsStylePosition*) - colSC->GetData(kStylePositionSID); + colSC->GetData(eStyleStruct_Position); // Get column width if it has one PRBool haveColWidth = PR_FALSE; @@ -271,7 +267,7 @@ PRBool BasicTableLayoutStrategy::AssignFixedColumnWidths(nsIPresContext* aPresCo nsIStyleContextPtr cellSC; cellFrame->GetStyleContext(aPresContext, cellSC.AssignRef()); nsStylePosition* cellPosition = (nsStylePosition*) - cellSC->GetData(kStylePositionSID); + cellSC->GetData(eStyleStruct_Position); switch (cellPosition->mWidth.GetUnit()) { case eStyleUnit_Coord: haveCellWidth = PR_TRUE; @@ -674,7 +670,7 @@ PRBool BasicTableLayoutStrategy::BalanceColumnsConstrained( nsIPresContext* aPre #if XXX_bug_kipp_about_this // XXX BUG: mStyleContext is for the table frame not for the column. nsStyleMolecule* colStyle = - (nsStyleMolecule*)mStyleContext->GetData(kStyleMoleculeSID); + (nsStyleMolecule*)mStyleContext->GetData(eStyleStruct_Molecule); #else nsStylePosition* colPosition = nsnull; #endif diff --git a/mozilla/layout/tables/nsTableCellFrame.cpp b/mozilla/layout/tables/nsTableCellFrame.cpp index ff16e4b381e..2266baf6f9e 100644 --- a/mozilla/layout/tables/nsTableCellFrame.cpp +++ b/mozilla/layout/tables/nsTableCellFrame.cpp @@ -36,10 +36,6 @@ static PRBool gsDebug = PR_FALSE; static const PRBool gsDebug = PR_FALSE; #endif -static NS_DEFINE_IID(kStyleSpacingSID, NS_STYLESPACING_SID); -static NS_DEFINE_IID(kStyleColorSID, NS_STYLECOLOR_SID); -static NS_DEFINE_IID(kStyleTextSID, NS_STYLETEXT_SID); - /** */ nsTableCellFrame::nsTableCellFrame(nsIContent* aContent, @@ -57,9 +53,9 @@ NS_METHOD nsTableCellFrame::Paint(nsIPresContext& aPresContext, const nsRect& aDirtyRect) { nsStyleColor* myColor = - (nsStyleColor*)mStyleContext->GetData(kStyleColorSID); + (nsStyleColor*)mStyleContext->GetData(eStyleStruct_Color); nsStyleSpacing* mySpacing = - (nsStyleSpacing*)mStyleContext->GetData(kStyleSpacingSID); + (nsStyleSpacing*)mStyleContext->GetData(eStyleStruct_Spacing); NS_ASSERTION(nsnull!=myColor, "bad style color"); NS_ASSERTION(nsnull!=mySpacing, "bad style spacing"); @@ -93,9 +89,9 @@ NS_METHOD nsTableCellFrame::Paint(nsIPresContext& aPresContext, void nsTableCellFrame::VerticallyAlignChild(nsIPresContext* aPresContext) { nsStyleSpacing* spacing = - (nsStyleSpacing*)mStyleContext->GetData(kStyleSpacingSID); + (nsStyleSpacing*)mStyleContext->GetData(eStyleStruct_Spacing); nsStyleText* textStyle = - (nsStyleText*)mStyleContext->GetData(kStyleTextSID); + (nsStyleText*)mStyleContext->GetData(eStyleStruct_Text); nsMargin borderPadding; spacing->CalcBorderPaddingFor(this, borderPadding); @@ -235,7 +231,7 @@ NS_METHOD nsTableCellFrame::ResizeReflow(nsIPresContext* aPresContext, // Compute the insets (sum of border and padding) nsStyleSpacing* spacing = - (nsStyleSpacing*)mStyleContext->GetData(kStyleSpacingSID); + (nsStyleSpacing*)mStyleContext->GetData(eStyleStruct_Spacing); nsMargin borderPadding; spacing->CalcBorderPaddingFor(this, borderPadding); @@ -433,7 +429,7 @@ void nsTableCellFrame::MapBorderMarginPadding(nsIPresContext* aPresContext) spacing_result = table->GetAttribute(nsHTMLAtoms::cellspacing,spacing_value); border_result = table->GetAttribute(nsHTMLAtoms::border,border_value); - nsStyleSpacing* spacingData = (nsStyleSpacing*)mStyleContext->GetData(kStyleSpacingSID); + nsStyleSpacing* spacingData = (nsStyleSpacing*)mStyleContext->GetData(eStyleStruct_Spacing); // check to see if cellpadding or cellspacing is defined if (spacing_result == eContentAttr_HasValue || padding_result == eContentAttr_HasValue) @@ -480,7 +476,7 @@ void nsTableCellFrame::MapTextAttributes(nsIPresContext* aPresContext) ((nsTableCell*)mContent)->GetAttribute(nsHTMLAtoms::align, value); if (value.GetUnit() == eHTMLUnit_Enumerated) { - nsStyleText* text = (nsStyleText*)mStyleContext->GetData(kStyleTextSID); + nsStyleText* text = (nsStyleText*)mStyleContext->GetData(eStyleStruct_Text); text->mTextAlign = value.GetIntValue(); } } diff --git a/mozilla/layout/tables/nsTableFrame.cpp b/mozilla/layout/tables/nsTableFrame.cpp index 1dc4f2f2325..25805736323 100644 --- a/mozilla/layout/tables/nsTableFrame.cpp +++ b/mozilla/layout/tables/nsTableFrame.cpp @@ -60,10 +60,6 @@ static const PRBool gsDebugMBP = PR_FALSE; #define max(x, y) ((x) > (y) ? (x) : (y)) #endif -static NS_DEFINE_IID(kStyleColorSID, NS_STYLECOLOR_SID); -static NS_DEFINE_IID(kStylePositionSID, NS_STYLEPOSITION_SID); -static NS_DEFINE_IID(kStyleSpacingSID, NS_STYLESPACING_SID); - NS_DEF_PTR(nsIStyleContext); NS_DEF_PTR(nsIContent); NS_DEF_PTR(nsTableContent); @@ -428,9 +424,9 @@ NS_METHOD nsTableFrame::Paint(nsIPresContext& aPresContext, { // table paint code is concerned primarily with borders and bg color nsStyleColor* myColor = - (nsStyleColor*)mStyleContext->GetData(kStyleColorSID); + (nsStyleColor*)mStyleContext->GetData(eStyleStruct_Color); nsStyleSpacing* mySpacing = - (nsStyleSpacing*)mStyleContext->GetData(kStyleSpacingSID); + (nsStyleSpacing*)mStyleContext->GetData(eStyleStruct_Spacing); NS_ASSERTION(nsnull != myColor, "null style color"); NS_ASSERTION(nsnull != mySpacing, "null style spacing"); if (nsnull!=mySpacing) @@ -590,7 +586,7 @@ nsReflowStatus nsTableFrame::ResizeReflowPass1(nsIPresContext* aPresContext, // Compute the insets (sum of border and padding) nsStyleSpacing* spacing = - (nsStyleSpacing*)mStyleContext->GetData(kStyleSpacingSID); + (nsStyleSpacing*)mStyleContext->GetData(eStyleStruct_Spacing); nsMargin borderPadding; spacing->CalcBorderPaddingFor(this, borderPadding); nscoord topInset = borderPadding.top; @@ -754,7 +750,7 @@ nsReflowStatus nsTableFrame::ResizeReflowPass2(nsIPresContext* aPresContext, MoveOverflowToChildList(); nsStyleSpacing* mySpacing = (nsStyleSpacing*) - mStyleContext->GetData(kStyleSpacingSID); + mStyleContext->GetData(eStyleStruct_Spacing); nsMargin myBorderPadding; mySpacing->CalcBorderPaddingFor(this, myBorderPadding); @@ -994,7 +990,7 @@ PRBool nsTableFrame::ReflowMappedChildren( nsIPresContext* aPresContext, kidFrame->GetStyleContext(aPresContext, kidSC.AssignRef()); nsStyleSpacing* kidSpacing = (nsStyleSpacing*) - kidSC->GetData(kStyleSpacingSID); + kidSC->GetData(eStyleStruct_Spacing); nsMargin kidMargin; kidSpacing->CalcMarginFor(kidFrame, kidMargin); @@ -1524,7 +1520,7 @@ void nsTableFrame::BalanceColumnWidths(nsIPresContext* aPresContext, PRInt32 totalFixedWidth = 0; nsStyleSpacing* spacing = - (nsStyleSpacing*)mStyleContext->GetData(kStyleSpacingSID); + (nsStyleSpacing*)mStyleContext->GetData(eStyleStruct_Spacing); nsMargin borderPadding; spacing->CalcBorderPaddingFor(this, borderPadding); @@ -1532,7 +1528,7 @@ void nsTableFrame::BalanceColumnWidths(nsIPresContext* aPresContext, // default case, get 100% of available space PRInt32 maxWidth; nsStylePosition* position = - (nsStylePosition*)mStyleContext->GetData(kStylePositionSID); + (nsStylePosition*)mStyleContext->GetData(eStyleStruct_Position); switch (position->mWidth.GetUnit()) { case eStyleUnit_Coord: maxWidth = position->mWidth.GetCoordValue(); @@ -1591,7 +1587,7 @@ void nsTableFrame::SetTableWidth(nsIPresContext* aPresContext) // Compute the insets (sum of border and padding) nsStyleSpacing* spacing = - (nsStyleSpacing*)mStyleContext->GetData(kStyleSpacingSID); + (nsStyleSpacing*)mStyleContext->GetData(eStyleStruct_Spacing); nsMargin borderPadding; spacing->CalcBorderPaddingFor(this, borderPadding); @@ -1625,7 +1621,7 @@ void nsTableFrame::ShrinkWrapChildren(nsIPresContext* aPresContext, PRInt32 tableHeight = 0; nsStyleSpacing* spacing = (nsStyleSpacing*) - mStyleContext->GetData(kStyleSpacingSID); + mStyleContext->GetData(eStyleStruct_Spacing); nsMargin borderPadding; spacing->CalcBorderPaddingFor(this, borderPadding); @@ -2215,7 +2211,7 @@ nsresult nsTableFrame::NewFrame(nsIFrame** aInstancePtrResult, nsColLayoutData * colData = (nsColLayoutData *)(columnLayoutData->ElementAt(colIndex)); nsTableColPtr col = colData->GetCol(); // col: ADDREF++ nsStyleMolecule* colStyle = - (nsStyleMolecule*)mStyleContext->GetData(kStyleMoleculeSID); + (nsStyleMolecule*)mStyleContext->GetData(eStyleStruct_Molecule); if (PR_TRUE==IsProportionalWidth(colStyle)) { PRInt32 percentage = (100*mColumnWidths[colIndex]) / aMaxWidth; diff --git a/mozilla/layout/tables/nsTableOuterFrame.cpp b/mozilla/layout/tables/nsTableOuterFrame.cpp index 12835be870a..65e2e24e2c0 100644 --- a/mozilla/layout/tables/nsTableOuterFrame.cpp +++ b/mozilla/layout/tables/nsTableOuterFrame.cpp @@ -43,8 +43,6 @@ static PRBool gsDebug = PR_FALSE; static const PRBool gsDebug = PR_FALSE; #endif -static NS_DEFINE_IID(kStyleTextSID, NS_STYLETEXT_SID); -static NS_DEFINE_IID(kStyleSpacingSID, NS_STYLESPACING_SID); static NS_DEFINE_IID(kITableContentIID, NS_ITABLECONTENT_IID); NS_DEF_PTR(nsIStyleContext); @@ -462,7 +460,7 @@ PRBool nsTableOuterFrame::ReflowMappedChildren( nsIPresContext* aPresContex kidFrame->GetStyleContext(aPresContext, kidSC.AssignRef()); nsStyleSpacing* kidSpacing = - (nsStyleSpacing*)kidSC->GetData(kStyleSpacingSID); + (nsStyleSpacing*)kidSC->GetData(eStyleStruct_Spacing); nsMargin kidMargin; kidSpacing->CalcMarginFor(kidFrame, kidMargin); nscoord topMargin = GetTopMarginFor(aPresContext, aState, kidMargin); @@ -896,7 +894,7 @@ nsTableOuterFrame::ReflowChild( nsIFrame* aKidFrame, aKidFrame->GetStyleContext(aPresContext, captionStyleContext.AssignRef()); NS_ASSERTION(captionStyleContext.IsNotNull(), "null style context for caption"); nsStyleText* captionStyle = - (nsStyleText*)captionStyleContext->GetData(kStyleTextSID); + (nsStyleText*)captionStyleContext->GetData(eStyleStruct_Text); NS_ASSERTION(nsnull != captionStyle, "null style molecule for caption"); if ((eStyleUnit_Enumerated == captionStyle->mVerticalAlign.GetUnit()) && (NS_STYLE_VERTICAL_ALIGN_BOTTOM==captionStyle->mVerticalAlign.GetIntValue())) @@ -979,7 +977,7 @@ void nsTableOuterFrame::CreateChildFrames(nsIPresContext* aPresContext) aPresContext->ResolveStyleContextFor(caption, this); NS_ASSERTION(captionStyleContext.IsNotNull(), "bad style context for caption."); nsStyleText* captionStyle = - (nsStyleText*)captionStyleContext->GetData(kStyleTextSID); + (nsStyleText*)captionStyleContext->GetData(eStyleStruct_Text); captionFrame->SetStyleContext(aPresContext,captionStyleContext); mChildCount++; // Link child frame into the list of children @@ -1066,7 +1064,7 @@ nsTableOuterFrame::ResizeReflowTopCaptionsPass2(nsIPresContext* aPresContext, captionFrame->GetStyleContext(aPresContext, captionStyleContext.AssignRef()); NS_ASSERTION(captionStyleContext.IsNotNull(), "null style context for caption"); nsStyleText* captionStyle = - (nsStyleText*)captionStyleContext->GetData(kStyleTextSID); + (nsStyleText*)captionStyleContext->GetData(eStyleStruct_Text); NS_ASSERTION(nsnull != captionStyle, "null style molecule for caption"); if ((eStyleUnit_Enumerated == captionStyle->mVerticalAlign.GetUnit()) && @@ -1133,7 +1131,7 @@ nsTableOuterFrame::ResizeReflowBottomCaptionsPass2(nsIPresContext* aPresContext nsIStyleContextPtr captionStyleContext = captionFrame->GetStyleContext(aPresContext); NS_ASSERTION(nsnull != captionStyleContext, "null style context for caption"); nsStyleMolecule* captionStyle = - (nsStyleMolecule*)captionStyleContext->GetData(kStyleMoleculeSID); + (nsStyleMolecule*)captionStyleContext->GetData(eStyleStruct_Molecule); NS_ASSERTION(nsnull != captionStyle, "null style molecule for caption"); */ // reflow the caption diff --git a/mozilla/layout/tables/nsTableRowFrame.cpp b/mozilla/layout/tables/nsTableRowFrame.cpp index fff95e20091..581e5745a33 100644 --- a/mozilla/layout/tables/nsTableRowFrame.cpp +++ b/mozilla/layout/tables/nsTableRowFrame.cpp @@ -38,8 +38,6 @@ static const PRBool gsDebug1 = PR_FALSE; static const PRBool gsDebug2 = PR_FALSE; #endif -static NS_DEFINE_IID(kStyleSpacingSID, NS_STYLESPACING_SID); - /* ----------- RowReflowState ---------- */ struct RowReflowState { @@ -280,7 +278,7 @@ PRBool nsTableRowFrame::ReflowMappedChildren(nsIPresContext* aPresContext, nsIStyleContext* kidSC; kidFrame->GetStyleContext(aPresContext, kidSC); nsStyleSpacing* kidSpacing = (nsStyleSpacing*) - kidSC->GetData(kStyleSpacingSID); + kidSC->GetData(eStyleStruct_Spacing); nsMargin kidMargin; kidSpacing->CalcMarginFor(kidFrame, kidMargin); nscoord topMargin = GetTopMarginFor(aPresContext, aState, kidMargin); @@ -806,7 +804,7 @@ nsTableRowFrame::ReflowUnmappedChildren( nsIPresContext* aPresContext, nsIStyleContext* kidStyleContext = aPresContext->ResolveStyleContextFor(cell, this); nsStyleSpacing* kidSpacing = (nsStyleSpacing*) - kidStyleContext->GetData(kStyleSpacingSID); + kidStyleContext->GetData(eStyleStruct_Spacing); nsMargin kidMargin; kidSpacing->CalcMarginFor(this, kidMargin); nscoord topMargin = GetTopMarginFor(aPresContext, aState, kidMargin); diff --git a/mozilla/layout/tables/nsTableRowGroupFrame.cpp b/mozilla/layout/tables/nsTableRowGroupFrame.cpp index fd37369b329..e22a7d3c297 100644 --- a/mozilla/layout/tables/nsTableRowGroupFrame.cpp +++ b/mozilla/layout/tables/nsTableRowGroupFrame.cpp @@ -37,8 +37,6 @@ static const PRBool gsDebug1 = PR_FALSE; static const PRBool gsDebug2 = PR_FALSE; #endif -static NS_DEFINE_IID(kStyleSpacingSID, NS_STYLESPACING_SID); - NS_DEF_PTR(nsIStyleContext); NS_DEF_PTR(nsIContent); @@ -281,7 +279,7 @@ PRBool nsTableRowGroupFrame::ReflowMappedChildren( nsIPresContext* aPresCon kidFrame->GetStyleContext(aPresContext, kidSC.AssignRef()); nsStyleSpacing* kidSpacing = (nsStyleSpacing*) - kidSC->GetData(kStyleSpacingSID); + kidSC->GetData(eStyleStruct_Spacing); nsMargin kidMargin; kidSpacing->CalcMarginFor(this, kidMargin); nscoord topMargin = GetTopMarginFor(aPresContext, aState, kidMargin); @@ -737,7 +735,7 @@ nsTableRowGroupFrame::ReflowUnmappedChildren(nsIPresContext* aPresContext, nsIStyleContextPtr kidSC = aPresContext->ResolveStyleContextFor(kid, this); nsStyleSpacing* kidSpacing = (nsStyleSpacing*) - kidSC->GetData(kStyleSpacingSID); + kidSC->GetData(eStyleStruct_Spacing); nsMargin kidMargin; kidSpacing->CalcMarginFor(this, kidMargin); nscoord topMargin = GetTopMarginFor(aPresContext, aState, kidMargin);