From bc184de5ad3a97c166aa4547d4e60115f10c76ca Mon Sep 17 00:00:00 2001 From: peterl Date: Fri, 5 Jun 1998 06:09:09 +0000 Subject: [PATCH] sync up to new style data apis git-svn-id: svn://10.0.0.236/trunk@3322 18797224-902f-48f8-a5cc-f745e15eee43 --- .../content/html/style/src/nsCSSLayout.cpp | 18 +++--- .../content/html/style/src/nsCSSStyleRule.cpp | 40 ++++++------- mozilla/layout/base/src/nsContainerFrame.cpp | 4 +- mozilla/layout/base/src/nsFrame.cpp | 12 ++-- mozilla/layout/base/src/nsFrame.h | 2 +- mozilla/layout/generic/nsBlockFrame.cpp | 56 +++++++++--------- mozilla/layout/generic/nsBlockReflowState.cpp | 56 +++++++++--------- mozilla/layout/generic/nsBlockReflowState.h | 56 +++++++++--------- .../layout/generic/nsHTMLContainerFrame.cpp | 30 +++++----- mozilla/layout/generic/nsHTMLFrame.cpp | 12 ++-- mozilla/layout/generic/nsInlineFrame.cpp | 20 +++---- mozilla/layout/generic/nsLeafFrame.cpp | 20 +++---- mozilla/layout/generic/nsLineLayout.cpp | 58 +++++++++---------- .../layout/html/base/src/nsAbsoluteFrame.cpp | 26 ++++----- .../layout/html/base/src/nsAbsoluteFrame.h | 14 ++--- mozilla/layout/html/base/src/nsBRPart.cpp | 18 +++--- mozilla/layout/html/base/src/nsBlockFrame.cpp | 56 +++++++++--------- .../html/base/src/nsBlockReflowState.cpp | 56 +++++++++--------- .../layout/html/base/src/nsBlockReflowState.h | 56 +++++++++--------- mozilla/layout/html/base/src/nsBodyFrame.cpp | 4 +- mozilla/layout/html/base/src/nsHRPart.cpp | 28 ++++----- mozilla/layout/html/base/src/nsHTMLBullet.cpp | 34 +++++------ .../layout/html/base/src/nsHTMLContainer.cpp | 28 ++++----- .../html/base/src/nsHTMLContainerFrame.cpp | 30 +++++----- mozilla/layout/html/base/src/nsHTMLFrame.cpp | 12 ++-- mozilla/layout/html/base/src/nsHTMLImage.cpp | 12 ++-- .../layout/html/base/src/nsHTMLTagContent.cpp | 8 +-- .../layout/html/base/src/nsInlineFrame.cpp | 20 +++---- mozilla/layout/html/base/src/nsLeafFrame.cpp | 20 +++---- mozilla/layout/html/base/src/nsLineLayout.cpp | 58 +++++++++---------- .../layout/html/base/src/nsScrollFrame.cpp | 4 +- mozilla/layout/html/base/src/nsSpacerPart.cpp | 2 +- .../layout/html/base/src/nsTextContent.cpp | 52 ++++++++--------- mozilla/layout/html/forms/src/nsInput.cpp | 4 +- .../layout/html/forms/src/nsInputButton.cpp | 4 +- .../layout/html/forms/src/nsInputCheckbox.cpp | 2 +- .../layout/html/forms/src/nsInputFrame.cpp | 10 ++-- mozilla/layout/html/forms/src/nsInputFrame.h | 2 +- .../layout/html/forms/src/nsInputRadio.cpp | 2 +- mozilla/layout/html/style/src/nsCSSLayout.cpp | 18 +++--- mozilla/layout/html/style/src/nsCSSLayout.h | 2 +- .../layout/html/style/src/nsCSSStyleRule.cpp | 40 ++++++------- .../table/src/BasicTableLayoutStrategy.cpp | 20 +++---- .../html/table/src/BasicTableLayoutStrategy.h | 4 +- .../html/table/src/nsCellLayoutData.cpp | 24 ++++---- .../html/table/src/nsTableCaptionFrame.cpp | 8 +-- mozilla/layout/html/table/src/nsTableCell.cpp | 6 +- .../html/table/src/nsTableCellFrame.cpp | 32 +++++----- .../layout/html/table/src/nsTableColGroup.cpp | 4 +- .../html/table/src/nsTableColGroupFrame.cpp | 14 ++--- .../layout/html/table/src/nsTableFrame.cpp | 50 ++++++++-------- mozilla/layout/html/table/src/nsTableFrame.h | 2 +- .../html/table/src/nsTableOuterFrame.cpp | 16 ++--- mozilla/layout/html/table/src/nsTablePart.cpp | 6 +- .../layout/html/table/src/nsTableRowFrame.cpp | 8 +-- .../html/table/src/nsTableRowGroupFrame.cpp | 8 +-- mozilla/layout/style/nsCSSStyleRule.cpp | 40 ++++++------- .../tables/BasicTableLayoutStrategy.cpp | 20 +++---- .../layout/tables/BasicTableLayoutStrategy.h | 4 +- mozilla/layout/tables/nsTableCellFrame.cpp | 32 +++++----- .../layout/tables/nsTableColGroupFrame.cpp | 14 ++--- mozilla/layout/tables/nsTableFrame.cpp | 50 ++++++++-------- mozilla/layout/tables/nsTableFrame.h | 2 +- mozilla/layout/tables/nsTableOuterFrame.cpp | 16 ++--- mozilla/layout/tables/nsTableRowFrame.cpp | 8 +-- .../layout/tables/nsTableRowGroupFrame.cpp | 8 +-- 66 files changed, 698 insertions(+), 704 deletions(-) diff --git a/mozilla/content/html/style/src/nsCSSLayout.cpp b/mozilla/content/html/style/src/nsCSSLayout.cpp index 479ad1684f8..af02f7a578f 100644 --- a/mozilla/content/html/style/src/nsCSSLayout.cpp +++ b/mozilla/content/html/style/src/nsCSSLayout.cpp @@ -40,7 +40,7 @@ NS_DEF_PTR(nsIContent); nscoord nsCSSLayout::VerticallyAlignChildren(nsIPresContext* aCX, nsIFrame* aContainer, - nsStyleFont* aContainerFont, + const nsStyleFont* aContainerFont, nscoord aY0, nsIFrame* aFirstChild, PRIntn aChildCount, @@ -62,7 +62,7 @@ nsCSSLayout::VerticallyAlignChildren(nsIPresContext* aCX, nsIStyleContextPtr kidSC; kid->GetStyleContext(aCX, kidSC.AssignRef()); - nsStyleText* textStyle = (nsStyleText*)kidSC->GetData(eStyleStruct_Text); + const nsStyleText* textStyle = (const nsStyleText*)kidSC->GetStyleData(eStyleStruct_Text); nsStyleUnit verticalAlignUnit = textStyle->mVerticalAlign.GetUnit(); PRUint8 verticalAlignEnum = NS_STYLE_VERTICAL_ALIGN_BASELINE; @@ -165,7 +165,7 @@ nsCSSLayout::VerticallyAlignChildren(nsIPresContext* aCX, nsIStyleContextPtr kidSC; kid->GetStyleContext(aCX, kidSC.AssignRef()); - nsStyleText* textStyle = (nsStyleText*)kidSC->GetData(eStyleStruct_Text); + const nsStyleText* textStyle = (const nsStyleText*)kidSC->GetStyleData(eStyleStruct_Text); nsStyleUnit verticalAlignUnit = textStyle->mVerticalAlign.GetUnit(); if (eStyleUnit_Percent == verticalAlignUnit) { @@ -264,8 +264,8 @@ nsCSSLayout::RelativePositionChildren(nsIPresContext* aCX, nsIStyleContextPtr kidSC; kid->GetStyleContext(aCX, kidSC.AssignRef()); - nsStylePosition* kidPosition = (nsStylePosition*) - kidSC->GetData(eStyleStruct_Position); + const nsStylePosition* kidPosition = (const nsStylePosition*) + kidSC->GetStyleData(eStyleStruct_Position); if (NS_STYLE_POSITION_RELATIVE == kidPosition->mPosition) { kid->GetOrigin(origin); // XXX Check the unit: could be auto or percent (not just length) @@ -282,8 +282,8 @@ nsCSSLayout::RelativePositionChildren(nsIPresContext* aCX, static PRBool GetStyleDimension(nsIPresContext* aPresContext, const nsReflowState& aReflowState, - nsStylePosition* aStylePos, - nsStyleCoord& aCoord, + const nsStylePosition* aStylePos, + const nsStyleCoord& aCoord, nscoord& aResult) { PRBool rv = PR_FALSE; @@ -341,8 +341,8 @@ nsCSSLayout::GetStyleSize(nsIPresContext* aPresContext, nsIStyleContext* sc = nsnull; aReflowState.frame->GetStyleContext(aPresContext, sc); if (nsnull != sc) { - nsStylePosition* pos = (nsStylePosition*) - sc->GetData(eStyleStruct_Position); + const nsStylePosition* pos = (const nsStylePosition*) + sc->GetStyleData(eStyleStruct_Position); if (GetStyleDimension(aPresContext, aReflowState, 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 b3c267cda08..f20d9b0af6c 100644 --- a/mozilla/content/html/style/src/nsCSSStyleRule.cpp +++ b/mozilla/content/html/style/src/nsCSSStyleRule.cpp @@ -160,10 +160,10 @@ public: virtual PRInt32 GetWeight(void) const; virtual void SetWeight(PRInt32 aWeight); - virtual nscoord CalcLength(const nsCSSValue& aValue, nsStyleFont* aFont, + virtual nscoord CalcLength(const nsCSSValue& aValue, const nsStyleFont* aFont, nsIPresContext* aPresContext); virtual PRBool SetCoord(const nsCSSValue& aValue, nsStyleCoord& aCoord, - PRInt32 aMask, nsStyleFont* aFont, + PRInt32 aMask, const nsStyleFont* aFont, nsIPresContext* aPresContext); virtual void MapStyleInto(nsIStyleContext* aContext, nsIPresContext* aPresContext); @@ -416,7 +416,7 @@ void CSSStyleRuleImpl::SetWeight(PRInt32 aWeight) } nscoord CSSStyleRuleImpl::CalcLength(const nsCSSValue& aValue, - nsStyleFont* aFont, + const nsStyleFont* aFont, nsIPresContext* aPresContext) { NS_ASSERTION(aValue.IsLengthUnit(), "not a length unit"); @@ -462,7 +462,7 @@ nscoord CSSStyleRuleImpl::CalcLength(const nsCSSValue& aValue, #define SETCOORD_IAH (SETCOORD_INTEGER | SETCOORD_AH) PRBool CSSStyleRuleImpl::SetCoord(const nsCSSValue& aValue, nsStyleCoord& aCoord, - PRInt32 aMask, nsStyleFont* aFont, + PRInt32 aMask, const nsStyleFont* aFont, nsIPresContext* aPresContext) { PRBool result = PR_TRUE; @@ -510,15 +510,15 @@ PRBool CSSStyleRuleImpl::SetCoord(const nsCSSValue& aValue, nsStyleCoord& aCoord void CSSStyleRuleImpl::MapStyleInto(nsIStyleContext* aContext, nsIPresContext* aPresContext) { if (nsnull != mDeclaration) { - nsStyleFont* font = (nsStyleFont*)aContext->GetData(eStyleStruct_Font); + nsStyleFont* font = (nsStyleFont*)aContext->GetMutableStyleData(eStyleStruct_Font); nsCSSFont* ourFont; if (NS_OK == mDeclaration->GetData(kCSSFontSID, (nsCSSStruct**)&ourFont)) { if (nsnull != ourFont) { - nsStyleFont* parentFont = font; + const nsStyleFont* parentFont = font; nsIStyleContext* parentContext = aContext->GetParent(); if (nsnull != parentContext) { - parentFont = (nsStyleFont*)parentContext->GetData(eStyleStruct_Font); + parentFont = (const nsStyleFont*)parentContext->GetStyleData(eStyleStruct_Font); } // font-family: string list @@ -620,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(eStyleStruct_Text); + nsStyleText* text = (nsStyleText*) aContext->GetMutableStyleData(eStyleStruct_Text); // letter-spacing SetCoord(ourText->mLetterSpacing, text->mLetterSpacing, SETCOORD_LH | SETCOORD_NORMAL, @@ -670,12 +670,12 @@ void CSSStyleRuleImpl::MapStyleInto(nsIStyleContext* aContext, nsIPresContext* a if (nsnull != ourDisplay) { // Get our style and our parent's style nsStyleDisplay* display = (nsStyleDisplay*) - aContext->GetData(eStyleStruct_Display); + aContext->GetMutableStyleData(eStyleStruct_Display); - nsStyleDisplay* parentDisplay = display; + const nsStyleDisplay* parentDisplay = display; nsIStyleContext* parentContext = aContext->GetParent(); if (nsnull != parentContext) { - parentDisplay = (nsStyleDisplay*)parentContext->GetData(eStyleStruct_Display); + parentDisplay = (const nsStyleDisplay*)parentContext->GetStyleData(eStyleStruct_Display); } // display @@ -767,7 +767,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(eStyleStruct_Color); + nsStyleColor* color = (nsStyleColor*)aContext->GetMutableStyleData(eStyleStruct_Color); // color: color if (ourColor->mColor.GetUnit() == eCSSUnit_Color) { @@ -850,12 +850,11 @@ void CSSStyleRuleImpl::MapStyleInto(nsIStyleContext* aContext, nsIPresContext* a else if (ourColor->mOpacity.GetUnit() == eCSSUnit_Number) { color->mOpacity = ourColor->mOpacity.GetFloatValue(); } - else if (ourColor->mOpacity.GetUnit() == eCSSUnit_Enumerated) { - // Only enum value is inherit - nsStyleColor* parentColor = color; + else if (ourColor->mOpacity.GetUnit() == eCSSUnit_Inherit) { + const nsStyleColor* parentColor = color; nsIStyleContext* parentContext = aContext->GetParent(); if (nsnull != parentContext) { - parentColor = (nsStyleColor*)parentContext->GetData(eStyleStruct_Color); + parentColor = (const nsStyleColor*)parentContext->GetStyleData(eStyleStruct_Color); color->mOpacity = parentColor->mOpacity; NS_RELEASE(parentContext); } @@ -870,7 +869,7 @@ void CSSStyleRuleImpl::MapStyleInto(nsIStyleContext* aContext, nsIPresContext* a if (NS_OK == mDeclaration->GetData(kCSSMarginSID, (nsCSSStruct**)&ourMargin)) { if (nsnull != ourMargin) { nsStyleSpacing* spacing = (nsStyleSpacing*) - aContext->GetData(eStyleStruct_Spacing); + aContext->GetMutableStyleData(eStyleStruct_Spacing); // margin: length, percent, auto, inherit if (nsnull != ourMargin->mMargin) { @@ -941,7 +940,6 @@ void CSSStyleRuleImpl::MapStyleInto(nsIStyleContext* aContext, nsIPresContext* a } // border-color - nsStyleColor* color = (nsStyleColor*)aContext->GetData(eStyleStruct_Color); if (nsnull != ourMargin->mColor) { nsCSSRect* ourColor = ourMargin->mColor; if (ourColor->mTop.GetUnit() == eCSSUnit_Color) { @@ -963,7 +961,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(eStyleStruct_Position); + nsStylePosition* position = (nsStylePosition*)aContext->GetMutableStyleData(eStyleStruct_Position); // position: normal, enum, inherit if (ourPosition->mPosition.GetUnit() == eCSSUnit_Normal) { @@ -976,7 +974,7 @@ void CSSStyleRuleImpl::MapStyleInto(nsIStyleContext* aContext, nsIPresContext* a // explicit inheritance nsIStyleContext* parentContext = aContext->GetParent(); if (nsnull != parentContext) { - nsStylePosition* parentPosition = (nsStylePosition*)parentContext->GetData(eStyleStruct_Position); + const nsStylePosition* parentPosition = (const nsStylePosition*)parentContext->GetStyleData(eStyleStruct_Position); position->mPosition = parentPosition->mPosition; } } @@ -995,7 +993,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(eStyleStruct_List); + nsStyleList* list = (nsStyleList*)aContext->GetMutableStyleData(eStyleStruct_List); // list-style-type: enum if (ourList->mType.GetUnit() == eCSSUnit_Enumerated) { diff --git a/mozilla/layout/base/src/nsContainerFrame.cpp b/mozilla/layout/base/src/nsContainerFrame.cpp index ef0ea6b994a..e7f52afeeb3 100644 --- a/mozilla/layout/base/src/nsContainerFrame.cpp +++ b/mozilla/layout/base/src/nsContainerFrame.cpp @@ -230,8 +230,8 @@ void nsContainerFrame::PaintChildren(nsIPresContext& aPresContext, const nsRect& aDirtyRect) { // Set clip rect so that children don't leak out of us - nsStyleDisplay* disp = - (nsStyleDisplay*)mStyleContext->GetData(eStyleStruct_Display); + const nsStyleDisplay* disp = + (const nsStyleDisplay*)mStyleContext->GetStyleData(eStyleStruct_Display); PRBool hidden = PR_FALSE; if (NS_STYLE_OVERFLOW_HIDDEN == disp->mOverflow) { aRenderingContext.PushState(); diff --git a/mozilla/layout/base/src/nsFrame.cpp b/mozilla/layout/base/src/nsFrame.cpp index f39bcb4c603..279e70d59f6 100644 --- a/mozilla/layout/base/src/nsFrame.cpp +++ b/mozilla/layout/base/src/nsFrame.cpp @@ -307,11 +307,11 @@ NS_METHOD nsFrame::DidSetStyleContext(nsIPresContext* aPresContext) return NS_OK; } -NS_METHOD nsFrame::GetStyleData(nsStyleStructID aSID, nsStyleStruct*& aStyleStruct) const +NS_METHOD nsFrame::GetStyleData(nsStyleStructID aSID, const nsStyleStruct*& aStyleStruct) const { NS_ASSERTION(mStyleContext!=nsnull,"null style context"); if (mStyleContext) { - aStyleStruct = mStyleContext->GetData(aSID); + aStyleStruct = mStyleContext->GetStyleData(aSID); } else { aStyleStruct = nsnull; } @@ -1289,14 +1289,14 @@ void nsFrame::Invalidate(const nsRect& aDamageRect) const // Style sizing methods NS_METHOD nsFrame::IsPercentageBase(PRBool& aBase) const { - nsStylePosition* position; - GetStyleData(eStyleStruct_Position, (nsStyleStruct*&)position); + const nsStylePosition* position; + GetStyleData(eStyleStruct_Position, (const nsStyleStruct*&)position); if (position->mPosition != NS_STYLE_POSITION_NORMAL) { aBase = PR_TRUE; } else { - nsStyleDisplay* display; - GetStyleData(eStyleStruct_Display, (nsStyleStruct*&)display); + const nsStyleDisplay* display; + GetStyleData(eStyleStruct_Display, (const 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 dc6fa371f41..cabb90fb338 100644 --- a/mozilla/layout/base/src/nsFrame.h +++ b/mozilla/layout/base/src/nsFrame.h @@ -93,7 +93,7 @@ public: NS_IMETHOD SetStyleContext(nsIPresContext* aPresContext, nsIStyleContext* aContext); // Get the style struct associated with this frame - NS_IMETHOD GetStyleData(nsStyleStructID aSID, nsStyleStruct*& aStyleStruct) const; + NS_IMETHOD GetStyleData(nsStyleStructID aSID, const nsStyleStruct*& aStyleStruct) const; // Geometric and content parent diff --git a/mozilla/layout/generic/nsBlockFrame.cpp b/mozilla/layout/generic/nsBlockFrame.cpp index 2c7262410e3..8c2eb03f416 100644 --- a/mozilla/layout/generic/nsBlockFrame.cpp +++ b/mozilla/layout/generic/nsBlockFrame.cpp @@ -57,7 +57,7 @@ void nsBlockBandData::ComputeAvailSpaceRect() nsBandTrapezoid* trapezoid = &data[i]; if (trapezoid->state != nsBandTrapezoid::Available) { - nsStyleDisplay* display; + const nsStyleDisplay* display; if (nsBandTrapezoid::OccupiedMultiple == trapezoid->state) { PRInt32 numFrames = trapezoid->frames->Count(); @@ -66,14 +66,14 @@ void nsBlockBandData::ComputeAvailSpaceRect() for (PRInt32 i = 0; i < numFrames; i++) { nsIFrame* f = (nsIFrame*)trapezoid->frames->ElementAt(i); - f->GetStyleData(eStyleStruct_Display, (nsStyleStruct*&)display); + f->GetStyleData(eStyleStruct_Display, (const nsStyleStruct*&)display); if (NS_STYLE_FLOAT_RIGHT == display->mFloats) { goto foundRightFloater; } } } else { - trapezoid->frame->GetStyleData(eStyleStruct_Display, (nsStyleStruct*&)display); + trapezoid->frame->GetStyleData(eStyleStruct_Display, (const nsStyleStruct*&)display); if (NS_STYLE_FLOAT_RIGHT == display->mFloats) { break; } @@ -91,13 +91,13 @@ void nsBlockBandData::ComputeAvailSpaceRect() // The trapezoid is available trapezoid->GetRect(availSpace); } else { - nsStyleDisplay* display; + const nsStyleDisplay* display; // The trapezoid is occupied. That means there's no available space trapezoid->GetRect(availSpace); // XXX Handle the case of multiple frames - trapezoid->frame->GetStyleData(eStyleStruct_Display, (nsStyleStruct*&)display); + trapezoid->frame->GetStyleData(eStyleStruct_Display, (const nsStyleStruct*&)display); if (NS_STYLE_FLOAT_LEFT == display->mFloats) { availSpace.x = availSpace.XMost(); } @@ -179,10 +179,10 @@ nsresult nsBlockReflowState::RecoverState(nsLineData* aLine) // If the previous line is a block, then factor in its bottom margin if (prevLine->mIsBlock) { - nsStyleSpacing* kidSpacing; - nsIFrame* kid = prevLine->mFirstChild; + const nsStyleSpacing* kidSpacing; + nsIFrame* kid = prevLine->mFirstChild; - kid->GetStyleData(eStyleStruct_Spacing, (nsStyleStruct*&)kidSpacing); + kid->GetStyleData(eStyleStruct_Spacing, (const nsStyleStruct*&)kidSpacing); nsMargin kidMargin; kidSpacing->CalcMarginFor(kid, kidMargin); if (kidMargin.bottom < 0) { @@ -511,7 +511,7 @@ nsBlockFrame::ReflowBlockChild(nsIFrame* aKidFrame, nsBandTrapezoid* trapezoid = &trapezoids[i]; if (trapezoid->state != nsBandTrapezoid::Available) { - nsStyleDisplay* display; + const nsStyleDisplay* display; if (nsBandTrapezoid::OccupiedMultiple == trapezoid->state) { PRInt32 numFrames = trapezoid->frames->Count(); @@ -520,14 +520,14 @@ nsBlockFrame::ReflowBlockChild(nsIFrame* aKidFrame, for (PRInt32 i = 0; i < numFrames; i++) { nsIFrame* f = (nsIFrame*)trapezoid->frames->ElementAt(i); - f->GetStyleData(eStyleStruct_Display, (nsStyleStruct*&)display); + f->GetStyleData(eStyleStruct_Display, (const nsStyleStruct*&)display); if (NS_STYLE_FLOAT_RIGHT == display->mFloats) { goto foundRightFloater; } } } else { - trapezoid->frame->GetStyleData(eStyleStruct_Display, (nsStyleStruct*&)display); + trapezoid->frame->GetStyleData(eStyleStruct_Display, (const nsStyleStruct*&)display); if (NS_STYLE_FLOAT_RIGHT == display->mFloats) { break; } @@ -545,13 +545,13 @@ nsBlockFrame::ReflowBlockChild(nsIFrame* aKidFrame, // The trapezoid is available trapezoid->GetRect(availBand); } else { - nsStyleDisplay* display; + const nsStyleDisplay* display; // The trapezoid is occupied. That means there's no available space trapezoid->GetRect(availBand); // XXX Handle the case of multiple frames - trapezoid->frame->GetStyleData(eStyleStruct_Display, (nsStyleStruct*&)display); + trapezoid->frame->GetStyleData(eStyleStruct_Display, (const nsStyleStruct*&)display); if (NS_STYLE_FLOAT_LEFT == display->mFloats) { availBand.x = availBand.XMost(); } @@ -692,7 +692,7 @@ nsBlockFrame::ClearFloaters(nsBlockReflowState& aState, PRUint8 aBreakType) nsRect tmp; PRInt32 i; for (i = 0; i < aState.mCurrentBand.count; i++) { - nsStyleDisplay* display; + const nsStyleDisplay* display; nsBandTrapezoid* trapezoid = &aState.mCurrentBand.data[i]; if (trapezoid->state != nsBandTrapezoid::Available) { if (nsBandTrapezoid::OccupiedMultiple == trapezoid->state) { @@ -700,7 +700,7 @@ nsBlockFrame::ClearFloaters(nsBlockReflowState& aState, PRUint8 aBreakType) NS_ASSERTION(numFrames > 0, "bad trapezoid frame list"); for (fn = 0; fn < numFrames; fn++) { nsIFrame* f = (nsIFrame*) trapezoid->frames->ElementAt(fn); - f->GetStyleData(eStyleStruct_Display, (nsStyleStruct*&)display); + f->GetStyleData(eStyleStruct_Display, (const nsStyleStruct*&)display); switch (display->mFloats) { case NS_STYLE_FLOAT_LEFT: @@ -728,7 +728,7 @@ nsBlockFrame::ClearFloaters(nsBlockReflowState& aState, PRUint8 aBreakType) } else { trapezoid->frame->GetStyleData(eStyleStruct_Display, - (nsStyleStruct*&)display); + (const nsStyleStruct*&)display); switch (display->mFloats) { case NS_STYLE_FLOAT_LEFT: if ((NS_STYLE_CLEAR_LEFT == aBreakType) || @@ -1228,10 +1228,10 @@ nsBlockFrame::InitializeState(nsIPresContext* aPresContext, // Apply border and padding adjustments for regular frames only if (!aState.mBlockIsPseudo) { - nsStyleSpacing* mySpacing = (nsStyleSpacing*) - mStyleContext->GetData(eStyleStruct_Spacing); - nsStylePosition* myPosition = (nsStylePosition*) - mStyleContext->GetData(eStyleStruct_Position); + const nsStyleSpacing* mySpacing = (const nsStyleSpacing*) + mStyleContext->GetStyleData(eStyleStruct_Spacing); + const nsStylePosition* myPosition = (const nsStylePosition*) + mStyleContext->GetStyleData(eStyleStruct_Position); mySpacing->CalcBorderPaddingFor(this, aState.mBorderPadding); aState.mY = aState.mBorderPadding.top; @@ -1287,11 +1287,11 @@ nsBlockFrame::InitializeState(nsIPresContext* aPresContext, // Setup list flags in block reflow state if this block is a list // item. - nsStyleDisplay* myDisplay = (nsStyleDisplay*) - mStyleContext->GetData(eStyleStruct_Display); + const nsStyleDisplay* myDisplay = (const nsStyleDisplay*) + mStyleContext->GetStyleData(eStyleStruct_Display); if (NS_STYLE_DISPLAY_LIST_ITEM == myDisplay->mDisplay) { - nsStyleList* myList = (nsStyleList*) - mStyleContext->GetData(eStyleStruct_List); + const nsStyleList* myList = (const nsStyleList*) + mStyleContext->GetStyleData(eStyleStruct_List); if (NS_STYLE_LIST_STYLE_POSITION_OUTSIDE == myList->mListStylePosition) { aState.mListPositionOutside = PR_TRUE; } @@ -1774,8 +1774,8 @@ nsBlockFrame::PlaceFloater(nsIPresContext* aPresContext, nsISpaceManager* sm = aState.mSpaceManager; // Get the type of floater - nsStyleDisplay* floaterDisplay; - aFloater->GetStyleData(eStyleStruct_Display, (nsStyleStruct*&)floaterDisplay); + const nsStyleDisplay* floaterDisplay; + aFloater->GetStyleData(eStyleStruct_Display, (const nsStyleStruct*&)floaterDisplay); // Commit some space in the space manager, and adjust our current // band of available space. @@ -1833,8 +1833,8 @@ nsBlockFrame::PlaceBelowCurrentLineFloaters(nsBlockReflowState& aState, GetAvailableSpace(aState, aY); // Get the type of floater - nsStyleDisplay* sd; - floater->GetStyleData(eStyleStruct_Display, (nsStyleStruct*&)sd); + const nsStyleDisplay* sd; + floater->GetStyleData(eStyleStruct_Display, (const 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 2c7262410e3..8c2eb03f416 100644 --- a/mozilla/layout/generic/nsBlockReflowState.cpp +++ b/mozilla/layout/generic/nsBlockReflowState.cpp @@ -57,7 +57,7 @@ void nsBlockBandData::ComputeAvailSpaceRect() nsBandTrapezoid* trapezoid = &data[i]; if (trapezoid->state != nsBandTrapezoid::Available) { - nsStyleDisplay* display; + const nsStyleDisplay* display; if (nsBandTrapezoid::OccupiedMultiple == trapezoid->state) { PRInt32 numFrames = trapezoid->frames->Count(); @@ -66,14 +66,14 @@ void nsBlockBandData::ComputeAvailSpaceRect() for (PRInt32 i = 0; i < numFrames; i++) { nsIFrame* f = (nsIFrame*)trapezoid->frames->ElementAt(i); - f->GetStyleData(eStyleStruct_Display, (nsStyleStruct*&)display); + f->GetStyleData(eStyleStruct_Display, (const nsStyleStruct*&)display); if (NS_STYLE_FLOAT_RIGHT == display->mFloats) { goto foundRightFloater; } } } else { - trapezoid->frame->GetStyleData(eStyleStruct_Display, (nsStyleStruct*&)display); + trapezoid->frame->GetStyleData(eStyleStruct_Display, (const nsStyleStruct*&)display); if (NS_STYLE_FLOAT_RIGHT == display->mFloats) { break; } @@ -91,13 +91,13 @@ void nsBlockBandData::ComputeAvailSpaceRect() // The trapezoid is available trapezoid->GetRect(availSpace); } else { - nsStyleDisplay* display; + const nsStyleDisplay* display; // The trapezoid is occupied. That means there's no available space trapezoid->GetRect(availSpace); // XXX Handle the case of multiple frames - trapezoid->frame->GetStyleData(eStyleStruct_Display, (nsStyleStruct*&)display); + trapezoid->frame->GetStyleData(eStyleStruct_Display, (const nsStyleStruct*&)display); if (NS_STYLE_FLOAT_LEFT == display->mFloats) { availSpace.x = availSpace.XMost(); } @@ -179,10 +179,10 @@ nsresult nsBlockReflowState::RecoverState(nsLineData* aLine) // If the previous line is a block, then factor in its bottom margin if (prevLine->mIsBlock) { - nsStyleSpacing* kidSpacing; - nsIFrame* kid = prevLine->mFirstChild; + const nsStyleSpacing* kidSpacing; + nsIFrame* kid = prevLine->mFirstChild; - kid->GetStyleData(eStyleStruct_Spacing, (nsStyleStruct*&)kidSpacing); + kid->GetStyleData(eStyleStruct_Spacing, (const nsStyleStruct*&)kidSpacing); nsMargin kidMargin; kidSpacing->CalcMarginFor(kid, kidMargin); if (kidMargin.bottom < 0) { @@ -511,7 +511,7 @@ nsBlockFrame::ReflowBlockChild(nsIFrame* aKidFrame, nsBandTrapezoid* trapezoid = &trapezoids[i]; if (trapezoid->state != nsBandTrapezoid::Available) { - nsStyleDisplay* display; + const nsStyleDisplay* display; if (nsBandTrapezoid::OccupiedMultiple == trapezoid->state) { PRInt32 numFrames = trapezoid->frames->Count(); @@ -520,14 +520,14 @@ nsBlockFrame::ReflowBlockChild(nsIFrame* aKidFrame, for (PRInt32 i = 0; i < numFrames; i++) { nsIFrame* f = (nsIFrame*)trapezoid->frames->ElementAt(i); - f->GetStyleData(eStyleStruct_Display, (nsStyleStruct*&)display); + f->GetStyleData(eStyleStruct_Display, (const nsStyleStruct*&)display); if (NS_STYLE_FLOAT_RIGHT == display->mFloats) { goto foundRightFloater; } } } else { - trapezoid->frame->GetStyleData(eStyleStruct_Display, (nsStyleStruct*&)display); + trapezoid->frame->GetStyleData(eStyleStruct_Display, (const nsStyleStruct*&)display); if (NS_STYLE_FLOAT_RIGHT == display->mFloats) { break; } @@ -545,13 +545,13 @@ nsBlockFrame::ReflowBlockChild(nsIFrame* aKidFrame, // The trapezoid is available trapezoid->GetRect(availBand); } else { - nsStyleDisplay* display; + const nsStyleDisplay* display; // The trapezoid is occupied. That means there's no available space trapezoid->GetRect(availBand); // XXX Handle the case of multiple frames - trapezoid->frame->GetStyleData(eStyleStruct_Display, (nsStyleStruct*&)display); + trapezoid->frame->GetStyleData(eStyleStruct_Display, (const nsStyleStruct*&)display); if (NS_STYLE_FLOAT_LEFT == display->mFloats) { availBand.x = availBand.XMost(); } @@ -692,7 +692,7 @@ nsBlockFrame::ClearFloaters(nsBlockReflowState& aState, PRUint8 aBreakType) nsRect tmp; PRInt32 i; for (i = 0; i < aState.mCurrentBand.count; i++) { - nsStyleDisplay* display; + const nsStyleDisplay* display; nsBandTrapezoid* trapezoid = &aState.mCurrentBand.data[i]; if (trapezoid->state != nsBandTrapezoid::Available) { if (nsBandTrapezoid::OccupiedMultiple == trapezoid->state) { @@ -700,7 +700,7 @@ nsBlockFrame::ClearFloaters(nsBlockReflowState& aState, PRUint8 aBreakType) NS_ASSERTION(numFrames > 0, "bad trapezoid frame list"); for (fn = 0; fn < numFrames; fn++) { nsIFrame* f = (nsIFrame*) trapezoid->frames->ElementAt(fn); - f->GetStyleData(eStyleStruct_Display, (nsStyleStruct*&)display); + f->GetStyleData(eStyleStruct_Display, (const nsStyleStruct*&)display); switch (display->mFloats) { case NS_STYLE_FLOAT_LEFT: @@ -728,7 +728,7 @@ nsBlockFrame::ClearFloaters(nsBlockReflowState& aState, PRUint8 aBreakType) } else { trapezoid->frame->GetStyleData(eStyleStruct_Display, - (nsStyleStruct*&)display); + (const nsStyleStruct*&)display); switch (display->mFloats) { case NS_STYLE_FLOAT_LEFT: if ((NS_STYLE_CLEAR_LEFT == aBreakType) || @@ -1228,10 +1228,10 @@ nsBlockFrame::InitializeState(nsIPresContext* aPresContext, // Apply border and padding adjustments for regular frames only if (!aState.mBlockIsPseudo) { - nsStyleSpacing* mySpacing = (nsStyleSpacing*) - mStyleContext->GetData(eStyleStruct_Spacing); - nsStylePosition* myPosition = (nsStylePosition*) - mStyleContext->GetData(eStyleStruct_Position); + const nsStyleSpacing* mySpacing = (const nsStyleSpacing*) + mStyleContext->GetStyleData(eStyleStruct_Spacing); + const nsStylePosition* myPosition = (const nsStylePosition*) + mStyleContext->GetStyleData(eStyleStruct_Position); mySpacing->CalcBorderPaddingFor(this, aState.mBorderPadding); aState.mY = aState.mBorderPadding.top; @@ -1287,11 +1287,11 @@ nsBlockFrame::InitializeState(nsIPresContext* aPresContext, // Setup list flags in block reflow state if this block is a list // item. - nsStyleDisplay* myDisplay = (nsStyleDisplay*) - mStyleContext->GetData(eStyleStruct_Display); + const nsStyleDisplay* myDisplay = (const nsStyleDisplay*) + mStyleContext->GetStyleData(eStyleStruct_Display); if (NS_STYLE_DISPLAY_LIST_ITEM == myDisplay->mDisplay) { - nsStyleList* myList = (nsStyleList*) - mStyleContext->GetData(eStyleStruct_List); + const nsStyleList* myList = (const nsStyleList*) + mStyleContext->GetStyleData(eStyleStruct_List); if (NS_STYLE_LIST_STYLE_POSITION_OUTSIDE == myList->mListStylePosition) { aState.mListPositionOutside = PR_TRUE; } @@ -1774,8 +1774,8 @@ nsBlockFrame::PlaceFloater(nsIPresContext* aPresContext, nsISpaceManager* sm = aState.mSpaceManager; // Get the type of floater - nsStyleDisplay* floaterDisplay; - aFloater->GetStyleData(eStyleStruct_Display, (nsStyleStruct*&)floaterDisplay); + const nsStyleDisplay* floaterDisplay; + aFloater->GetStyleData(eStyleStruct_Display, (const nsStyleStruct*&)floaterDisplay); // Commit some space in the space manager, and adjust our current // band of available space. @@ -1833,8 +1833,8 @@ nsBlockFrame::PlaceBelowCurrentLineFloaters(nsBlockReflowState& aState, GetAvailableSpace(aState, aY); // Get the type of floater - nsStyleDisplay* sd; - floater->GetStyleData(eStyleStruct_Display, (nsStyleStruct*&)sd); + const nsStyleDisplay* sd; + floater->GetStyleData(eStyleStruct_Display, (const 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 2c7262410e3..8c2eb03f416 100644 --- a/mozilla/layout/generic/nsBlockReflowState.h +++ b/mozilla/layout/generic/nsBlockReflowState.h @@ -57,7 +57,7 @@ void nsBlockBandData::ComputeAvailSpaceRect() nsBandTrapezoid* trapezoid = &data[i]; if (trapezoid->state != nsBandTrapezoid::Available) { - nsStyleDisplay* display; + const nsStyleDisplay* display; if (nsBandTrapezoid::OccupiedMultiple == trapezoid->state) { PRInt32 numFrames = trapezoid->frames->Count(); @@ -66,14 +66,14 @@ void nsBlockBandData::ComputeAvailSpaceRect() for (PRInt32 i = 0; i < numFrames; i++) { nsIFrame* f = (nsIFrame*)trapezoid->frames->ElementAt(i); - f->GetStyleData(eStyleStruct_Display, (nsStyleStruct*&)display); + f->GetStyleData(eStyleStruct_Display, (const nsStyleStruct*&)display); if (NS_STYLE_FLOAT_RIGHT == display->mFloats) { goto foundRightFloater; } } } else { - trapezoid->frame->GetStyleData(eStyleStruct_Display, (nsStyleStruct*&)display); + trapezoid->frame->GetStyleData(eStyleStruct_Display, (const nsStyleStruct*&)display); if (NS_STYLE_FLOAT_RIGHT == display->mFloats) { break; } @@ -91,13 +91,13 @@ void nsBlockBandData::ComputeAvailSpaceRect() // The trapezoid is available trapezoid->GetRect(availSpace); } else { - nsStyleDisplay* display; + const nsStyleDisplay* display; // The trapezoid is occupied. That means there's no available space trapezoid->GetRect(availSpace); // XXX Handle the case of multiple frames - trapezoid->frame->GetStyleData(eStyleStruct_Display, (nsStyleStruct*&)display); + trapezoid->frame->GetStyleData(eStyleStruct_Display, (const nsStyleStruct*&)display); if (NS_STYLE_FLOAT_LEFT == display->mFloats) { availSpace.x = availSpace.XMost(); } @@ -179,10 +179,10 @@ nsresult nsBlockReflowState::RecoverState(nsLineData* aLine) // If the previous line is a block, then factor in its bottom margin if (prevLine->mIsBlock) { - nsStyleSpacing* kidSpacing; - nsIFrame* kid = prevLine->mFirstChild; + const nsStyleSpacing* kidSpacing; + nsIFrame* kid = prevLine->mFirstChild; - kid->GetStyleData(eStyleStruct_Spacing, (nsStyleStruct*&)kidSpacing); + kid->GetStyleData(eStyleStruct_Spacing, (const nsStyleStruct*&)kidSpacing); nsMargin kidMargin; kidSpacing->CalcMarginFor(kid, kidMargin); if (kidMargin.bottom < 0) { @@ -511,7 +511,7 @@ nsBlockFrame::ReflowBlockChild(nsIFrame* aKidFrame, nsBandTrapezoid* trapezoid = &trapezoids[i]; if (trapezoid->state != nsBandTrapezoid::Available) { - nsStyleDisplay* display; + const nsStyleDisplay* display; if (nsBandTrapezoid::OccupiedMultiple == trapezoid->state) { PRInt32 numFrames = trapezoid->frames->Count(); @@ -520,14 +520,14 @@ nsBlockFrame::ReflowBlockChild(nsIFrame* aKidFrame, for (PRInt32 i = 0; i < numFrames; i++) { nsIFrame* f = (nsIFrame*)trapezoid->frames->ElementAt(i); - f->GetStyleData(eStyleStruct_Display, (nsStyleStruct*&)display); + f->GetStyleData(eStyleStruct_Display, (const nsStyleStruct*&)display); if (NS_STYLE_FLOAT_RIGHT == display->mFloats) { goto foundRightFloater; } } } else { - trapezoid->frame->GetStyleData(eStyleStruct_Display, (nsStyleStruct*&)display); + trapezoid->frame->GetStyleData(eStyleStruct_Display, (const nsStyleStruct*&)display); if (NS_STYLE_FLOAT_RIGHT == display->mFloats) { break; } @@ -545,13 +545,13 @@ nsBlockFrame::ReflowBlockChild(nsIFrame* aKidFrame, // The trapezoid is available trapezoid->GetRect(availBand); } else { - nsStyleDisplay* display; + const nsStyleDisplay* display; // The trapezoid is occupied. That means there's no available space trapezoid->GetRect(availBand); // XXX Handle the case of multiple frames - trapezoid->frame->GetStyleData(eStyleStruct_Display, (nsStyleStruct*&)display); + trapezoid->frame->GetStyleData(eStyleStruct_Display, (const nsStyleStruct*&)display); if (NS_STYLE_FLOAT_LEFT == display->mFloats) { availBand.x = availBand.XMost(); } @@ -692,7 +692,7 @@ nsBlockFrame::ClearFloaters(nsBlockReflowState& aState, PRUint8 aBreakType) nsRect tmp; PRInt32 i; for (i = 0; i < aState.mCurrentBand.count; i++) { - nsStyleDisplay* display; + const nsStyleDisplay* display; nsBandTrapezoid* trapezoid = &aState.mCurrentBand.data[i]; if (trapezoid->state != nsBandTrapezoid::Available) { if (nsBandTrapezoid::OccupiedMultiple == trapezoid->state) { @@ -700,7 +700,7 @@ nsBlockFrame::ClearFloaters(nsBlockReflowState& aState, PRUint8 aBreakType) NS_ASSERTION(numFrames > 0, "bad trapezoid frame list"); for (fn = 0; fn < numFrames; fn++) { nsIFrame* f = (nsIFrame*) trapezoid->frames->ElementAt(fn); - f->GetStyleData(eStyleStruct_Display, (nsStyleStruct*&)display); + f->GetStyleData(eStyleStruct_Display, (const nsStyleStruct*&)display); switch (display->mFloats) { case NS_STYLE_FLOAT_LEFT: @@ -728,7 +728,7 @@ nsBlockFrame::ClearFloaters(nsBlockReflowState& aState, PRUint8 aBreakType) } else { trapezoid->frame->GetStyleData(eStyleStruct_Display, - (nsStyleStruct*&)display); + (const nsStyleStruct*&)display); switch (display->mFloats) { case NS_STYLE_FLOAT_LEFT: if ((NS_STYLE_CLEAR_LEFT == aBreakType) || @@ -1228,10 +1228,10 @@ nsBlockFrame::InitializeState(nsIPresContext* aPresContext, // Apply border and padding adjustments for regular frames only if (!aState.mBlockIsPseudo) { - nsStyleSpacing* mySpacing = (nsStyleSpacing*) - mStyleContext->GetData(eStyleStruct_Spacing); - nsStylePosition* myPosition = (nsStylePosition*) - mStyleContext->GetData(eStyleStruct_Position); + const nsStyleSpacing* mySpacing = (const nsStyleSpacing*) + mStyleContext->GetStyleData(eStyleStruct_Spacing); + const nsStylePosition* myPosition = (const nsStylePosition*) + mStyleContext->GetStyleData(eStyleStruct_Position); mySpacing->CalcBorderPaddingFor(this, aState.mBorderPadding); aState.mY = aState.mBorderPadding.top; @@ -1287,11 +1287,11 @@ nsBlockFrame::InitializeState(nsIPresContext* aPresContext, // Setup list flags in block reflow state if this block is a list // item. - nsStyleDisplay* myDisplay = (nsStyleDisplay*) - mStyleContext->GetData(eStyleStruct_Display); + const nsStyleDisplay* myDisplay = (const nsStyleDisplay*) + mStyleContext->GetStyleData(eStyleStruct_Display); if (NS_STYLE_DISPLAY_LIST_ITEM == myDisplay->mDisplay) { - nsStyleList* myList = (nsStyleList*) - mStyleContext->GetData(eStyleStruct_List); + const nsStyleList* myList = (const nsStyleList*) + mStyleContext->GetStyleData(eStyleStruct_List); if (NS_STYLE_LIST_STYLE_POSITION_OUTSIDE == myList->mListStylePosition) { aState.mListPositionOutside = PR_TRUE; } @@ -1774,8 +1774,8 @@ nsBlockFrame::PlaceFloater(nsIPresContext* aPresContext, nsISpaceManager* sm = aState.mSpaceManager; // Get the type of floater - nsStyleDisplay* floaterDisplay; - aFloater->GetStyleData(eStyleStruct_Display, (nsStyleStruct*&)floaterDisplay); + const nsStyleDisplay* floaterDisplay; + aFloater->GetStyleData(eStyleStruct_Display, (const nsStyleStruct*&)floaterDisplay); // Commit some space in the space manager, and adjust our current // band of available space. @@ -1833,8 +1833,8 @@ nsBlockFrame::PlaceBelowCurrentLineFloaters(nsBlockReflowState& aState, GetAvailableSpace(aState, aY); // Get the type of floater - nsStyleDisplay* sd; - floater->GetStyleData(eStyleStruct_Display, (nsStyleStruct*&)sd); + const nsStyleDisplay* sd; + floater->GetStyleData(eStyleStruct_Display, (const 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 9ccf0d7fb79..c519c597ae9 100644 --- a/mozilla/layout/generic/nsHTMLContainerFrame.cpp +++ b/mozilla/layout/generic/nsHTMLContainerFrame.cpp @@ -57,15 +57,15 @@ NS_METHOD nsHTMLContainerFrame::Paint(nsIPresContext& aPresContext, const nsRect& aDirtyRect) { // Paint our background and border - nsStyleDisplay* disp = - (nsStyleDisplay*)mStyleContext->GetData(eStyleStruct_Display); + const nsStyleDisplay* disp = + (const nsStyleDisplay*)mStyleContext->GetStyleData(eStyleStruct_Display); if (disp->mVisible && mRect.width && mRect.height) { PRIntn skipSides = GetSkipSides(); - nsStyleColor* color = - (nsStyleColor*)mStyleContext->GetData(eStyleStruct_Color); - nsStyleSpacing* spacing = - (nsStyleSpacing*)mStyleContext->GetData(eStyleStruct_Spacing); + const nsStyleColor* color = + (const nsStyleColor*)mStyleContext->GetStyleData(eStyleStruct_Color); + const nsStyleSpacing* spacing = + (const nsStyleSpacing*)mStyleContext->GetStyleData(eStyleStruct_Spacing); nsCSSRendering::PaintBackground(aPresContext, aRenderingContext, this, aDirtyRect, mRect, *color); nsCSSRendering::PaintBorder(aPresContext, aRenderingContext, this, @@ -191,8 +191,8 @@ NS_METHOD nsHTMLContainerFrame::GetCursorAt(nsIPresContext& aPresContext, PRInt32& aCursor) { // Get my cursor - nsStyleColor* styleColor = (nsStyleColor*) - mStyleContext->GetData(eStyleStruct_Color); + const nsStyleColor* styleColor = (const nsStyleColor*) + mStyleContext->GetStyleData(eStyleStruct_Color); PRInt32 myCursor = styleColor->mCursor; // Get child's cursor, if any @@ -297,11 +297,11 @@ nsHTMLContainerFrame::CreateFrameFor(nsIPresContext* aPresContext, nsIFrame*& aResult) { // Get the style data for the frame - nsStylePosition* position = (nsStylePosition*) - aStyleContext->GetData(eStyleStruct_Position); - nsStyleDisplay* display = (nsStyleDisplay*) - aStyleContext->GetData(eStyleStruct_Display); - nsIFrame* frame = nsnull; + const nsStylePosition* position = (const nsStylePosition*) + aStyleContext->GetStyleData(eStyleStruct_Position); + const nsStyleDisplay* display = (const nsStyleDisplay*) + aStyleContext->GetStyleData(eStyleStruct_Display); + nsIFrame* frame = nsnull; // See whether it wants any special handling nsresult rv; @@ -448,8 +448,8 @@ NS_METHOD nsHTMLContainerFrame::ContentInserted(nsIPresShell* aShell, nsresult nsHTMLContainerFrame::ProcessInitialReflow(nsIPresContext* aPresContext) { - nsStyleDisplay* display = (nsStyleDisplay*) - mStyleContext->GetData(eStyleStruct_Display); + const nsStyleDisplay* display = (const nsStyleDisplay*) + mStyleContext->GetStyleData(eStyleStruct_Display); NS_FRAME_LOG(NS_FRAME_TRACE_CALLS, ("nsHTMLContainerFrame::ProcessInitialReflow: display=%d", display->mDisplay)); diff --git a/mozilla/layout/generic/nsHTMLFrame.cpp b/mozilla/layout/generic/nsHTMLFrame.cpp index 47dc0c0a5ed..d28e561d87f 100644 --- a/mozilla/layout/generic/nsHTMLFrame.cpp +++ b/mozilla/layout/generic/nsHTMLFrame.cpp @@ -43,14 +43,14 @@ nsHTMLFrame::CreateViewForFrame(nsIPresContext* aPresContext, aFrame->GetGeometricParent(parent); if (nsnull != parent) { // Get my nsStyleColor - nsStyleColor* myColor = (nsStyleColor*) - aStyleContext->GetData(eStyleStruct_Color); + const nsStyleColor* myColor = (const nsStyleColor*) + aStyleContext->GetStyleData(eStyleStruct_Color); // Get parent's nsStyleColor nsIStyleContext* parentSC; parent->GetStyleContext(aPresContext, parentSC); - nsStyleColor* parentColor = (nsStyleColor*) - parentSC->GetData(eStyleStruct_Color); + const nsStyleColor* parentColor = (const nsStyleColor*) + parentSC->GetStyleData(eStyleStruct_Color); // If the opacities are different then I need a view if (myColor->mOpacity != parentColor->mOpacity) { @@ -65,8 +65,8 @@ nsHTMLFrame::CreateViewForFrame(nsIPresContext* aPresContext, // See if the frame is being relatively positioned if (!aForce) { - nsStylePosition* position = (nsStylePosition*) - aStyleContext->GetData(eStyleStruct_Position); + const nsStylePosition* position = (const nsStylePosition*) + aStyleContext->GetStyleData(eStyleStruct_Position); if (NS_STYLE_POSITION_RELATIVE == position->mPosition) { NS_FRAME_LOG(NS_FRAME_TRACE_CALLS, ("nsHTMLFrame::CreateViewForFrame: frame=%p relatively positioned", diff --git a/mozilla/layout/generic/nsInlineFrame.cpp b/mozilla/layout/generic/nsInlineFrame.cpp index baafb82bbd1..b6aa3a24018 100644 --- a/mozilla/layout/generic/nsInlineFrame.cpp +++ b/mozilla/layout/generic/nsInlineFrame.cpp @@ -53,7 +53,7 @@ NS_DEF_PTR(nsIContentDelegate); class nsInlineState { public: - nsStyleFont* font; // style font + const nsStyleFont* font; // style font nsMargin borderPadding; // inner margin nsSize mStyleSize; PRIntn mStyleSizeFlags; @@ -73,7 +73,7 @@ public: // Constructor nsInlineState(nsIPresContext* aPresContext, nsIFrame* aInlineFrame, - nsStyleFont* aStyleFont, + const nsStyleFont* aStyleFont, const nsMargin& aBorderPadding, const nsReflowState& aReflowState, nsSize* aMaxElementSize) @@ -681,10 +681,10 @@ nsInlineFrame::ReflowUnmappedChildren(nsIPresContext* aPresContext, // Figure out how we should treat the child nsIFrame* kidFrame; - nsStyleDisplay* kidDisplay = - (nsStyleDisplay*)kidStyleContext->GetData(eStyleStruct_Display); - nsStylePosition* kidPosition = (nsStylePosition*) - kidStyleContext->GetData(eStyleStruct_Position); + const nsStyleDisplay* kidDisplay = + (const nsStyleDisplay*)kidStyleContext->GetStyleData(eStyleStruct_Display); + const nsStylePosition* kidPosition = (const nsStylePosition*) + kidStyleContext->GetStyleData(eStyleStruct_Position); // Check whether it wants to floated or absolutely positioned nsresult rv; @@ -831,10 +831,10 @@ NS_METHOD nsInlineFrame::Reflow(nsIPresContext* aPresContext, aStatus = NS_FRAME_COMPLETE; // initialize out parameter // Get the style molecule - nsStyleFont* styleFont = (nsStyleFont*) - mStyleContext->GetData(eStyleStruct_Font); - nsStyleSpacing* styleSpacing = (nsStyleSpacing*) - mStyleContext->GetData(eStyleStruct_Spacing); + const nsStyleFont* styleFont = (const nsStyleFont*) + mStyleContext->GetStyleData(eStyleStruct_Font); + const nsStyleSpacing* styleSpacing = (const nsStyleSpacing*) + mStyleContext->GetStyleData(eStyleStruct_Spacing); // Check for an overflow list if (eReflowReason_Incremental != aReflowState.reason) { diff --git a/mozilla/layout/generic/nsLeafFrame.cpp b/mozilla/layout/generic/nsLeafFrame.cpp index 7e31f64b784..c108dd6dcb6 100644 --- a/mozilla/layout/generic/nsLeafFrame.cpp +++ b/mozilla/layout/generic/nsLeafFrame.cpp @@ -32,14 +32,14 @@ NS_METHOD nsLeafFrame::Paint(nsIPresContext& aPresContext, nsIRenderingContext& aRenderingContext, const nsRect& aDirtyRect) { - nsStyleDisplay* disp = - (nsStyleDisplay*)mStyleContext->GetData(eStyleStruct_Display); + const nsStyleDisplay* disp = + (const nsStyleDisplay*)mStyleContext->GetStyleData(eStyleStruct_Display); if (disp->mVisible) { - nsStyleColor* myColor = - (nsStyleColor*)mStyleContext->GetData(eStyleStruct_Color); - nsStyleSpacing* mySpacing = - (nsStyleSpacing*)mStyleContext->GetData(eStyleStruct_Spacing); + const nsStyleColor* myColor = + (const nsStyleColor*)mStyleContext->GetStyleData(eStyleStruct_Color); + const nsStyleSpacing* mySpacing = + (const nsStyleSpacing*)mStyleContext->GetStyleData(eStyleStruct_Spacing); nsCSSRendering::PaintBackground(aPresContext, aRenderingContext, this, aDirtyRect, mRect, *myColor); nsCSSRendering::PaintBorder(aPresContext, aRenderingContext, this, @@ -73,8 +73,8 @@ NS_METHOD nsLeafFrame::Reflow(nsIPresContext* aPresContext, void nsLeafFrame::AddBordersAndPadding(nsIPresContext* aPresContext, nsReflowMetrics& aDesiredSize) { - nsStyleSpacing* space = - (nsStyleSpacing*)mStyleContext->GetData(eStyleStruct_Spacing); + const nsStyleSpacing* space = + (const nsStyleSpacing*)mStyleContext->GetStyleData(eStyleStruct_Spacing); nsMargin borderPadding; space->CalcBorderPaddingFor(this, borderPadding); aDesiredSize.width += borderPadding.left + borderPadding.right; @@ -86,8 +86,8 @@ void nsLeafFrame::AddBordersAndPadding(nsIPresContext* aPresContext, void nsLeafFrame::GetInnerArea(nsIPresContext* aPresContext, nsRect& aInnerArea) const { - nsStyleSpacing* space = - (nsStyleSpacing*)mStyleContext->GetData(eStyleStruct_Spacing); + const nsStyleSpacing* space = + (const nsStyleSpacing*)mStyleContext->GetStyleData(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 adcc8df82a0..08ef847e114 100644 --- a/mozilla/layout/generic/nsLineLayout.cpp +++ b/mozilla/layout/generic/nsLineLayout.cpp @@ -113,8 +113,8 @@ nsLineData::Verify(PRBool aFinalCheck) const nsIFrame* child = mFirstChild; nsIStyleContext* sc; child->GetStyleContext(nsnull, sc); - nsStyleDisplay* display = (nsStyleDisplay*) - sc->GetData(eStyleStruct_Display); + const nsStyleDisplay* display = (const nsStyleDisplay*) + sc->GetStyleData(eStyleStruct_Display); NS_ASSERTION((NS_STYLE_DISPLAY_BLOCK == display->mDisplay) || (NS_STYLE_DISPLAY_LIST_ITEM == display->mDisplay), "bad mIsBlock state"); @@ -492,15 +492,15 @@ nsLineLayout::ReflowMappedChild() if (NS_OK != rv) { return rv; } - nsStyleDisplay* kidDisplay = (nsStyleDisplay*) - kidSC->GetData(eStyleStruct_Display); + const nsStyleDisplay* kidDisplay = (const nsStyleDisplay*) + kidSC->GetStyleData(eStyleStruct_Display); if (NS_STYLE_FLOAT_NONE != kidDisplay->mFloats) { // XXX If it floats it needs to go through the normal path so that // PlaceFloater is invoked. return ReflowChild(nsnull, PR_FALSE); } - nsStyleSpacing* kidSpacing = (nsStyleSpacing*) - kidSC->GetData(eStyleStruct_Spacing); + const nsStyleSpacing* kidSpacing = (const nsStyleSpacing*) + kidSC->GetStyleData(eStyleStruct_Spacing); PRBool isBlock = PR_FALSE; switch (kidDisplay->mDisplay) { case NS_STYLE_DISPLAY_BLOCK: @@ -605,8 +605,8 @@ nsLineLayout::ReflowChild(nsReflowCommand* aReflowCommand, // XXX absolute positioning // XXX floating frames // XXX break-before - nsStyleDisplay * kidDisplay = (nsStyleDisplay*) - kidSC->GetData(eStyleStruct_Display); + const nsStyleDisplay * kidDisplay = (const nsStyleDisplay*) + kidSC->GetStyleData(eStyleStruct_Display); PRBool isBlock = PR_FALSE; PRBool isFirstChild = PRBool(kidFrame == mLine->mFirstChild); switch (kidDisplay->mDisplay) { @@ -640,8 +640,8 @@ nsLineLayout::ReflowChild(nsReflowCommand* aReflowCommand, nsSize kidAvailSize; kidAvailSize.width = availWidth; kidAvailSize.height = mMaxHeight; - nsStyleSpacing* kidSpacing = (nsStyleSpacing*) - kidSC->GetData(eStyleStruct_Spacing); + const nsStyleSpacing* kidSpacing = (const nsStyleSpacing*) + kidSC->GetStyleData(eStyleStruct_Spacing); nsMargin kidMargin; kidSpacing->CalcMarginFor(kidFrame, kidMargin); if (!mUnconstrainedWidth) { @@ -734,8 +734,8 @@ nsLineLayout::ReflowChild(nsReflowCommand* aReflowCommand, // Supply a default top margin nsIStyleContext* blockSC; mBlock->GetStyleContext(mPresContext, blockSC); - nsStyleFont* styleFont = (nsStyleFont*) - blockSC->GetData(eStyleStruct_Font); + const nsStyleFont* styleFont = (const nsStyleFont*) + blockSC->GetStyleData(eStyleStruct_Font); nsIFontMetrics* fm = mPresContext->GetMetricsFor(styleFont->mFont); mBlockReflowState.mPrevNegBottomMargin = 0; mBlockReflowState.mPrevPosBottomMargin = fm->GetHeight(); @@ -780,8 +780,8 @@ nsLineLayout::ReflowChild(nsReflowCommand* aReflowCommand, // ebina's engine uses the height of the font for the bottom margin. nsIStyleContext* blockSC; mBlock->GetStyleContext(mPresContext, blockSC); - nsStyleFont* styleFont = (nsStyleFont*) - blockSC->GetData(eStyleStruct_Font); + const nsStyleFont* styleFont = (const nsStyleFont*) + blockSC->GetStyleData(eStyleStruct_Font); nsIFontMetrics* fm = mPresContext->GetMetricsFor(styleFont->mFont); mBlockReflowState.mPrevNegBottomMargin = 0; mBlockReflowState.mPrevPosBottomMargin = fm->GetHeight(); @@ -943,8 +943,8 @@ nsLineLayout::PlaceChild(nsRect& kidRect, // Compute gap between bullet and inner rect left edge nsIStyleContext* blockCX; mBlock->GetStyleContext(mPresContext, blockCX); - nsStyleFont* font = - (nsStyleFont*)blockCX->GetData(eStyleStruct_Font); + const nsStyleFont* font = + (const nsStyleFont*)blockCX->GetStyleData(eStyleStruct_Font); NS_RELEASE(blockCX); nsIFontMetrics* fm = mPresContext->GetMetricsFor(font->mFont); nscoord kidAscent = fm->GetMaxAscent(); @@ -1262,7 +1262,7 @@ done: //---------------------------------------------------------------------- static PRBool -IsBlock(nsStyleDisplay* aDisplay) +IsBlock(const nsStyleDisplay* aDisplay) { switch (aDisplay->mDisplay) { case NS_STYLE_DISPLAY_BLOCK: @@ -1317,8 +1317,8 @@ nsLineLayout::PullUpChildren() if (NS_OK != rv) { return rv; } - nsStyleDisplay* kidDisplay = (nsStyleDisplay*) - kidSC->GetData(eStyleStruct_Display); + const nsStyleDisplay* kidDisplay = (const nsStyleDisplay*) + kidSC->GetStyleData(eStyleStruct_Display); if (IsBlock(kidDisplay)) { if ((nsnull != mLine->mPrevLine) || (0 != mLine->mChildCount)) { goto done; @@ -1422,10 +1422,10 @@ nsLineLayout::CreateFrameFor(nsIContent* aKid) if (nsnull == kidSC) { return NS_ERROR_OUT_OF_MEMORY; } - nsStylePosition* kidPosition = (nsStylePosition*) - kidSC->GetData(eStyleStruct_Position); - nsStyleDisplay* kidDisplay = (nsStyleDisplay*) - kidSC->GetData(eStyleStruct_Display); + const nsStylePosition* kidPosition = (const nsStylePosition*) + kidSC->GetStyleData(eStyleStruct_Position); + const nsStyleDisplay* kidDisplay = (const nsStyleDisplay*) + kidSC->GetStyleData(eStyleStruct_Display); // Check whether it wants to floated or absolutely positioned PRBool isBlock = PR_FALSE; @@ -1671,12 +1671,12 @@ nsLineLayout::AlignChildren() nsIStyleContextPtr blockSC; mBlock->GetStyleContext(mPresContext, blockSC.AssignRef()); - nsStyleFont* blockFont = (nsStyleFont*) - blockSC->GetData(eStyleStruct_Font); - nsStyleText* blockText = (nsStyleText*) - blockSC->GetData(eStyleStruct_Text); - nsStyleDisplay* blockDisplay = (nsStyleDisplay*) - blockSC->GetData(eStyleStruct_Display); + const nsStyleFont* blockFont = (const nsStyleFont*) + blockSC->GetStyleData(eStyleStruct_Font); + const nsStyleText* blockText = (const nsStyleText*) + blockSC->GetStyleData(eStyleStruct_Text); + const nsStyleDisplay* blockDisplay = (const nsStyleDisplay*) + blockSC->GetStyleData(eStyleStruct_Display); // 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 e300dbaf7a7..aab1ba69d67 100644 --- a/mozilla/layout/html/base/src/nsAbsoluteFrame.cpp +++ b/mozilla/layout/html/base/src/nsAbsoluteFrame.cpp @@ -64,10 +64,10 @@ nsAbsoluteFrame::IsSplittable(nsSplittableType& aIsSplittable) const return NS_OK; } -nsIView* nsAbsoluteFrame::CreateView(nsIView* aContainingView, - const nsRect& aRect, - nsStylePosition* aPosition, - nsStyleDisplay* aDisplay) const +nsIView* nsAbsoluteFrame::CreateView(nsIView* aContainingView, + const nsRect& aRect, + const nsStylePosition* aPosition, + const nsStyleDisplay* aDisplay) const { nsIView* view; @@ -158,9 +158,9 @@ void nsAbsoluteFrame::GetOffsetFromFrame(nsIFrame* aFrameTo, nsPoint& aOffset) c } while ((nsnull != frame) && (frame != aFrameTo)); } -void nsAbsoluteFrame::ComputeViewBounds(nsIFrame* aContainingBlock, - nsStylePosition* aPosition, - nsRect& aRect) const +void nsAbsoluteFrame::ComputeViewBounds(nsIFrame* aContainingBlock, + const nsStylePosition* aPosition, + nsRect& aRect) const { nsRect containingRect; @@ -176,7 +176,7 @@ void nsAbsoluteFrame::ComputeViewBounds(nsIFrame* aContainingBlock, // 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(eStyleStruct_Position); + const nsStylePosition* position = (const nsStylePosition*)mStyleContext->GetStyleData(eStyleStruct_Position); // If either the left or top are 'auto' then get the offset of our frame from // the containing block @@ -254,10 +254,10 @@ nsIFrame* nsAbsoluteFrame::GetContainingBlock() const GetContentParent(result); while (nsnull != result) { - nsStylePosition* position; + const nsStylePosition* position; // Get the style data - result->GetStyleData(eStyleStruct_Position, (nsStyleStruct*&)position); + result->GetStyleData(eStyleStruct_Position, (const nsStyleStruct*&)position); if (position->mPosition == NS_STYLE_POSITION_ABSOLUTE) { break; @@ -306,13 +306,13 @@ NS_METHOD nsAbsoluteFrame::Reflow(nsIPresContext* aPresContext, nsIFrame* containingBlock = GetContainingBlock(); // Use the position properties to determine the offset and size - nsStylePosition* position = (nsStylePosition*)mStyleContext->GetData(eStyleStruct_Position); - nsRect rect; + const nsStylePosition* position = (const nsStylePosition*)mStyleContext->GetStyleData(eStyleStruct_Position); + nsRect rect; ComputeViewBounds(containingBlock, position, rect); // Create a view for the frame - nsStyleDisplay* display = (nsStyleDisplay*)mStyleContext->GetData(eStyleStruct_Display); + const nsStyleDisplay* display = (const nsStyleDisplay*)mStyleContext->GetStyleData(eStyleStruct_Display); nsIView* containingView; containingBlock->GetView(containingView); nsIView* view = CreateView(containingView, rect, position, display); diff --git a/mozilla/layout/html/base/src/nsAbsoluteFrame.h b/mozilla/layout/html/base/src/nsAbsoluteFrame.h index b8f17c21acd..90df6631947 100644 --- a/mozilla/layout/html/base/src/nsAbsoluteFrame.h +++ b/mozilla/layout/html/base/src/nsAbsoluteFrame.h @@ -48,14 +48,14 @@ protected: virtual ~nsAbsoluteFrame(); - nsIView* CreateView(nsIView* aContainingView, - const nsRect& aRect, - nsStylePosition* aPosition, - nsStyleDisplay* aDisplay) const; + nsIView* CreateView(nsIView* aContainingView, + const nsRect& aRect, + const nsStylePosition* aPosition, + const nsStyleDisplay* aDisplay) const; nsIFrame* GetContainingBlock() const; - void ComputeViewBounds(nsIFrame* aContainingBlock, - nsStylePosition* aPosition, - nsRect& aRect) const; + void ComputeViewBounds(nsIFrame* aContainingBlock, + const nsStylePosition* aPosition, + nsRect& aRect) const; void GetOffsetFromFrame(nsIFrame* aFrameTo, nsPoint& aOffset) const; }; diff --git a/mozilla/layout/html/base/src/nsBRPart.cpp b/mozilla/layout/html/base/src/nsBRPart.cpp index 9b5358137f9..6f24717d4ab 100644 --- a/mozilla/layout/html/base/src/nsBRPart.cpp +++ b/mozilla/layout/html/base/src/nsBRPart.cpp @@ -62,8 +62,8 @@ BRFrame::Paint(nsIPresContext& aPresContext, const nsRect& aDirtyRect) { if (nsIFrame::GetShowFrameBorders()) { - nsStyleColor* color = (nsStyleColor*) - mStyleContext->GetData(eStyleStruct_Color); + const nsStyleColor* color = (const nsStyleColor*) + mStyleContext->GetStyleData(eStyleStruct_Color); float p2t = aPresContext.GetPixelsToTwips(); aRenderingContext.SetColor(color->mColor); aRenderingContext.FillRect(0, 0, nscoord(5 * p2t), mRect.height); @@ -81,8 +81,8 @@ BRFrame::GetReflowMetrics(nsIPresContext* aPresContext, } // We have no width, but we're the height of the default font - nsStyleFont* font = - (nsStyleFont*)mStyleContext->GetData(eStyleStruct_Font); + const nsStyleFont* font = + (const nsStyleFont*)mStyleContext->GetStyleData(eStyleStruct_Font); nsIFontMetrics* fm = aPresContext->GetMetricsFor(font->mFont); aMetrics.width = 0; @@ -105,8 +105,8 @@ BRFrame::GetReflowMetrics(nsIPresContext* aPresContext, if (nsnull != lineLayoutState) { lineLayoutState->mReflowResult = NS_LINE_LAYOUT_REFLOW_RESULT_BREAK_AFTER; - nsStyleDisplay* display = (nsStyleDisplay*) - mStyleContext->GetData(eStyleStruct_Display); + const nsStyleDisplay* display = (const nsStyleDisplay*) + mStyleContext->GetStyleData(eStyleStruct_Display); lineLayoutState->mPendingBreak = display->mBreakType; if (NS_STYLE_CLEAR_NONE == lineLayoutState->mPendingBreak) { lineLayoutState->mPendingBreak = NS_STYLE_CLEAR_LINE; @@ -134,8 +134,8 @@ BRFrame::Reflow(nsIPresContext* aPresContext, if (nsnull != lineLayoutState) { lineLayoutState->mReflowResult = NS_LINE_LAYOUT_REFLOW_RESULT_BREAK_AFTER; - nsStyleDisplay* display = (nsStyleDisplay*) - mStyleContext->GetData(eStyleStruct_Display); + const nsStyleDisplay* display = (const nsStyleDisplay*) + mStyleContext->GetStyleData(eStyleStruct_Display); lineLayoutState->mPendingBreak = display->mBreakType; if (NS_STYLE_CLEAR_NONE == lineLayoutState->mPendingBreak) { lineLayoutState->mPendingBreak = NS_STYLE_CLEAR_LINE; @@ -218,7 +218,7 @@ BRPart::MapAttributesInto(nsIStyleContext* aContext, { if (nsnull != mAttributes) { nsStyleDisplay* display = (nsStyleDisplay*) - aContext->GetData(eStyleStruct_Display); + aContext->GetMutableStyleData(eStyleStruct_Display); nsHTMLValue value; GetAttribute(nsHTMLAtoms::clear, value); if (value.GetUnit() == eHTMLUnit_Enumerated) { diff --git a/mozilla/layout/html/base/src/nsBlockFrame.cpp b/mozilla/layout/html/base/src/nsBlockFrame.cpp index 2c7262410e3..8c2eb03f416 100644 --- a/mozilla/layout/html/base/src/nsBlockFrame.cpp +++ b/mozilla/layout/html/base/src/nsBlockFrame.cpp @@ -57,7 +57,7 @@ void nsBlockBandData::ComputeAvailSpaceRect() nsBandTrapezoid* trapezoid = &data[i]; if (trapezoid->state != nsBandTrapezoid::Available) { - nsStyleDisplay* display; + const nsStyleDisplay* display; if (nsBandTrapezoid::OccupiedMultiple == trapezoid->state) { PRInt32 numFrames = trapezoid->frames->Count(); @@ -66,14 +66,14 @@ void nsBlockBandData::ComputeAvailSpaceRect() for (PRInt32 i = 0; i < numFrames; i++) { nsIFrame* f = (nsIFrame*)trapezoid->frames->ElementAt(i); - f->GetStyleData(eStyleStruct_Display, (nsStyleStruct*&)display); + f->GetStyleData(eStyleStruct_Display, (const nsStyleStruct*&)display); if (NS_STYLE_FLOAT_RIGHT == display->mFloats) { goto foundRightFloater; } } } else { - trapezoid->frame->GetStyleData(eStyleStruct_Display, (nsStyleStruct*&)display); + trapezoid->frame->GetStyleData(eStyleStruct_Display, (const nsStyleStruct*&)display); if (NS_STYLE_FLOAT_RIGHT == display->mFloats) { break; } @@ -91,13 +91,13 @@ void nsBlockBandData::ComputeAvailSpaceRect() // The trapezoid is available trapezoid->GetRect(availSpace); } else { - nsStyleDisplay* display; + const nsStyleDisplay* display; // The trapezoid is occupied. That means there's no available space trapezoid->GetRect(availSpace); // XXX Handle the case of multiple frames - trapezoid->frame->GetStyleData(eStyleStruct_Display, (nsStyleStruct*&)display); + trapezoid->frame->GetStyleData(eStyleStruct_Display, (const nsStyleStruct*&)display); if (NS_STYLE_FLOAT_LEFT == display->mFloats) { availSpace.x = availSpace.XMost(); } @@ -179,10 +179,10 @@ nsresult nsBlockReflowState::RecoverState(nsLineData* aLine) // If the previous line is a block, then factor in its bottom margin if (prevLine->mIsBlock) { - nsStyleSpacing* kidSpacing; - nsIFrame* kid = prevLine->mFirstChild; + const nsStyleSpacing* kidSpacing; + nsIFrame* kid = prevLine->mFirstChild; - kid->GetStyleData(eStyleStruct_Spacing, (nsStyleStruct*&)kidSpacing); + kid->GetStyleData(eStyleStruct_Spacing, (const nsStyleStruct*&)kidSpacing); nsMargin kidMargin; kidSpacing->CalcMarginFor(kid, kidMargin); if (kidMargin.bottom < 0) { @@ -511,7 +511,7 @@ nsBlockFrame::ReflowBlockChild(nsIFrame* aKidFrame, nsBandTrapezoid* trapezoid = &trapezoids[i]; if (trapezoid->state != nsBandTrapezoid::Available) { - nsStyleDisplay* display; + const nsStyleDisplay* display; if (nsBandTrapezoid::OccupiedMultiple == trapezoid->state) { PRInt32 numFrames = trapezoid->frames->Count(); @@ -520,14 +520,14 @@ nsBlockFrame::ReflowBlockChild(nsIFrame* aKidFrame, for (PRInt32 i = 0; i < numFrames; i++) { nsIFrame* f = (nsIFrame*)trapezoid->frames->ElementAt(i); - f->GetStyleData(eStyleStruct_Display, (nsStyleStruct*&)display); + f->GetStyleData(eStyleStruct_Display, (const nsStyleStruct*&)display); if (NS_STYLE_FLOAT_RIGHT == display->mFloats) { goto foundRightFloater; } } } else { - trapezoid->frame->GetStyleData(eStyleStruct_Display, (nsStyleStruct*&)display); + trapezoid->frame->GetStyleData(eStyleStruct_Display, (const nsStyleStruct*&)display); if (NS_STYLE_FLOAT_RIGHT == display->mFloats) { break; } @@ -545,13 +545,13 @@ nsBlockFrame::ReflowBlockChild(nsIFrame* aKidFrame, // The trapezoid is available trapezoid->GetRect(availBand); } else { - nsStyleDisplay* display; + const nsStyleDisplay* display; // The trapezoid is occupied. That means there's no available space trapezoid->GetRect(availBand); // XXX Handle the case of multiple frames - trapezoid->frame->GetStyleData(eStyleStruct_Display, (nsStyleStruct*&)display); + trapezoid->frame->GetStyleData(eStyleStruct_Display, (const nsStyleStruct*&)display); if (NS_STYLE_FLOAT_LEFT == display->mFloats) { availBand.x = availBand.XMost(); } @@ -692,7 +692,7 @@ nsBlockFrame::ClearFloaters(nsBlockReflowState& aState, PRUint8 aBreakType) nsRect tmp; PRInt32 i; for (i = 0; i < aState.mCurrentBand.count; i++) { - nsStyleDisplay* display; + const nsStyleDisplay* display; nsBandTrapezoid* trapezoid = &aState.mCurrentBand.data[i]; if (trapezoid->state != nsBandTrapezoid::Available) { if (nsBandTrapezoid::OccupiedMultiple == trapezoid->state) { @@ -700,7 +700,7 @@ nsBlockFrame::ClearFloaters(nsBlockReflowState& aState, PRUint8 aBreakType) NS_ASSERTION(numFrames > 0, "bad trapezoid frame list"); for (fn = 0; fn < numFrames; fn++) { nsIFrame* f = (nsIFrame*) trapezoid->frames->ElementAt(fn); - f->GetStyleData(eStyleStruct_Display, (nsStyleStruct*&)display); + f->GetStyleData(eStyleStruct_Display, (const nsStyleStruct*&)display); switch (display->mFloats) { case NS_STYLE_FLOAT_LEFT: @@ -728,7 +728,7 @@ nsBlockFrame::ClearFloaters(nsBlockReflowState& aState, PRUint8 aBreakType) } else { trapezoid->frame->GetStyleData(eStyleStruct_Display, - (nsStyleStruct*&)display); + (const nsStyleStruct*&)display); switch (display->mFloats) { case NS_STYLE_FLOAT_LEFT: if ((NS_STYLE_CLEAR_LEFT == aBreakType) || @@ -1228,10 +1228,10 @@ nsBlockFrame::InitializeState(nsIPresContext* aPresContext, // Apply border and padding adjustments for regular frames only if (!aState.mBlockIsPseudo) { - nsStyleSpacing* mySpacing = (nsStyleSpacing*) - mStyleContext->GetData(eStyleStruct_Spacing); - nsStylePosition* myPosition = (nsStylePosition*) - mStyleContext->GetData(eStyleStruct_Position); + const nsStyleSpacing* mySpacing = (const nsStyleSpacing*) + mStyleContext->GetStyleData(eStyleStruct_Spacing); + const nsStylePosition* myPosition = (const nsStylePosition*) + mStyleContext->GetStyleData(eStyleStruct_Position); mySpacing->CalcBorderPaddingFor(this, aState.mBorderPadding); aState.mY = aState.mBorderPadding.top; @@ -1287,11 +1287,11 @@ nsBlockFrame::InitializeState(nsIPresContext* aPresContext, // Setup list flags in block reflow state if this block is a list // item. - nsStyleDisplay* myDisplay = (nsStyleDisplay*) - mStyleContext->GetData(eStyleStruct_Display); + const nsStyleDisplay* myDisplay = (const nsStyleDisplay*) + mStyleContext->GetStyleData(eStyleStruct_Display); if (NS_STYLE_DISPLAY_LIST_ITEM == myDisplay->mDisplay) { - nsStyleList* myList = (nsStyleList*) - mStyleContext->GetData(eStyleStruct_List); + const nsStyleList* myList = (const nsStyleList*) + mStyleContext->GetStyleData(eStyleStruct_List); if (NS_STYLE_LIST_STYLE_POSITION_OUTSIDE == myList->mListStylePosition) { aState.mListPositionOutside = PR_TRUE; } @@ -1774,8 +1774,8 @@ nsBlockFrame::PlaceFloater(nsIPresContext* aPresContext, nsISpaceManager* sm = aState.mSpaceManager; // Get the type of floater - nsStyleDisplay* floaterDisplay; - aFloater->GetStyleData(eStyleStruct_Display, (nsStyleStruct*&)floaterDisplay); + const nsStyleDisplay* floaterDisplay; + aFloater->GetStyleData(eStyleStruct_Display, (const nsStyleStruct*&)floaterDisplay); // Commit some space in the space manager, and adjust our current // band of available space. @@ -1833,8 +1833,8 @@ nsBlockFrame::PlaceBelowCurrentLineFloaters(nsBlockReflowState& aState, GetAvailableSpace(aState, aY); // Get the type of floater - nsStyleDisplay* sd; - floater->GetStyleData(eStyleStruct_Display, (nsStyleStruct*&)sd); + const nsStyleDisplay* sd; + floater->GetStyleData(eStyleStruct_Display, (const 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 2c7262410e3..8c2eb03f416 100644 --- a/mozilla/layout/html/base/src/nsBlockReflowState.cpp +++ b/mozilla/layout/html/base/src/nsBlockReflowState.cpp @@ -57,7 +57,7 @@ void nsBlockBandData::ComputeAvailSpaceRect() nsBandTrapezoid* trapezoid = &data[i]; if (trapezoid->state != nsBandTrapezoid::Available) { - nsStyleDisplay* display; + const nsStyleDisplay* display; if (nsBandTrapezoid::OccupiedMultiple == trapezoid->state) { PRInt32 numFrames = trapezoid->frames->Count(); @@ -66,14 +66,14 @@ void nsBlockBandData::ComputeAvailSpaceRect() for (PRInt32 i = 0; i < numFrames; i++) { nsIFrame* f = (nsIFrame*)trapezoid->frames->ElementAt(i); - f->GetStyleData(eStyleStruct_Display, (nsStyleStruct*&)display); + f->GetStyleData(eStyleStruct_Display, (const nsStyleStruct*&)display); if (NS_STYLE_FLOAT_RIGHT == display->mFloats) { goto foundRightFloater; } } } else { - trapezoid->frame->GetStyleData(eStyleStruct_Display, (nsStyleStruct*&)display); + trapezoid->frame->GetStyleData(eStyleStruct_Display, (const nsStyleStruct*&)display); if (NS_STYLE_FLOAT_RIGHT == display->mFloats) { break; } @@ -91,13 +91,13 @@ void nsBlockBandData::ComputeAvailSpaceRect() // The trapezoid is available trapezoid->GetRect(availSpace); } else { - nsStyleDisplay* display; + const nsStyleDisplay* display; // The trapezoid is occupied. That means there's no available space trapezoid->GetRect(availSpace); // XXX Handle the case of multiple frames - trapezoid->frame->GetStyleData(eStyleStruct_Display, (nsStyleStruct*&)display); + trapezoid->frame->GetStyleData(eStyleStruct_Display, (const nsStyleStruct*&)display); if (NS_STYLE_FLOAT_LEFT == display->mFloats) { availSpace.x = availSpace.XMost(); } @@ -179,10 +179,10 @@ nsresult nsBlockReflowState::RecoverState(nsLineData* aLine) // If the previous line is a block, then factor in its bottom margin if (prevLine->mIsBlock) { - nsStyleSpacing* kidSpacing; - nsIFrame* kid = prevLine->mFirstChild; + const nsStyleSpacing* kidSpacing; + nsIFrame* kid = prevLine->mFirstChild; - kid->GetStyleData(eStyleStruct_Spacing, (nsStyleStruct*&)kidSpacing); + kid->GetStyleData(eStyleStruct_Spacing, (const nsStyleStruct*&)kidSpacing); nsMargin kidMargin; kidSpacing->CalcMarginFor(kid, kidMargin); if (kidMargin.bottom < 0) { @@ -511,7 +511,7 @@ nsBlockFrame::ReflowBlockChild(nsIFrame* aKidFrame, nsBandTrapezoid* trapezoid = &trapezoids[i]; if (trapezoid->state != nsBandTrapezoid::Available) { - nsStyleDisplay* display; + const nsStyleDisplay* display; if (nsBandTrapezoid::OccupiedMultiple == trapezoid->state) { PRInt32 numFrames = trapezoid->frames->Count(); @@ -520,14 +520,14 @@ nsBlockFrame::ReflowBlockChild(nsIFrame* aKidFrame, for (PRInt32 i = 0; i < numFrames; i++) { nsIFrame* f = (nsIFrame*)trapezoid->frames->ElementAt(i); - f->GetStyleData(eStyleStruct_Display, (nsStyleStruct*&)display); + f->GetStyleData(eStyleStruct_Display, (const nsStyleStruct*&)display); if (NS_STYLE_FLOAT_RIGHT == display->mFloats) { goto foundRightFloater; } } } else { - trapezoid->frame->GetStyleData(eStyleStruct_Display, (nsStyleStruct*&)display); + trapezoid->frame->GetStyleData(eStyleStruct_Display, (const nsStyleStruct*&)display); if (NS_STYLE_FLOAT_RIGHT == display->mFloats) { break; } @@ -545,13 +545,13 @@ nsBlockFrame::ReflowBlockChild(nsIFrame* aKidFrame, // The trapezoid is available trapezoid->GetRect(availBand); } else { - nsStyleDisplay* display; + const nsStyleDisplay* display; // The trapezoid is occupied. That means there's no available space trapezoid->GetRect(availBand); // XXX Handle the case of multiple frames - trapezoid->frame->GetStyleData(eStyleStruct_Display, (nsStyleStruct*&)display); + trapezoid->frame->GetStyleData(eStyleStruct_Display, (const nsStyleStruct*&)display); if (NS_STYLE_FLOAT_LEFT == display->mFloats) { availBand.x = availBand.XMost(); } @@ -692,7 +692,7 @@ nsBlockFrame::ClearFloaters(nsBlockReflowState& aState, PRUint8 aBreakType) nsRect tmp; PRInt32 i; for (i = 0; i < aState.mCurrentBand.count; i++) { - nsStyleDisplay* display; + const nsStyleDisplay* display; nsBandTrapezoid* trapezoid = &aState.mCurrentBand.data[i]; if (trapezoid->state != nsBandTrapezoid::Available) { if (nsBandTrapezoid::OccupiedMultiple == trapezoid->state) { @@ -700,7 +700,7 @@ nsBlockFrame::ClearFloaters(nsBlockReflowState& aState, PRUint8 aBreakType) NS_ASSERTION(numFrames > 0, "bad trapezoid frame list"); for (fn = 0; fn < numFrames; fn++) { nsIFrame* f = (nsIFrame*) trapezoid->frames->ElementAt(fn); - f->GetStyleData(eStyleStruct_Display, (nsStyleStruct*&)display); + f->GetStyleData(eStyleStruct_Display, (const nsStyleStruct*&)display); switch (display->mFloats) { case NS_STYLE_FLOAT_LEFT: @@ -728,7 +728,7 @@ nsBlockFrame::ClearFloaters(nsBlockReflowState& aState, PRUint8 aBreakType) } else { trapezoid->frame->GetStyleData(eStyleStruct_Display, - (nsStyleStruct*&)display); + (const nsStyleStruct*&)display); switch (display->mFloats) { case NS_STYLE_FLOAT_LEFT: if ((NS_STYLE_CLEAR_LEFT == aBreakType) || @@ -1228,10 +1228,10 @@ nsBlockFrame::InitializeState(nsIPresContext* aPresContext, // Apply border and padding adjustments for regular frames only if (!aState.mBlockIsPseudo) { - nsStyleSpacing* mySpacing = (nsStyleSpacing*) - mStyleContext->GetData(eStyleStruct_Spacing); - nsStylePosition* myPosition = (nsStylePosition*) - mStyleContext->GetData(eStyleStruct_Position); + const nsStyleSpacing* mySpacing = (const nsStyleSpacing*) + mStyleContext->GetStyleData(eStyleStruct_Spacing); + const nsStylePosition* myPosition = (const nsStylePosition*) + mStyleContext->GetStyleData(eStyleStruct_Position); mySpacing->CalcBorderPaddingFor(this, aState.mBorderPadding); aState.mY = aState.mBorderPadding.top; @@ -1287,11 +1287,11 @@ nsBlockFrame::InitializeState(nsIPresContext* aPresContext, // Setup list flags in block reflow state if this block is a list // item. - nsStyleDisplay* myDisplay = (nsStyleDisplay*) - mStyleContext->GetData(eStyleStruct_Display); + const nsStyleDisplay* myDisplay = (const nsStyleDisplay*) + mStyleContext->GetStyleData(eStyleStruct_Display); if (NS_STYLE_DISPLAY_LIST_ITEM == myDisplay->mDisplay) { - nsStyleList* myList = (nsStyleList*) - mStyleContext->GetData(eStyleStruct_List); + const nsStyleList* myList = (const nsStyleList*) + mStyleContext->GetStyleData(eStyleStruct_List); if (NS_STYLE_LIST_STYLE_POSITION_OUTSIDE == myList->mListStylePosition) { aState.mListPositionOutside = PR_TRUE; } @@ -1774,8 +1774,8 @@ nsBlockFrame::PlaceFloater(nsIPresContext* aPresContext, nsISpaceManager* sm = aState.mSpaceManager; // Get the type of floater - nsStyleDisplay* floaterDisplay; - aFloater->GetStyleData(eStyleStruct_Display, (nsStyleStruct*&)floaterDisplay); + const nsStyleDisplay* floaterDisplay; + aFloater->GetStyleData(eStyleStruct_Display, (const nsStyleStruct*&)floaterDisplay); // Commit some space in the space manager, and adjust our current // band of available space. @@ -1833,8 +1833,8 @@ nsBlockFrame::PlaceBelowCurrentLineFloaters(nsBlockReflowState& aState, GetAvailableSpace(aState, aY); // Get the type of floater - nsStyleDisplay* sd; - floater->GetStyleData(eStyleStruct_Display, (nsStyleStruct*&)sd); + const nsStyleDisplay* sd; + floater->GetStyleData(eStyleStruct_Display, (const 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 2c7262410e3..8c2eb03f416 100644 --- a/mozilla/layout/html/base/src/nsBlockReflowState.h +++ b/mozilla/layout/html/base/src/nsBlockReflowState.h @@ -57,7 +57,7 @@ void nsBlockBandData::ComputeAvailSpaceRect() nsBandTrapezoid* trapezoid = &data[i]; if (trapezoid->state != nsBandTrapezoid::Available) { - nsStyleDisplay* display; + const nsStyleDisplay* display; if (nsBandTrapezoid::OccupiedMultiple == trapezoid->state) { PRInt32 numFrames = trapezoid->frames->Count(); @@ -66,14 +66,14 @@ void nsBlockBandData::ComputeAvailSpaceRect() for (PRInt32 i = 0; i < numFrames; i++) { nsIFrame* f = (nsIFrame*)trapezoid->frames->ElementAt(i); - f->GetStyleData(eStyleStruct_Display, (nsStyleStruct*&)display); + f->GetStyleData(eStyleStruct_Display, (const nsStyleStruct*&)display); if (NS_STYLE_FLOAT_RIGHT == display->mFloats) { goto foundRightFloater; } } } else { - trapezoid->frame->GetStyleData(eStyleStruct_Display, (nsStyleStruct*&)display); + trapezoid->frame->GetStyleData(eStyleStruct_Display, (const nsStyleStruct*&)display); if (NS_STYLE_FLOAT_RIGHT == display->mFloats) { break; } @@ -91,13 +91,13 @@ void nsBlockBandData::ComputeAvailSpaceRect() // The trapezoid is available trapezoid->GetRect(availSpace); } else { - nsStyleDisplay* display; + const nsStyleDisplay* display; // The trapezoid is occupied. That means there's no available space trapezoid->GetRect(availSpace); // XXX Handle the case of multiple frames - trapezoid->frame->GetStyleData(eStyleStruct_Display, (nsStyleStruct*&)display); + trapezoid->frame->GetStyleData(eStyleStruct_Display, (const nsStyleStruct*&)display); if (NS_STYLE_FLOAT_LEFT == display->mFloats) { availSpace.x = availSpace.XMost(); } @@ -179,10 +179,10 @@ nsresult nsBlockReflowState::RecoverState(nsLineData* aLine) // If the previous line is a block, then factor in its bottom margin if (prevLine->mIsBlock) { - nsStyleSpacing* kidSpacing; - nsIFrame* kid = prevLine->mFirstChild; + const nsStyleSpacing* kidSpacing; + nsIFrame* kid = prevLine->mFirstChild; - kid->GetStyleData(eStyleStruct_Spacing, (nsStyleStruct*&)kidSpacing); + kid->GetStyleData(eStyleStruct_Spacing, (const nsStyleStruct*&)kidSpacing); nsMargin kidMargin; kidSpacing->CalcMarginFor(kid, kidMargin); if (kidMargin.bottom < 0) { @@ -511,7 +511,7 @@ nsBlockFrame::ReflowBlockChild(nsIFrame* aKidFrame, nsBandTrapezoid* trapezoid = &trapezoids[i]; if (trapezoid->state != nsBandTrapezoid::Available) { - nsStyleDisplay* display; + const nsStyleDisplay* display; if (nsBandTrapezoid::OccupiedMultiple == trapezoid->state) { PRInt32 numFrames = trapezoid->frames->Count(); @@ -520,14 +520,14 @@ nsBlockFrame::ReflowBlockChild(nsIFrame* aKidFrame, for (PRInt32 i = 0; i < numFrames; i++) { nsIFrame* f = (nsIFrame*)trapezoid->frames->ElementAt(i); - f->GetStyleData(eStyleStruct_Display, (nsStyleStruct*&)display); + f->GetStyleData(eStyleStruct_Display, (const nsStyleStruct*&)display); if (NS_STYLE_FLOAT_RIGHT == display->mFloats) { goto foundRightFloater; } } } else { - trapezoid->frame->GetStyleData(eStyleStruct_Display, (nsStyleStruct*&)display); + trapezoid->frame->GetStyleData(eStyleStruct_Display, (const nsStyleStruct*&)display); if (NS_STYLE_FLOAT_RIGHT == display->mFloats) { break; } @@ -545,13 +545,13 @@ nsBlockFrame::ReflowBlockChild(nsIFrame* aKidFrame, // The trapezoid is available trapezoid->GetRect(availBand); } else { - nsStyleDisplay* display; + const nsStyleDisplay* display; // The trapezoid is occupied. That means there's no available space trapezoid->GetRect(availBand); // XXX Handle the case of multiple frames - trapezoid->frame->GetStyleData(eStyleStruct_Display, (nsStyleStruct*&)display); + trapezoid->frame->GetStyleData(eStyleStruct_Display, (const nsStyleStruct*&)display); if (NS_STYLE_FLOAT_LEFT == display->mFloats) { availBand.x = availBand.XMost(); } @@ -692,7 +692,7 @@ nsBlockFrame::ClearFloaters(nsBlockReflowState& aState, PRUint8 aBreakType) nsRect tmp; PRInt32 i; for (i = 0; i < aState.mCurrentBand.count; i++) { - nsStyleDisplay* display; + const nsStyleDisplay* display; nsBandTrapezoid* trapezoid = &aState.mCurrentBand.data[i]; if (trapezoid->state != nsBandTrapezoid::Available) { if (nsBandTrapezoid::OccupiedMultiple == trapezoid->state) { @@ -700,7 +700,7 @@ nsBlockFrame::ClearFloaters(nsBlockReflowState& aState, PRUint8 aBreakType) NS_ASSERTION(numFrames > 0, "bad trapezoid frame list"); for (fn = 0; fn < numFrames; fn++) { nsIFrame* f = (nsIFrame*) trapezoid->frames->ElementAt(fn); - f->GetStyleData(eStyleStruct_Display, (nsStyleStruct*&)display); + f->GetStyleData(eStyleStruct_Display, (const nsStyleStruct*&)display); switch (display->mFloats) { case NS_STYLE_FLOAT_LEFT: @@ -728,7 +728,7 @@ nsBlockFrame::ClearFloaters(nsBlockReflowState& aState, PRUint8 aBreakType) } else { trapezoid->frame->GetStyleData(eStyleStruct_Display, - (nsStyleStruct*&)display); + (const nsStyleStruct*&)display); switch (display->mFloats) { case NS_STYLE_FLOAT_LEFT: if ((NS_STYLE_CLEAR_LEFT == aBreakType) || @@ -1228,10 +1228,10 @@ nsBlockFrame::InitializeState(nsIPresContext* aPresContext, // Apply border and padding adjustments for regular frames only if (!aState.mBlockIsPseudo) { - nsStyleSpacing* mySpacing = (nsStyleSpacing*) - mStyleContext->GetData(eStyleStruct_Spacing); - nsStylePosition* myPosition = (nsStylePosition*) - mStyleContext->GetData(eStyleStruct_Position); + const nsStyleSpacing* mySpacing = (const nsStyleSpacing*) + mStyleContext->GetStyleData(eStyleStruct_Spacing); + const nsStylePosition* myPosition = (const nsStylePosition*) + mStyleContext->GetStyleData(eStyleStruct_Position); mySpacing->CalcBorderPaddingFor(this, aState.mBorderPadding); aState.mY = aState.mBorderPadding.top; @@ -1287,11 +1287,11 @@ nsBlockFrame::InitializeState(nsIPresContext* aPresContext, // Setup list flags in block reflow state if this block is a list // item. - nsStyleDisplay* myDisplay = (nsStyleDisplay*) - mStyleContext->GetData(eStyleStruct_Display); + const nsStyleDisplay* myDisplay = (const nsStyleDisplay*) + mStyleContext->GetStyleData(eStyleStruct_Display); if (NS_STYLE_DISPLAY_LIST_ITEM == myDisplay->mDisplay) { - nsStyleList* myList = (nsStyleList*) - mStyleContext->GetData(eStyleStruct_List); + const nsStyleList* myList = (const nsStyleList*) + mStyleContext->GetStyleData(eStyleStruct_List); if (NS_STYLE_LIST_STYLE_POSITION_OUTSIDE == myList->mListStylePosition) { aState.mListPositionOutside = PR_TRUE; } @@ -1774,8 +1774,8 @@ nsBlockFrame::PlaceFloater(nsIPresContext* aPresContext, nsISpaceManager* sm = aState.mSpaceManager; // Get the type of floater - nsStyleDisplay* floaterDisplay; - aFloater->GetStyleData(eStyleStruct_Display, (nsStyleStruct*&)floaterDisplay); + const nsStyleDisplay* floaterDisplay; + aFloater->GetStyleData(eStyleStruct_Display, (const nsStyleStruct*&)floaterDisplay); // Commit some space in the space manager, and adjust our current // band of available space. @@ -1833,8 +1833,8 @@ nsBlockFrame::PlaceBelowCurrentLineFloaters(nsBlockReflowState& aState, GetAvailableSpace(aState, aY); // Get the type of floater - nsStyleDisplay* sd; - floater->GetStyleData(eStyleStruct_Display, (nsStyleStruct*&)sd); + const nsStyleDisplay* sd; + floater->GetStyleData(eStyleStruct_Display, (const 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 c64141fdf38..0b898839658 100644 --- a/mozilla/layout/html/base/src/nsBodyFrame.cpp +++ b/mozilla/layout/html/base/src/nsBodyFrame.cpp @@ -189,8 +189,8 @@ NS_METHOD nsBodyFrame::Reflow(nsIPresContext* aPresContext, // Reflow the child frame if (nsnull != mFirstChild) { // Get our border/padding info - nsStyleSpacing* mySpacing = - (nsStyleSpacing*)mStyleContext->GetData(eStyleStruct_Spacing); + const nsStyleSpacing* mySpacing = + (const nsStyleSpacing*)mStyleContext->GetStyleData(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 a5785539086..004a49cc2ec 100644 --- a/mozilla/layout/html/base/src/nsHRPart.cpp +++ b/mozilla/layout/html/base/src/nsHRPart.cpp @@ -99,8 +99,8 @@ HRuleFrame::Paint(nsIPresContext& aPresContext, nsIRenderingContext& aRenderingContext, const nsRect& aDirtyRect) { - nsStyleDisplay* disp = - (nsStyleDisplay*)mStyleContext->GetData(eStyleStruct_Display); + const nsStyleDisplay* disp = + (const nsStyleDisplay*)mStyleContext->GetStyleData(eStyleStruct_Display); if (PR_FALSE == disp->mVisible) { return NS_OK; } @@ -109,12 +109,12 @@ HRuleFrame::Paint(nsIPresContext& aPresContext, nscoord thickness = nscoord(p2t * ((HRulePart*)mContent)->GetThickness()); // Get style data - nsStyleSpacing* spacing = (nsStyleSpacing*) - mStyleContext->GetData(eStyleStruct_Spacing); - nsStyleColor* color = (nsStyleColor*) - mStyleContext->GetData(eStyleStruct_Color); - nsStylePosition* position = (nsStylePosition*) - mStyleContext->GetData(eStyleStruct_Position); + const nsStyleSpacing* spacing = (const nsStyleSpacing*) + mStyleContext->GetStyleData(eStyleStruct_Spacing); + const nsStyleColor* color = (const nsStyleColor*) + mStyleContext->GetStyleData(eStyleStruct_Color); + const nsStylePosition* position = (const nsStylePosition*) + mStyleContext->GetStyleData(eStyleStruct_Position); nsMargin borderPadding; spacing->CalcBorderPaddingFor(this, borderPadding); nscoord x0 = borderPadding.left; @@ -135,8 +135,8 @@ HRuleFrame::Paint(nsIPresContext& aPresContext, } if (newWidth < width) { // center or right align rule within the extra space - nsStyleText* text = - (nsStyleText*) mStyleContext->GetData(eStyleStruct_Text); + const nsStyleText* text = + (const nsStyleText*) mStyleContext->GetStyleData(eStyleStruct_Text); switch (text->mTextAlign) { case NS_STYLE_TEXT_ALIGN_RIGHT: x0 += width - newWidth; @@ -228,8 +228,8 @@ HRuleFrame::GetDesiredSize(nsIPresContext* aPresContext, const nsReflowState& aReflowState, nsReflowMetrics& aDesiredSize) { - nsStylePosition* position = (nsStylePosition*) - mStyleContext->GetData(eStyleStruct_Position); + const nsStylePosition* position = (const nsStylePosition*) + mStyleContext->GetStyleData(eStyleStruct_Position); if (position->mWidth.GetUnit() == eStyleUnit_Coord) { aDesiredSize.width = position->mWidth.GetCoordValue(); } @@ -381,14 +381,14 @@ HRulePart::MapAttributesInto(nsIStyleContext* aContext, // align: enum GetAttribute(nsHTMLAtoms::align, value); if (value.GetUnit() == eHTMLUnit_Enumerated) { - nsStyleText* text = (nsStyleText*)aContext->GetData(eStyleStruct_Text); + nsStyleText* text = (nsStyleText*)aContext->GetMutableStyleData(eStyleStruct_Text); text->mTextAlign = value.GetIntValue(); } // width: pixel, percent float p2t = aPresContext->GetPixelsToTwips(); nsStylePosition* pos = (nsStylePosition*) - aContext->GetData(eStyleStruct_Position); + aContext->GetMutableStyleData(eStyleStruct_Position); GetAttribute(nsHTMLAtoms::width, value); if (value.GetUnit() == eHTMLUnit_Pixel) { nscoord twips = nscoord(p2t * value.GetPixelValue()); diff --git a/mozilla/layout/html/base/src/nsHTMLBullet.cpp b/mozilla/layout/html/base/src/nsHTMLBullet.cpp index 3d039c8cc2e..929eb7d9a39 100644 --- a/mozilla/layout/html/base/src/nsHTMLBullet.cpp +++ b/mozilla/layout/html/base/src/nsHTMLBullet.cpp @@ -79,10 +79,10 @@ protected: */ nsBlockReflowState* GetListContainerReflowState(nsIPresContext* aCX); - PRInt32 GetListItemOrdinal(nsIPresContext* aCX, nsStyleList& aMol); + PRInt32 GetListItemOrdinal(nsIPresContext* aCX, const nsStyleList& aMol); void GetListItemText(nsIPresContext* aCX, nsString& aResult, - nsStyleList& aMol); + const nsStyleList& aMol); PRPackedBool mOrdinalValid; PRInt32 mOrdinal; @@ -102,7 +102,7 @@ Bullet::MapAttributesInto(nsIStyleContext* aContext, { // Force display to be inline (bullet's are not block level) nsStyleDisplay* display = (nsStyleDisplay*) - aContext->GetData(eStyleStruct_Display); + aContext->GetMutableStyleData(eStyleStruct_Display); display->mDisplay = NS_STYLE_DISPLAY_INLINE; } @@ -193,12 +193,12 @@ BulletFrame::Paint(nsIPresContext& aCX, nsIRenderingContext& aRenderingContext, const nsRect& aDirtyRect) { - nsStyleDisplay* disp = - (nsStyleDisplay*)mStyleContext->GetData(eStyleStruct_Display); + const nsStyleDisplay* disp = + (const nsStyleDisplay*)mStyleContext->GetStyleData(eStyleStruct_Display); if (disp->mVisible) { - nsStyleList* myList = - (nsStyleList*)mStyleContext->GetData(eStyleStruct_List); + const nsStyleList* myList = + (const nsStyleList*)mStyleContext->GetStyleData(eStyleStruct_List); if (myList->mListStyleImage.Length() > 0) { nsIImage* image = mImageLoader.GetImage(); @@ -217,10 +217,10 @@ BulletFrame::Paint(nsIPresContext& aCX, } } - nsStyleFont* myFont = - (nsStyleFont*)mStyleContext->GetData(eStyleStruct_Font); - nsStyleColor* myColor = - (nsStyleColor*)mStyleContext->GetData(eStyleStruct_Color); + const nsStyleFont* myFont = + (const nsStyleFont*)mStyleContext->GetStyleData(eStyleStruct_Font); + const nsStyleColor* myColor = + (const nsStyleColor*)mStyleContext->GetStyleData(eStyleStruct_Color); nsIFontMetrics* fm; aRenderingContext.SetColor(myColor->mColor); @@ -332,7 +332,7 @@ BulletFrame::GetListContainerReflowState(nsIPresContext* aCX) PRInt32 BulletFrame::GetListItemOrdinal(nsIPresContext* aCX, - nsStyleList& aListStyle) + const nsStyleList& aListStyle) { if (mOrdinalValid) { return mOrdinal; @@ -398,7 +398,7 @@ static const char* gUpperAlphaChars = "ABCDEFGHIJKLMNOPQRSTUVWXYZ"; void BulletFrame::GetListItemText(nsIPresContext* aCX, nsString& result, - nsStyleList& aListStyle) + const nsStyleList& aListStyle) { PRInt32 ordinal = GetListItemOrdinal(aCX, aListStyle); char cbuf[40]; @@ -520,8 +520,8 @@ BulletFrame::GetDesiredSize(nsIPresContext* aCX, const nsReflowState& aReflowState, nsReflowMetrics& aDesiredSize) { - nsStyleList* myList = - (nsStyleList*)mStyleContext->GetData(eStyleStruct_List); + const nsStyleList* myList = + (const nsStyleList*)mStyleContext->GetStyleData(eStyleStruct_List); if (myList->mListStyleImage.Length() > 0) { mImageLoader.SetURL(myList->mListStyleImage); mImageLoader.GetDesiredSize(aCX, aReflowState, aDesiredSize); @@ -533,8 +533,8 @@ BulletFrame::GetDesiredSize(nsIPresContext* aCX, } } - nsStyleFont* myFont = - (nsStyleFont*)mStyleContext->GetData(eStyleStruct_Font); + const nsStyleFont* myFont = + (const nsStyleFont*)mStyleContext->GetStyleData(eStyleStruct_Font); nsIFontMetrics* fm = aCX->GetMetricsFor(myFont->mFont); nscoord bulletSize; float p2t; diff --git a/mozilla/layout/html/base/src/nsHTMLContainer.cpp b/mozilla/layout/html/base/src/nsHTMLContainer.cpp index 8c1c5125035..2dd2fa5cba5 100644 --- a/mozilla/layout/html/base/src/nsHTMLContainer.cpp +++ b/mozilla/layout/html/base/src/nsHTMLContainer.cpp @@ -197,8 +197,8 @@ nsHTMLContainer::CreateFrame(nsIPresContext* aPresContext, nsIStyleContext* aStyleContext, nsIFrame*& aResult) { - nsStyleDisplay* styleDisplay = - (nsStyleDisplay*) aStyleContext->GetData(eStyleStruct_Display); + const nsStyleDisplay* styleDisplay = + (const nsStyleDisplay*) aStyleContext->GetStyleData(eStyleStruct_Display); // Use style to choose what kind of frame to create nsIFrame* frame = nsnull; @@ -487,7 +487,7 @@ void nsHTMLContainer::MapAttributesInto(nsIStyleContext* aContext, GetAttribute(nsHTMLAtoms::dir, value); if (value.GetUnit() == eHTMLUnit_Enumerated) { nsStyleDisplay* display = (nsStyleDisplay*) - aContext->GetData(eStyleStruct_Display); + aContext->GetMutableStyleData(eStyleStruct_Display); display->mDirection = value.GetIntValue(); } @@ -495,7 +495,7 @@ void nsHTMLContainer::MapAttributesInto(nsIStyleContext* aContext, // align: enum GetAttribute(nsHTMLAtoms::align, value); if (value.GetUnit() == eHTMLUnit_Enumerated) { - nsStyleText* text = (nsStyleText*)aContext->GetData(eStyleStruct_Text); + nsStyleText* text = (nsStyleText*)aContext->GetMutableStyleData(eStyleStruct_Text); text->mTextAlign = value.GetIntValue(); } } @@ -507,11 +507,11 @@ void nsHTMLContainer::MapAttributesInto(nsIStyleContext* aContext, } } else if (mTag == nsHTMLAtoms::font) { - nsStyleFont* font = (nsStyleFont*)aContext->GetData(eStyleStruct_Font); - nsStyleFont* parentFont = font; + nsStyleFont* font = (nsStyleFont*)aContext->GetMutableStyleData(eStyleStruct_Font); + const nsStyleFont* parentFont = font; nsIStyleContext* parentContext = aContext->GetParent(); if (nsnull != parentContext) { - parentFont = (nsStyleFont*)parentContext->GetData(eStyleStruct_Font); + parentFont = (const nsStyleFont*)parentContext->GetStyleData(eStyleStruct_Font); } // face: string list @@ -607,7 +607,7 @@ void nsHTMLContainer::MapAttributesInto(nsIStyleContext* aContext, // color: color GetAttribute(nsHTMLAtoms::color, value); if (value.GetUnit() == eHTMLUnit_Color) { - nsStyleColor* color = (nsStyleColor*)aContext->GetData(eStyleStruct_Color); + nsStyleColor* color = (nsStyleColor*)aContext->GetMutableStyleData(eStyleStruct_Color); color->mColor = value.GetColorValue(); } else if (value.GetUnit() == eHTMLUnit_String) { @@ -616,7 +616,7 @@ void nsHTMLContainer::MapAttributesInto(nsIStyleContext* aContext, char cbuf[40]; buffer.ToCString(cbuf, sizeof(cbuf)); - nsStyleColor* color = (nsStyleColor*)aContext->GetData(eStyleStruct_Color); + nsStyleColor* color = (nsStyleColor*)aContext->GetMutableStyleData(eStyleStruct_Color); NS_ColorNameToRGB(cbuf, &(color->mColor)); } @@ -691,7 +691,7 @@ void nsHTMLContainer::MapAttributesInto(nsIStyleContext* aContext, } } else if (mTag == nsHTMLAtoms::li) { - nsStyleList* list = (nsStyleList*)aContext->GetData(eStyleStruct_List); + nsStyleList* list = (nsStyleList*)aContext->GetMutableStyleData(eStyleStruct_List); // type: enum GetAttribute(nsHTMLAtoms::type, value); @@ -701,7 +701,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(eStyleStruct_List); + nsStyleList* list = (nsStyleList*)aContext->GetMutableStyleData(eStyleStruct_List); // type: enum GetAttribute(nsHTMLAtoms::type, value); @@ -752,7 +752,7 @@ nsHTMLContainer::MapBackgroundAttributesInto(nsIStyleContext* aContext, if (nsnull != docURL) { NS_RELEASE(docURL); } - nsStyleColor* color = (nsStyleColor*)aContext->GetData(eStyleStruct_Color); + nsStyleColor* color = (nsStyleColor*)aContext->GetMutableStyleData(eStyleStruct_Color); color->mBackgroundImage = absURLSpec; color->mBackgroundFlags &= ~NS_STYLE_BG_IMAGE_NONE; color->mBackgroundRepeat = NS_STYLE_BG_REPEAT_XY; @@ -762,7 +762,7 @@ nsHTMLContainer::MapBackgroundAttributesInto(nsIStyleContext* aContext, // bgcolor if (eContentAttr_HasValue == GetAttribute(nsHTMLAtoms::bgcolor, value)) { if (eHTMLUnit_Color == value.GetUnit()) { - nsStyleColor* color = (nsStyleColor*)aContext->GetData(eStyleStruct_Color); + nsStyleColor* color = (nsStyleColor*)aContext->GetMutableStyleData(eStyleStruct_Color); color->mBackgroundColor = value.GetColorValue(); color->mBackgroundFlags &= ~NS_STYLE_BG_COLOR_TRANSPARENT; } @@ -772,7 +772,7 @@ nsHTMLContainer::MapBackgroundAttributesInto(nsIStyleContext* aContext, char cbuf[40]; buffer.ToCString(cbuf, sizeof(cbuf)); - nsStyleColor* color = (nsStyleColor*)aContext->GetData(eStyleStruct_Color); + nsStyleColor* color = (nsStyleColor*)aContext->GetMutableStyleData(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 9ccf0d7fb79..c519c597ae9 100644 --- a/mozilla/layout/html/base/src/nsHTMLContainerFrame.cpp +++ b/mozilla/layout/html/base/src/nsHTMLContainerFrame.cpp @@ -57,15 +57,15 @@ NS_METHOD nsHTMLContainerFrame::Paint(nsIPresContext& aPresContext, const nsRect& aDirtyRect) { // Paint our background and border - nsStyleDisplay* disp = - (nsStyleDisplay*)mStyleContext->GetData(eStyleStruct_Display); + const nsStyleDisplay* disp = + (const nsStyleDisplay*)mStyleContext->GetStyleData(eStyleStruct_Display); if (disp->mVisible && mRect.width && mRect.height) { PRIntn skipSides = GetSkipSides(); - nsStyleColor* color = - (nsStyleColor*)mStyleContext->GetData(eStyleStruct_Color); - nsStyleSpacing* spacing = - (nsStyleSpacing*)mStyleContext->GetData(eStyleStruct_Spacing); + const nsStyleColor* color = + (const nsStyleColor*)mStyleContext->GetStyleData(eStyleStruct_Color); + const nsStyleSpacing* spacing = + (const nsStyleSpacing*)mStyleContext->GetStyleData(eStyleStruct_Spacing); nsCSSRendering::PaintBackground(aPresContext, aRenderingContext, this, aDirtyRect, mRect, *color); nsCSSRendering::PaintBorder(aPresContext, aRenderingContext, this, @@ -191,8 +191,8 @@ NS_METHOD nsHTMLContainerFrame::GetCursorAt(nsIPresContext& aPresContext, PRInt32& aCursor) { // Get my cursor - nsStyleColor* styleColor = (nsStyleColor*) - mStyleContext->GetData(eStyleStruct_Color); + const nsStyleColor* styleColor = (const nsStyleColor*) + mStyleContext->GetStyleData(eStyleStruct_Color); PRInt32 myCursor = styleColor->mCursor; // Get child's cursor, if any @@ -297,11 +297,11 @@ nsHTMLContainerFrame::CreateFrameFor(nsIPresContext* aPresContext, nsIFrame*& aResult) { // Get the style data for the frame - nsStylePosition* position = (nsStylePosition*) - aStyleContext->GetData(eStyleStruct_Position); - nsStyleDisplay* display = (nsStyleDisplay*) - aStyleContext->GetData(eStyleStruct_Display); - nsIFrame* frame = nsnull; + const nsStylePosition* position = (const nsStylePosition*) + aStyleContext->GetStyleData(eStyleStruct_Position); + const nsStyleDisplay* display = (const nsStyleDisplay*) + aStyleContext->GetStyleData(eStyleStruct_Display); + nsIFrame* frame = nsnull; // See whether it wants any special handling nsresult rv; @@ -448,8 +448,8 @@ NS_METHOD nsHTMLContainerFrame::ContentInserted(nsIPresShell* aShell, nsresult nsHTMLContainerFrame::ProcessInitialReflow(nsIPresContext* aPresContext) { - nsStyleDisplay* display = (nsStyleDisplay*) - mStyleContext->GetData(eStyleStruct_Display); + const nsStyleDisplay* display = (const nsStyleDisplay*) + mStyleContext->GetStyleData(eStyleStruct_Display); NS_FRAME_LOG(NS_FRAME_TRACE_CALLS, ("nsHTMLContainerFrame::ProcessInitialReflow: display=%d", display->mDisplay)); diff --git a/mozilla/layout/html/base/src/nsHTMLFrame.cpp b/mozilla/layout/html/base/src/nsHTMLFrame.cpp index 47dc0c0a5ed..d28e561d87f 100644 --- a/mozilla/layout/html/base/src/nsHTMLFrame.cpp +++ b/mozilla/layout/html/base/src/nsHTMLFrame.cpp @@ -43,14 +43,14 @@ nsHTMLFrame::CreateViewForFrame(nsIPresContext* aPresContext, aFrame->GetGeometricParent(parent); if (nsnull != parent) { // Get my nsStyleColor - nsStyleColor* myColor = (nsStyleColor*) - aStyleContext->GetData(eStyleStruct_Color); + const nsStyleColor* myColor = (const nsStyleColor*) + aStyleContext->GetStyleData(eStyleStruct_Color); // Get parent's nsStyleColor nsIStyleContext* parentSC; parent->GetStyleContext(aPresContext, parentSC); - nsStyleColor* parentColor = (nsStyleColor*) - parentSC->GetData(eStyleStruct_Color); + const nsStyleColor* parentColor = (const nsStyleColor*) + parentSC->GetStyleData(eStyleStruct_Color); // If the opacities are different then I need a view if (myColor->mOpacity != parentColor->mOpacity) { @@ -65,8 +65,8 @@ nsHTMLFrame::CreateViewForFrame(nsIPresContext* aPresContext, // See if the frame is being relatively positioned if (!aForce) { - nsStylePosition* position = (nsStylePosition*) - aStyleContext->GetData(eStyleStruct_Position); + const nsStylePosition* position = (const nsStylePosition*) + aStyleContext->GetStyleData(eStyleStruct_Position); if (NS_STYLE_POSITION_RELATIVE == position->mPosition) { NS_FRAME_LOG(NS_FRAME_TRACE_CALLS, ("nsHTMLFrame::CreateViewForFrame: frame=%p relatively positioned", diff --git a/mozilla/layout/html/base/src/nsHTMLImage.cpp b/mozilla/layout/html/base/src/nsHTMLImage.cpp index 63eb1ee5d7e..86f0be53c2c 100644 --- a/mozilla/layout/html/base/src/nsHTMLImage.cpp +++ b/mozilla/layout/html/base/src/nsHTMLImage.cpp @@ -360,8 +360,8 @@ ImageFrame::Paint(nsIPresContext& aPresContext, return NS_OK; } - nsStyleDisplay* disp = - (nsStyleDisplay*)mStyleContext->GetData(eStyleStruct_Display); + const nsStyleDisplay* disp = + (const nsStyleDisplay*)mStyleContext->GetStyleData(eStyleStruct_Display); if (disp->mVisible) { // First paint background and borders @@ -528,8 +528,8 @@ ImageFrame::GetCursorAt(nsIPresContext& aPresContext, // The default cursor is to have no cursor aCursor = NS_STYLE_CURSOR_INHERIT; - nsStyleColor* styleColor = (nsStyleColor*) - mStyleContext->GetData(eStyleStruct_Color); + const nsStyleColor* styleColor = (const nsStyleColor*) + mStyleContext->GetStyleData(eStyleStruct_Color); if (styleColor->mCursor != NS_STYLE_CURSOR_INHERIT) { // If we have a particular cursor, use it *aFrame = this; @@ -775,9 +775,9 @@ void ImagePart::MapAttributesInto(nsIStyleContext* aContext, { if (ALIGN_UNSET != mAlign) { nsStyleDisplay* display = (nsStyleDisplay*) - aContext->GetData(eStyleStruct_Display); + aContext->GetMutableStyleData(eStyleStruct_Display); nsStyleText* text = (nsStyleText*) - aContext->GetData(eStyleStruct_Text); + aContext->GetMutableStyleData(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 53daf3dd7c9..4f7776efb49 100644 --- a/mozilla/layout/html/base/src/nsHTMLTagContent.cpp +++ b/mozilla/layout/html/base/src/nsHTMLTagContent.cpp @@ -760,7 +760,7 @@ nsHTMLTagContent::MapImagePropertiesInto(nsIStyleContext* aContext, float p2t = aPresContext->GetPixelsToTwips(); nsStylePosition* pos = (nsStylePosition*) - aContext->GetData(eStyleStruct_Position); + aContext->GetMutableStyleData(eStyleStruct_Position); // width: value GetAttribute(nsHTMLAtoms::width, value); @@ -809,7 +809,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(eStyleStruct_Spacing); + aContext->GetMutableStyleData(eStyleStruct_Spacing); nsStyleCoord coord; coord.SetCoordValue(twips); spacing->mBorder.SetTop(coord); @@ -831,8 +831,8 @@ nsHTMLTagContent::MapImageBorderInto(nsIStyleContext* aContext, } else { // Color is inherited from "color" - nsStyleColor* styleColor = (nsStyleColor*) - aContext->GetData(eStyleStruct_Color); + const nsStyleColor* styleColor = (const nsStyleColor*) + aContext->GetStyleData(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 baafb82bbd1..b6aa3a24018 100644 --- a/mozilla/layout/html/base/src/nsInlineFrame.cpp +++ b/mozilla/layout/html/base/src/nsInlineFrame.cpp @@ -53,7 +53,7 @@ NS_DEF_PTR(nsIContentDelegate); class nsInlineState { public: - nsStyleFont* font; // style font + const nsStyleFont* font; // style font nsMargin borderPadding; // inner margin nsSize mStyleSize; PRIntn mStyleSizeFlags; @@ -73,7 +73,7 @@ public: // Constructor nsInlineState(nsIPresContext* aPresContext, nsIFrame* aInlineFrame, - nsStyleFont* aStyleFont, + const nsStyleFont* aStyleFont, const nsMargin& aBorderPadding, const nsReflowState& aReflowState, nsSize* aMaxElementSize) @@ -681,10 +681,10 @@ nsInlineFrame::ReflowUnmappedChildren(nsIPresContext* aPresContext, // Figure out how we should treat the child nsIFrame* kidFrame; - nsStyleDisplay* kidDisplay = - (nsStyleDisplay*)kidStyleContext->GetData(eStyleStruct_Display); - nsStylePosition* kidPosition = (nsStylePosition*) - kidStyleContext->GetData(eStyleStruct_Position); + const nsStyleDisplay* kidDisplay = + (const nsStyleDisplay*)kidStyleContext->GetStyleData(eStyleStruct_Display); + const nsStylePosition* kidPosition = (const nsStylePosition*) + kidStyleContext->GetStyleData(eStyleStruct_Position); // Check whether it wants to floated or absolutely positioned nsresult rv; @@ -831,10 +831,10 @@ NS_METHOD nsInlineFrame::Reflow(nsIPresContext* aPresContext, aStatus = NS_FRAME_COMPLETE; // initialize out parameter // Get the style molecule - nsStyleFont* styleFont = (nsStyleFont*) - mStyleContext->GetData(eStyleStruct_Font); - nsStyleSpacing* styleSpacing = (nsStyleSpacing*) - mStyleContext->GetData(eStyleStruct_Spacing); + const nsStyleFont* styleFont = (const nsStyleFont*) + mStyleContext->GetStyleData(eStyleStruct_Font); + const nsStyleSpacing* styleSpacing = (const nsStyleSpacing*) + mStyleContext->GetStyleData(eStyleStruct_Spacing); // Check for an overflow list if (eReflowReason_Incremental != aReflowState.reason) { diff --git a/mozilla/layout/html/base/src/nsLeafFrame.cpp b/mozilla/layout/html/base/src/nsLeafFrame.cpp index 7e31f64b784..c108dd6dcb6 100644 --- a/mozilla/layout/html/base/src/nsLeafFrame.cpp +++ b/mozilla/layout/html/base/src/nsLeafFrame.cpp @@ -32,14 +32,14 @@ NS_METHOD nsLeafFrame::Paint(nsIPresContext& aPresContext, nsIRenderingContext& aRenderingContext, const nsRect& aDirtyRect) { - nsStyleDisplay* disp = - (nsStyleDisplay*)mStyleContext->GetData(eStyleStruct_Display); + const nsStyleDisplay* disp = + (const nsStyleDisplay*)mStyleContext->GetStyleData(eStyleStruct_Display); if (disp->mVisible) { - nsStyleColor* myColor = - (nsStyleColor*)mStyleContext->GetData(eStyleStruct_Color); - nsStyleSpacing* mySpacing = - (nsStyleSpacing*)mStyleContext->GetData(eStyleStruct_Spacing); + const nsStyleColor* myColor = + (const nsStyleColor*)mStyleContext->GetStyleData(eStyleStruct_Color); + const nsStyleSpacing* mySpacing = + (const nsStyleSpacing*)mStyleContext->GetStyleData(eStyleStruct_Spacing); nsCSSRendering::PaintBackground(aPresContext, aRenderingContext, this, aDirtyRect, mRect, *myColor); nsCSSRendering::PaintBorder(aPresContext, aRenderingContext, this, @@ -73,8 +73,8 @@ NS_METHOD nsLeafFrame::Reflow(nsIPresContext* aPresContext, void nsLeafFrame::AddBordersAndPadding(nsIPresContext* aPresContext, nsReflowMetrics& aDesiredSize) { - nsStyleSpacing* space = - (nsStyleSpacing*)mStyleContext->GetData(eStyleStruct_Spacing); + const nsStyleSpacing* space = + (const nsStyleSpacing*)mStyleContext->GetStyleData(eStyleStruct_Spacing); nsMargin borderPadding; space->CalcBorderPaddingFor(this, borderPadding); aDesiredSize.width += borderPadding.left + borderPadding.right; @@ -86,8 +86,8 @@ void nsLeafFrame::AddBordersAndPadding(nsIPresContext* aPresContext, void nsLeafFrame::GetInnerArea(nsIPresContext* aPresContext, nsRect& aInnerArea) const { - nsStyleSpacing* space = - (nsStyleSpacing*)mStyleContext->GetData(eStyleStruct_Spacing); + const nsStyleSpacing* space = + (const nsStyleSpacing*)mStyleContext->GetStyleData(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 adcc8df82a0..08ef847e114 100644 --- a/mozilla/layout/html/base/src/nsLineLayout.cpp +++ b/mozilla/layout/html/base/src/nsLineLayout.cpp @@ -113,8 +113,8 @@ nsLineData::Verify(PRBool aFinalCheck) const nsIFrame* child = mFirstChild; nsIStyleContext* sc; child->GetStyleContext(nsnull, sc); - nsStyleDisplay* display = (nsStyleDisplay*) - sc->GetData(eStyleStruct_Display); + const nsStyleDisplay* display = (const nsStyleDisplay*) + sc->GetStyleData(eStyleStruct_Display); NS_ASSERTION((NS_STYLE_DISPLAY_BLOCK == display->mDisplay) || (NS_STYLE_DISPLAY_LIST_ITEM == display->mDisplay), "bad mIsBlock state"); @@ -492,15 +492,15 @@ nsLineLayout::ReflowMappedChild() if (NS_OK != rv) { return rv; } - nsStyleDisplay* kidDisplay = (nsStyleDisplay*) - kidSC->GetData(eStyleStruct_Display); + const nsStyleDisplay* kidDisplay = (const nsStyleDisplay*) + kidSC->GetStyleData(eStyleStruct_Display); if (NS_STYLE_FLOAT_NONE != kidDisplay->mFloats) { // XXX If it floats it needs to go through the normal path so that // PlaceFloater is invoked. return ReflowChild(nsnull, PR_FALSE); } - nsStyleSpacing* kidSpacing = (nsStyleSpacing*) - kidSC->GetData(eStyleStruct_Spacing); + const nsStyleSpacing* kidSpacing = (const nsStyleSpacing*) + kidSC->GetStyleData(eStyleStruct_Spacing); PRBool isBlock = PR_FALSE; switch (kidDisplay->mDisplay) { case NS_STYLE_DISPLAY_BLOCK: @@ -605,8 +605,8 @@ nsLineLayout::ReflowChild(nsReflowCommand* aReflowCommand, // XXX absolute positioning // XXX floating frames // XXX break-before - nsStyleDisplay * kidDisplay = (nsStyleDisplay*) - kidSC->GetData(eStyleStruct_Display); + const nsStyleDisplay * kidDisplay = (const nsStyleDisplay*) + kidSC->GetStyleData(eStyleStruct_Display); PRBool isBlock = PR_FALSE; PRBool isFirstChild = PRBool(kidFrame == mLine->mFirstChild); switch (kidDisplay->mDisplay) { @@ -640,8 +640,8 @@ nsLineLayout::ReflowChild(nsReflowCommand* aReflowCommand, nsSize kidAvailSize; kidAvailSize.width = availWidth; kidAvailSize.height = mMaxHeight; - nsStyleSpacing* kidSpacing = (nsStyleSpacing*) - kidSC->GetData(eStyleStruct_Spacing); + const nsStyleSpacing* kidSpacing = (const nsStyleSpacing*) + kidSC->GetStyleData(eStyleStruct_Spacing); nsMargin kidMargin; kidSpacing->CalcMarginFor(kidFrame, kidMargin); if (!mUnconstrainedWidth) { @@ -734,8 +734,8 @@ nsLineLayout::ReflowChild(nsReflowCommand* aReflowCommand, // Supply a default top margin nsIStyleContext* blockSC; mBlock->GetStyleContext(mPresContext, blockSC); - nsStyleFont* styleFont = (nsStyleFont*) - blockSC->GetData(eStyleStruct_Font); + const nsStyleFont* styleFont = (const nsStyleFont*) + blockSC->GetStyleData(eStyleStruct_Font); nsIFontMetrics* fm = mPresContext->GetMetricsFor(styleFont->mFont); mBlockReflowState.mPrevNegBottomMargin = 0; mBlockReflowState.mPrevPosBottomMargin = fm->GetHeight(); @@ -780,8 +780,8 @@ nsLineLayout::ReflowChild(nsReflowCommand* aReflowCommand, // ebina's engine uses the height of the font for the bottom margin. nsIStyleContext* blockSC; mBlock->GetStyleContext(mPresContext, blockSC); - nsStyleFont* styleFont = (nsStyleFont*) - blockSC->GetData(eStyleStruct_Font); + const nsStyleFont* styleFont = (const nsStyleFont*) + blockSC->GetStyleData(eStyleStruct_Font); nsIFontMetrics* fm = mPresContext->GetMetricsFor(styleFont->mFont); mBlockReflowState.mPrevNegBottomMargin = 0; mBlockReflowState.mPrevPosBottomMargin = fm->GetHeight(); @@ -943,8 +943,8 @@ nsLineLayout::PlaceChild(nsRect& kidRect, // Compute gap between bullet and inner rect left edge nsIStyleContext* blockCX; mBlock->GetStyleContext(mPresContext, blockCX); - nsStyleFont* font = - (nsStyleFont*)blockCX->GetData(eStyleStruct_Font); + const nsStyleFont* font = + (const nsStyleFont*)blockCX->GetStyleData(eStyleStruct_Font); NS_RELEASE(blockCX); nsIFontMetrics* fm = mPresContext->GetMetricsFor(font->mFont); nscoord kidAscent = fm->GetMaxAscent(); @@ -1262,7 +1262,7 @@ done: //---------------------------------------------------------------------- static PRBool -IsBlock(nsStyleDisplay* aDisplay) +IsBlock(const nsStyleDisplay* aDisplay) { switch (aDisplay->mDisplay) { case NS_STYLE_DISPLAY_BLOCK: @@ -1317,8 +1317,8 @@ nsLineLayout::PullUpChildren() if (NS_OK != rv) { return rv; } - nsStyleDisplay* kidDisplay = (nsStyleDisplay*) - kidSC->GetData(eStyleStruct_Display); + const nsStyleDisplay* kidDisplay = (const nsStyleDisplay*) + kidSC->GetStyleData(eStyleStruct_Display); if (IsBlock(kidDisplay)) { if ((nsnull != mLine->mPrevLine) || (0 != mLine->mChildCount)) { goto done; @@ -1422,10 +1422,10 @@ nsLineLayout::CreateFrameFor(nsIContent* aKid) if (nsnull == kidSC) { return NS_ERROR_OUT_OF_MEMORY; } - nsStylePosition* kidPosition = (nsStylePosition*) - kidSC->GetData(eStyleStruct_Position); - nsStyleDisplay* kidDisplay = (nsStyleDisplay*) - kidSC->GetData(eStyleStruct_Display); + const nsStylePosition* kidPosition = (const nsStylePosition*) + kidSC->GetStyleData(eStyleStruct_Position); + const nsStyleDisplay* kidDisplay = (const nsStyleDisplay*) + kidSC->GetStyleData(eStyleStruct_Display); // Check whether it wants to floated or absolutely positioned PRBool isBlock = PR_FALSE; @@ -1671,12 +1671,12 @@ nsLineLayout::AlignChildren() nsIStyleContextPtr blockSC; mBlock->GetStyleContext(mPresContext, blockSC.AssignRef()); - nsStyleFont* blockFont = (nsStyleFont*) - blockSC->GetData(eStyleStruct_Font); - nsStyleText* blockText = (nsStyleText*) - blockSC->GetData(eStyleStruct_Text); - nsStyleDisplay* blockDisplay = (nsStyleDisplay*) - blockSC->GetData(eStyleStruct_Display); + const nsStyleFont* blockFont = (const nsStyleFont*) + blockSC->GetStyleData(eStyleStruct_Font); + const nsStyleText* blockText = (const nsStyleText*) + blockSC->GetStyleData(eStyleStruct_Text); + const nsStyleDisplay* blockDisplay = (const nsStyleDisplay*) + blockSC->GetStyleData(eStyleStruct_Display); // 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/nsScrollFrame.cpp b/mozilla/layout/html/base/src/nsScrollFrame.cpp index c9207b3a8b7..22ed655f7bc 100644 --- a/mozilla/layout/html/base/src/nsScrollFrame.cpp +++ b/mozilla/layout/html/base/src/nsScrollFrame.cpp @@ -462,8 +462,8 @@ nsScrollOuterFrame::Reflow(nsIPresContext* aPresContext, mChildCount = 1; } - nsStyleSpacing* spacing = (nsStyleSpacing*) - mStyleContext->GetData(eStyleStruct_Spacing); + const nsStyleSpacing* spacing = (const nsStyleSpacing*) + mStyleContext->GetStyleData(eStyleStruct_Spacing); nsMargin borderPadding; spacing->CalcBorderPaddingFor(this, borderPadding); nscoord lr = borderPadding.left + borderPadding.right; diff --git a/mozilla/layout/html/base/src/nsSpacerPart.cpp b/mozilla/layout/html/base/src/nsSpacerPart.cpp index df49e0ac749..4db1cdb8696 100644 --- a/mozilla/layout/html/base/src/nsSpacerPart.cpp +++ b/mozilla/layout/html/base/src/nsSpacerPart.cpp @@ -241,7 +241,7 @@ SpacerPart::MapAttributesInto(nsIStyleContext* aContext, if (nsnull != mAttributes) { nsHTMLValue value; nsStyleDisplay* display = (nsStyleDisplay*) - aContext->GetData(eStyleStruct_Display); + aContext->GetMutableStyleData(eStyleStruct_Display); GetAttribute(nsHTMLAtoms::align, value); if (eHTMLUnit_Enumerated == value.GetUnit()) { switch (value.GetIntValue()) { diff --git a/mozilla/layout/html/base/src/nsTextContent.cpp b/mozilla/layout/html/base/src/nsTextContent.cpp index 5de8f0aa123..68aef347961 100644 --- a/mozilla/layout/html/base/src/nsTextContent.cpp +++ b/mozilla/layout/html/base/src/nsTextContent.cpp @@ -175,7 +175,7 @@ protected: nsReflowMetrics& aDesiredSize, const nsSize& aMaxSize, nsSize* aMaxElementSize, - nsStyleFont& aFont, + const nsStyleFont& aFont, PRInt32 aStartingOffset, nsLineLayout* aLineState); @@ -183,8 +183,8 @@ protected: nsReflowMetrics& aDesiredSize, const nsSize& aMaxSize, nsSize* aMaxElementSize, - nsStyleFont& aFont, - nsStyleText& aTextStyle, + const nsStyleFont& aFont, + const nsStyleText& aTextStyle, PRInt32 aStartingOffset, nsLineLayout* aLineState); @@ -431,15 +431,15 @@ NS_METHOD TextFrame::Paint(nsIPresContext& aPresContext, return NS_OK; } - nsStyleDisplay* disp = - (nsStyleDisplay*)mStyleContext->GetData(eStyleStruct_Display); + const nsStyleDisplay* disp = + (const nsStyleDisplay*)mStyleContext->GetStyleData(eStyleStruct_Display); if (disp->mVisible) { // Get style data - nsStyleColor* color = - (nsStyleColor*)mStyleContext->GetData(eStyleStruct_Color); - nsStyleFont* font = - (nsStyleFont*)mStyleContext->GetData(eStyleStruct_Font); + const nsStyleColor* color = + (const nsStyleColor*)mStyleContext->GetStyleData(eStyleStruct_Color); + const nsStyleFont* font = + (const nsStyleFont*)mStyleContext->GetStyleData(eStyleStruct_Font); // Set font and color aRenderingContext.SetColor(color->mColor); @@ -558,11 +558,11 @@ void TextFrame::PaintRegularText(nsIPresContext& aPresContext, // Render the text aRenderingContext.DrawString(s0, s - s0, dx, dy, mRect.width); - nsStyleColor* color = (nsStyleColor*)mStyleContext->GetData(eStyleStruct_Color); + const nsStyleColor* color = (const nsStyleColor*)mStyleContext->GetStyleData(eStyleStruct_Color); aRenderingContext.SetColor(color->mColor); } else { // Render the text - nsStyleColor* color = (nsStyleColor*)mStyleContext->GetData(eStyleStruct_Color); + const nsStyleColor* color = (const nsStyleColor*)mStyleContext->GetStyleData(eStyleStruct_Color); aRenderingContext.SetColor(color->mColor); aRenderingContext.DrawString(s0, s - s0, dx, dy, mRect.width); } @@ -635,11 +635,11 @@ void TextFrame::PaintRegularText(nsIPresContext& aPresContext, // Render the text aRenderingContext.DrawString(s0, s - s0, dx, dy, mRect.width); - nsStyleColor* color = (nsStyleColor*)mStyleContext->GetData(eStyleStruct_Color); + const nsStyleColor* color = (const nsStyleColor*)mStyleContext->GetStyleData(eStyleStruct_Color); aRenderingContext.SetColor(color->mColor); } else { // Render the text - nsStyleColor* color = (nsStyleColor*)mStyleContext->GetData(eStyleStruct_Color); + const nsStyleColor* color = (const nsStyleColor*)mStyleContext->GetStyleData(eStyleStruct_Color); aRenderingContext.SetColor(color->mColor); aRenderingContext.DrawString(s0, s - s0, dx, dy, mRect.width); } @@ -741,8 +741,8 @@ NS_METHOD TextFrame::GetReflowMetrics(nsIPresContext* aCX, aMetrics.width = mRect.width; aMetrics.height = mRect.height; - nsStyleFont* font = - (nsStyleFont*)mStyleContext->GetData(eStyleStruct_Font); + const nsStyleFont* font = + (const nsStyleFont*)mStyleContext->GetStyleData(eStyleStruct_Font); nsIFontMetrics* fm = aCX->GetMetricsFor(font->mFont); aMetrics.ascent = fm->GetMaxAscent(); aMetrics.descent = fm->GetMaxDescent(); @@ -786,8 +786,8 @@ NS_METHOD TextFrame::Reflow(nsIPresContext* aCX, } } - nsStyleFont* font = - (nsStyleFont*)mStyleContext->GetData(eStyleStruct_Font); + const nsStyleFont* font = + (const nsStyleFont*)mStyleContext->GetStyleData(eStyleStruct_Font); // Initialize mFlags (without destroying the TEXT_BLINK_ON bit) bits // that are filled in by the reflow routines. @@ -799,8 +799,8 @@ NS_METHOD TextFrame::Reflow(nsIPresContext* aCX, } } - nsStyleText* text = - (nsStyleText*)mStyleContext->GetData(eStyleStruct_Text); + const nsStyleText* text = + (const nsStyleText*)mStyleContext->GetStyleData(eStyleStruct_Text); if (NS_STYLE_WHITESPACE_PRE == text->mWhiteSpace) { // Use a specialized routine for pre-formatted text @@ -830,8 +830,8 @@ TextFrame::ReflowNormal(nsIPresContext* aCX, nsReflowMetrics& aDesiredSize, const nsSize& aMaxSize, nsSize* aMaxElementSize, - nsStyleFont& aFont, - nsStyleText& aTextStyle, + const nsStyleFont& aFont, + const nsStyleText& aTextStyle, PRInt32 aStartingOffset, nsLineLayout* aLineState) { @@ -1001,7 +1001,7 @@ TextFrame::ReflowPre(nsIPresContext* aCX, nsReflowMetrics& aDesiredSize, const nsSize& aMaxSize, nsSize* aMaxElementSize, - nsStyleFont& aFont, + const nsStyleFont& aFont, PRInt32 aStartingOffset, nsLineLayout* aLineState) { @@ -1082,8 +1082,8 @@ NS_METHOD TextFrame::JustifyReflow(nsIPresContext* aCX, nscoord aAvailableSpace) return NS_OK; } - nsStyleFont* font = - (nsStyleFont*)mStyleContext->GetData(eStyleStruct_Font); + const nsStyleFont* font = + (const nsStyleFont*)mStyleContext->GetStyleData(eStyleStruct_Font); nsIFontMetrics* fm = aCX->GetMetricsFor(font->mFont); PRInt32 spaceWidth = fm->GetWidth(' '); @@ -1349,8 +1349,8 @@ void TextFrame::CalcCursorPosition(nsIPresContext& aCX, nsIStyleContext * styleContext; aNewFrame->GetStyleContext(&aCX, styleContext); - nsStyleFont *font = (nsStyleFont*)styleContext->GetData(eStyleStruct_Font); - nsStyleText *styleText = (nsStyleText*)styleContext->GetData(eStyleStruct_Text); + const nsStyleFont *font = (const nsStyleFont*)styleContext->GetStyleData(eStyleStruct_Font); + const nsStyleText *styleText = (const nsStyleText*)styleContext->GetStyleData(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 fc851f85de5..93e2bcca7c6 100644 --- a/mozilla/layout/html/forms/src/nsInput.cpp +++ b/mozilla/layout/html/forms/src/nsInput.cpp @@ -92,9 +92,9 @@ void nsInput::MapAttributesInto(nsIStyleContext* aContext, { if (ALIGN_UNSET != mAlign) { nsStyleDisplay* display = (nsStyleDisplay*) - aContext->GetData(eStyleStruct_Display); + aContext->GetMutableStyleData(eStyleStruct_Display); nsStyleText* text = (nsStyleText*) - aContext->GetData(eStyleStruct_Text); + aContext->GetMutableStyleData(eStyleStruct_Text); switch (mAlign) { case NS_STYLE_TEXT_ALIGN_LEFT: display->mFloats = NS_STYLE_FLOAT_LEFT; diff --git a/mozilla/layout/html/forms/src/nsInputButton.cpp b/mozilla/layout/html/forms/src/nsInputButton.cpp index 46b80755b88..362e6303144 100644 --- a/mozilla/layout/html/forms/src/nsInputButton.cpp +++ b/mozilla/layout/html/forms/src/nsInputButton.cpp @@ -390,8 +390,8 @@ NS_METHOD nsInputButtonFrame::Paint(nsIPresContext& aPresContext, nsIRenderingContext& aRenderingContext, const nsRect& aDirtyRect) { - nsStyleDisplay* disp = - (nsStyleDisplay*)mStyleContext->GetData(eStyleStruct_Display); + const nsStyleDisplay* disp = + (const nsStyleDisplay*)mStyleContext->GetStyleData(eStyleStruct_Display); if (disp->mVisible) { // let super do processing if there is no image diff --git a/mozilla/layout/html/forms/src/nsInputCheckbox.cpp b/mozilla/layout/html/forms/src/nsInputCheckbox.cpp index f10b1a2c753..02a9cc09c11 100644 --- a/mozilla/layout/html/forms/src/nsInputCheckbox.cpp +++ b/mozilla/layout/html/forms/src/nsInputCheckbox.cpp @@ -143,7 +143,7 @@ void nsInputCheckbox::MapAttributesInto(nsIStyleContext* aContext, nscoord pad = (int)(3 * p2t + 0.5); // add left and right padding around the radio button via css - nsStyleSpacing* spacing = (nsStyleSpacing*) aContext->GetData(eStyleStruct_Spacing); + nsStyleSpacing* spacing = (nsStyleSpacing*) aContext->GetMutableStyleData(eStyleStruct_Spacing); if (eStyleUnit_Null == spacing->mMargin.GetLeftUnit()) { nsStyleCoord left(pad); spacing->mMargin.SetLeft(left); diff --git a/mozilla/layout/html/forms/src/nsInputFrame.cpp b/mozilla/layout/html/forms/src/nsInputFrame.cpp index dbc68938877..7206b0534b2 100644 --- a/mozilla/layout/html/forms/src/nsInputFrame.cpp +++ b/mozilla/layout/html/forms/src/nsInputFrame.cpp @@ -155,8 +155,8 @@ nsInputFrame::Paint(nsIPresContext& aPresContext, nsIRenderingContext& aRenderingContext, const nsRect& aDirtyRect) { - nsStyleDisplay* disp = - (nsStyleDisplay*)mStyleContext->GetData(eStyleStruct_Display); + const nsStyleDisplay* disp = + (const nsStyleDisplay*)mStyleContext->GetStyleData(eStyleStruct_Display); if (disp->mVisible) { // Make sure the widget is visible if it isn't currently visible @@ -451,7 +451,7 @@ nsInputFrame::GetTextSize(nsIPresContext& aPresContext, nsInputFrame* aFrame, //printf("\n GetTextSize %s", aString.ToNewCString()); nsIStyleContext* styleContext; aFrame->GetStyleContext(&aPresContext, styleContext); - nsStyleFont* styleFont = (nsStyleFont*)styleContext->GetData(eStyleStruct_Font); + const nsStyleFont* styleFont = (const nsStyleFont*)styleContext->GetStyleData(eStyleStruct_Font); NS_RELEASE(styleContext); nsIDeviceContext* deviceContext = aPresContext.GetDeviceContext(); nsIFontCache* fontCache = deviceContext->GetFontCache(); @@ -604,10 +604,10 @@ nsInputFrame::CalculateSize (nsIPresContext* aPresContext, nsInputFrame* aFrame, } -nsFont& +const nsFont& nsInputFrame::GetFont(nsIPresContext* aPresContext) { - nsStyleFont* styleFont = (nsStyleFont*)mStyleContext->GetData(eStyleStruct_Font); + const nsStyleFont* styleFont = (const nsStyleFont*)mStyleContext->GetStyleData(eStyleStruct_Font); return styleFont->mFont; } diff --git a/mozilla/layout/html/forms/src/nsInputFrame.h b/mozilla/layout/html/forms/src/nsInputFrame.h index 0a57db08aaf..e9f801def05 100644 --- a/mozilla/layout/html/forms/src/nsInputFrame.h +++ b/mozilla/layout/html/forms/src/nsInputFrame.h @@ -206,7 +206,7 @@ protected: nsReflowMetrics& aDesiredLayoutSize, nsSize& aDesiredWidgetSize); - nsFont& GetFont(nsIPresContext* aPresContext); + const nsFont& GetFont(nsIPresContext* aPresContext); /** * Get the width and height of this control based on CSS diff --git a/mozilla/layout/html/forms/src/nsInputRadio.cpp b/mozilla/layout/html/forms/src/nsInputRadio.cpp index 61a61dbb7e8..9d90cd4f382 100644 --- a/mozilla/layout/html/forms/src/nsInputRadio.cpp +++ b/mozilla/layout/html/forms/src/nsInputRadio.cpp @@ -130,7 +130,7 @@ void nsInputRadio::MapAttributesInto(nsIStyleContext* aContext, nscoord pad = (int)(3 * p2t + 0.5); // add left and right padding around the radio button via css - nsStyleSpacing* spacing = (nsStyleSpacing*) aContext->GetData(eStyleStruct_Spacing); + nsStyleSpacing* spacing = (nsStyleSpacing*) aContext->GetMutableStyleData(eStyleStruct_Spacing); if (eStyleUnit_Null == spacing->mMargin.GetLeftUnit()) { nsStyleCoord left(pad); spacing->mMargin.SetLeft(left); diff --git a/mozilla/layout/html/style/src/nsCSSLayout.cpp b/mozilla/layout/html/style/src/nsCSSLayout.cpp index 479ad1684f8..af02f7a578f 100644 --- a/mozilla/layout/html/style/src/nsCSSLayout.cpp +++ b/mozilla/layout/html/style/src/nsCSSLayout.cpp @@ -40,7 +40,7 @@ NS_DEF_PTR(nsIContent); nscoord nsCSSLayout::VerticallyAlignChildren(nsIPresContext* aCX, nsIFrame* aContainer, - nsStyleFont* aContainerFont, + const nsStyleFont* aContainerFont, nscoord aY0, nsIFrame* aFirstChild, PRIntn aChildCount, @@ -62,7 +62,7 @@ nsCSSLayout::VerticallyAlignChildren(nsIPresContext* aCX, nsIStyleContextPtr kidSC; kid->GetStyleContext(aCX, kidSC.AssignRef()); - nsStyleText* textStyle = (nsStyleText*)kidSC->GetData(eStyleStruct_Text); + const nsStyleText* textStyle = (const nsStyleText*)kidSC->GetStyleData(eStyleStruct_Text); nsStyleUnit verticalAlignUnit = textStyle->mVerticalAlign.GetUnit(); PRUint8 verticalAlignEnum = NS_STYLE_VERTICAL_ALIGN_BASELINE; @@ -165,7 +165,7 @@ nsCSSLayout::VerticallyAlignChildren(nsIPresContext* aCX, nsIStyleContextPtr kidSC; kid->GetStyleContext(aCX, kidSC.AssignRef()); - nsStyleText* textStyle = (nsStyleText*)kidSC->GetData(eStyleStruct_Text); + const nsStyleText* textStyle = (const nsStyleText*)kidSC->GetStyleData(eStyleStruct_Text); nsStyleUnit verticalAlignUnit = textStyle->mVerticalAlign.GetUnit(); if (eStyleUnit_Percent == verticalAlignUnit) { @@ -264,8 +264,8 @@ nsCSSLayout::RelativePositionChildren(nsIPresContext* aCX, nsIStyleContextPtr kidSC; kid->GetStyleContext(aCX, kidSC.AssignRef()); - nsStylePosition* kidPosition = (nsStylePosition*) - kidSC->GetData(eStyleStruct_Position); + const nsStylePosition* kidPosition = (const nsStylePosition*) + kidSC->GetStyleData(eStyleStruct_Position); if (NS_STYLE_POSITION_RELATIVE == kidPosition->mPosition) { kid->GetOrigin(origin); // XXX Check the unit: could be auto or percent (not just length) @@ -282,8 +282,8 @@ nsCSSLayout::RelativePositionChildren(nsIPresContext* aCX, static PRBool GetStyleDimension(nsIPresContext* aPresContext, const nsReflowState& aReflowState, - nsStylePosition* aStylePos, - nsStyleCoord& aCoord, + const nsStylePosition* aStylePos, + const nsStyleCoord& aCoord, nscoord& aResult) { PRBool rv = PR_FALSE; @@ -341,8 +341,8 @@ nsCSSLayout::GetStyleSize(nsIPresContext* aPresContext, nsIStyleContext* sc = nsnull; aReflowState.frame->GetStyleContext(aPresContext, sc); if (nsnull != sc) { - nsStylePosition* pos = (nsStylePosition*) - sc->GetData(eStyleStruct_Position); + const nsStylePosition* pos = (const nsStylePosition*) + sc->GetStyleData(eStyleStruct_Position); if (GetStyleDimension(aPresContext, aReflowState, pos, pos->mWidth, aStyleSize.width)) { rv |= NS_SIZE_HAS_WIDTH; diff --git a/mozilla/layout/html/style/src/nsCSSLayout.h b/mozilla/layout/html/style/src/nsCSSLayout.h index 1217737204d..b4151fdf16c 100644 --- a/mozilla/layout/html/style/src/nsCSSLayout.h +++ b/mozilla/layout/html/style/src/nsCSSLayout.h @@ -34,7 +34,7 @@ public: */ static nscoord VerticallyAlignChildren(nsIPresContext* aPresContext, nsIFrame* aContainer, - nsStyleFont* aContainerFont, + const nsStyleFont* aContainerFont, nscoord aY0, nsIFrame* aFirstChild, PRInt32 aChildCount, diff --git a/mozilla/layout/html/style/src/nsCSSStyleRule.cpp b/mozilla/layout/html/style/src/nsCSSStyleRule.cpp index b3c267cda08..f20d9b0af6c 100644 --- a/mozilla/layout/html/style/src/nsCSSStyleRule.cpp +++ b/mozilla/layout/html/style/src/nsCSSStyleRule.cpp @@ -160,10 +160,10 @@ public: virtual PRInt32 GetWeight(void) const; virtual void SetWeight(PRInt32 aWeight); - virtual nscoord CalcLength(const nsCSSValue& aValue, nsStyleFont* aFont, + virtual nscoord CalcLength(const nsCSSValue& aValue, const nsStyleFont* aFont, nsIPresContext* aPresContext); virtual PRBool SetCoord(const nsCSSValue& aValue, nsStyleCoord& aCoord, - PRInt32 aMask, nsStyleFont* aFont, + PRInt32 aMask, const nsStyleFont* aFont, nsIPresContext* aPresContext); virtual void MapStyleInto(nsIStyleContext* aContext, nsIPresContext* aPresContext); @@ -416,7 +416,7 @@ void CSSStyleRuleImpl::SetWeight(PRInt32 aWeight) } nscoord CSSStyleRuleImpl::CalcLength(const nsCSSValue& aValue, - nsStyleFont* aFont, + const nsStyleFont* aFont, nsIPresContext* aPresContext) { NS_ASSERTION(aValue.IsLengthUnit(), "not a length unit"); @@ -462,7 +462,7 @@ nscoord CSSStyleRuleImpl::CalcLength(const nsCSSValue& aValue, #define SETCOORD_IAH (SETCOORD_INTEGER | SETCOORD_AH) PRBool CSSStyleRuleImpl::SetCoord(const nsCSSValue& aValue, nsStyleCoord& aCoord, - PRInt32 aMask, nsStyleFont* aFont, + PRInt32 aMask, const nsStyleFont* aFont, nsIPresContext* aPresContext) { PRBool result = PR_TRUE; @@ -510,15 +510,15 @@ PRBool CSSStyleRuleImpl::SetCoord(const nsCSSValue& aValue, nsStyleCoord& aCoord void CSSStyleRuleImpl::MapStyleInto(nsIStyleContext* aContext, nsIPresContext* aPresContext) { if (nsnull != mDeclaration) { - nsStyleFont* font = (nsStyleFont*)aContext->GetData(eStyleStruct_Font); + nsStyleFont* font = (nsStyleFont*)aContext->GetMutableStyleData(eStyleStruct_Font); nsCSSFont* ourFont; if (NS_OK == mDeclaration->GetData(kCSSFontSID, (nsCSSStruct**)&ourFont)) { if (nsnull != ourFont) { - nsStyleFont* parentFont = font; + const nsStyleFont* parentFont = font; nsIStyleContext* parentContext = aContext->GetParent(); if (nsnull != parentContext) { - parentFont = (nsStyleFont*)parentContext->GetData(eStyleStruct_Font); + parentFont = (const nsStyleFont*)parentContext->GetStyleData(eStyleStruct_Font); } // font-family: string list @@ -620,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(eStyleStruct_Text); + nsStyleText* text = (nsStyleText*) aContext->GetMutableStyleData(eStyleStruct_Text); // letter-spacing SetCoord(ourText->mLetterSpacing, text->mLetterSpacing, SETCOORD_LH | SETCOORD_NORMAL, @@ -670,12 +670,12 @@ void CSSStyleRuleImpl::MapStyleInto(nsIStyleContext* aContext, nsIPresContext* a if (nsnull != ourDisplay) { // Get our style and our parent's style nsStyleDisplay* display = (nsStyleDisplay*) - aContext->GetData(eStyleStruct_Display); + aContext->GetMutableStyleData(eStyleStruct_Display); - nsStyleDisplay* parentDisplay = display; + const nsStyleDisplay* parentDisplay = display; nsIStyleContext* parentContext = aContext->GetParent(); if (nsnull != parentContext) { - parentDisplay = (nsStyleDisplay*)parentContext->GetData(eStyleStruct_Display); + parentDisplay = (const nsStyleDisplay*)parentContext->GetStyleData(eStyleStruct_Display); } // display @@ -767,7 +767,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(eStyleStruct_Color); + nsStyleColor* color = (nsStyleColor*)aContext->GetMutableStyleData(eStyleStruct_Color); // color: color if (ourColor->mColor.GetUnit() == eCSSUnit_Color) { @@ -850,12 +850,11 @@ void CSSStyleRuleImpl::MapStyleInto(nsIStyleContext* aContext, nsIPresContext* a else if (ourColor->mOpacity.GetUnit() == eCSSUnit_Number) { color->mOpacity = ourColor->mOpacity.GetFloatValue(); } - else if (ourColor->mOpacity.GetUnit() == eCSSUnit_Enumerated) { - // Only enum value is inherit - nsStyleColor* parentColor = color; + else if (ourColor->mOpacity.GetUnit() == eCSSUnit_Inherit) { + const nsStyleColor* parentColor = color; nsIStyleContext* parentContext = aContext->GetParent(); if (nsnull != parentContext) { - parentColor = (nsStyleColor*)parentContext->GetData(eStyleStruct_Color); + parentColor = (const nsStyleColor*)parentContext->GetStyleData(eStyleStruct_Color); color->mOpacity = parentColor->mOpacity; NS_RELEASE(parentContext); } @@ -870,7 +869,7 @@ void CSSStyleRuleImpl::MapStyleInto(nsIStyleContext* aContext, nsIPresContext* a if (NS_OK == mDeclaration->GetData(kCSSMarginSID, (nsCSSStruct**)&ourMargin)) { if (nsnull != ourMargin) { nsStyleSpacing* spacing = (nsStyleSpacing*) - aContext->GetData(eStyleStruct_Spacing); + aContext->GetMutableStyleData(eStyleStruct_Spacing); // margin: length, percent, auto, inherit if (nsnull != ourMargin->mMargin) { @@ -941,7 +940,6 @@ void CSSStyleRuleImpl::MapStyleInto(nsIStyleContext* aContext, nsIPresContext* a } // border-color - nsStyleColor* color = (nsStyleColor*)aContext->GetData(eStyleStruct_Color); if (nsnull != ourMargin->mColor) { nsCSSRect* ourColor = ourMargin->mColor; if (ourColor->mTop.GetUnit() == eCSSUnit_Color) { @@ -963,7 +961,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(eStyleStruct_Position); + nsStylePosition* position = (nsStylePosition*)aContext->GetMutableStyleData(eStyleStruct_Position); // position: normal, enum, inherit if (ourPosition->mPosition.GetUnit() == eCSSUnit_Normal) { @@ -976,7 +974,7 @@ void CSSStyleRuleImpl::MapStyleInto(nsIStyleContext* aContext, nsIPresContext* a // explicit inheritance nsIStyleContext* parentContext = aContext->GetParent(); if (nsnull != parentContext) { - nsStylePosition* parentPosition = (nsStylePosition*)parentContext->GetData(eStyleStruct_Position); + const nsStylePosition* parentPosition = (const nsStylePosition*)parentContext->GetStyleData(eStyleStruct_Position); position->mPosition = parentPosition->mPosition; } } @@ -995,7 +993,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(eStyleStruct_List); + nsStyleList* list = (nsStyleList*)aContext->GetMutableStyleData(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 f726a4989aa..ae24fc07ab5 100644 --- a/mozilla/layout/html/table/src/BasicTableLayoutStrategy.cpp +++ b/mozilla/layout/html/table/src/BasicTableLayoutStrategy.cpp @@ -74,7 +74,7 @@ struct ProportionalColumnLayoutStruct /* return true if the style indicates that the width is proportional * for the purposes of column width determination */ -PRBool BasicTableLayoutStrategy::IsFixedWidth(nsStylePosition* aStylePosition) +PRBool BasicTableLayoutStrategy::IsFixedWidth(const nsStylePosition* aStylePosition) { PRBool result = PR_FALSE; // assume that it is not fixed width PRInt32 unitType; @@ -105,7 +105,7 @@ PRBool BasicTableLayoutStrategy::IsFixedWidth(nsStylePosition* aStylePosition) return result; } -PRBool BasicTableLayoutStrategy::IsAutoWidth(nsStylePosition* aStylePosition) +PRBool BasicTableLayoutStrategy::IsAutoWidth(const nsStylePosition* aStylePosition) { PRBool result = PR_TRUE; // assume that it is if (nsnull!=aStylePosition) @@ -240,7 +240,7 @@ PRBool BasicTableLayoutStrategy::AssignFixedColumnWidths(nsIPresContext* aPresCo // Get the columns's style nsIStyleContextPtr colSC; colFrame->GetStyleContext(aPresContext, colSC.AssignRef()); - nsStylePosition* colPosition = (nsStylePosition*) colSC->GetData(eStyleStruct_Position); + const nsStylePosition* colPosition = (const nsStylePosition*) colSC->GetStyleData(eStyleStruct_Position); // Get column width if it has one PRBool haveColWidth = PR_FALSE; @@ -320,8 +320,8 @@ PRBool BasicTableLayoutStrategy::AssignFixedColumnWidths(nsIPresContext* aPresCo // Get the cell's style nsIStyleContextPtr cellSC; cellFrame->GetStyleContext(aPresContext, cellSC.AssignRef()); - nsStylePosition* cellPosition = (nsStylePosition*) - cellSC->GetData(eStyleStruct_Position); + const nsStylePosition* cellPosition = (const nsStylePosition*) + cellSC->GetStyleData(eStyleStruct_Position); switch (cellPosition->mWidth.GetUnit()) { case eStyleUnit_Coord: haveCellWidth = PR_TRUE; @@ -496,7 +496,7 @@ PRBool BasicTableLayoutStrategy::SetColumnsToMinWidth(nsIPresContext* aPresConte if (gsDebug==PR_TRUE) printf (" for col %d\n", colIndex); // XXX need column frame to ask this question - nsStylePosition* colPosition = nsnull; + const nsStylePosition* colPosition = nsnull; if (PR_FALSE==IsFixedWidth(colPosition)) { @@ -569,7 +569,7 @@ PRBool BasicTableLayoutStrategy::BalanceColumnsTableFits(nsIPresContext* aPresCo NS_ASSERTION(nsnull!=colFrame, "bad col frame"); nsIStyleContextPtr colSC; colFrame->GetStyleContext(aPresContext, colSC.AssignRef()); - nsStylePosition* colPosition = (nsStylePosition*) colSC->GetData(eStyleStruct_Position); + const nsStylePosition* colPosition = (const nsStylePosition*) colSC->GetStyleData(eStyleStruct_Position); if (gsDebug) printf("col %d has frame %p with style %p and pos %p\n", colIndex, colFrame, (nsIStyleContext *)colSC, colPosition); @@ -622,8 +622,8 @@ PRBool BasicTableLayoutStrategy::BalanceColumnsTableFits(nsIPresContext* aPresCo nscoord specifiedCellWidth=-1; nsIStyleContextPtr cellSC; data->GetCellFrame()->GetStyleContext(aPresContext, cellSC.AssignRef()); - nsStylePosition* cellPosition = (nsStylePosition*) - cellSC->GetData(eStyleStruct_Position); + const nsStylePosition* cellPosition = (const nsStylePosition*) + cellSC->GetStyleData(eStyleStruct_Position); switch (cellPosition->mWidth.GetUnit()) { case eStyleUnit_Coord: specifiedCellWidth = cellPosition->mWidth.GetCoordValue(); @@ -896,7 +896,7 @@ PRBool BasicTableLayoutStrategy::BalanceColumnsConstrained( nsIPresContext* aPre NS_ASSERTION(nsnull!=colFrame, "bad col frame"); nsIStyleContextPtr colSC; colFrame->GetStyleContext(aPresContext, colSC.AssignRef()); - nsStylePosition* colPosition = (nsStylePosition*) colSC->GetData(eStyleStruct_Position); + const nsStylePosition* colPosition = (const nsStylePosition*) colSC->GetStyleData(eStyleStruct_Position); if (PR_FALSE==IsFixedWidth(colPosition)) { diff --git a/mozilla/layout/html/table/src/BasicTableLayoutStrategy.h b/mozilla/layout/html/table/src/BasicTableLayoutStrategy.h index 1fe2a9066b9..166e801c718 100644 --- a/mozilla/layout/html/table/src/BasicTableLayoutStrategy.h +++ b/mozilla/layout/html/table/src/BasicTableLayoutStrategy.h @@ -164,9 +164,9 @@ public: * for the purposes of column width determination. * return false if the width changes based on content, parent size, etc. */ - virtual PRBool IsFixedWidth(nsStylePosition* aStylePosition); + virtual PRBool IsFixedWidth(const nsStylePosition* aStylePosition); - virtual PRBool IsAutoWidth(nsStylePosition* aStylePosition); + virtual PRBool IsAutoWidth(const nsStylePosition* aStylePosition); protected: nsTableFrame * mTableFrame; diff --git a/mozilla/layout/html/table/src/nsCellLayoutData.cpp b/mozilla/layout/html/table/src/nsCellLayoutData.cpp index da41b733875..2489c35031a 100644 --- a/mozilla/layout/html/table/src/nsCellLayoutData.cpp +++ b/mozilla/layout/html/table/src/nsCellLayoutData.cpp @@ -124,8 +124,8 @@ nscoord nsCellLayoutData::GetMargin(nsIFrame* aFrame, PRUint8 aEdge) const if (aFrame) { - nsStyleSpacing* spacing; - aFrame->GetStyleData(eStyleStruct_Spacing, (nsStyleStruct*&)spacing); + const nsStyleSpacing* spacing; + aFrame->GetStyleData(eStyleStruct_Spacing, (const nsStyleStruct*&)spacing); nsMargin margin; spacing->CalcMarginFor(aFrame, margin); switch (aEdge) @@ -162,8 +162,8 @@ nscoord nsCellLayoutData::GetBorderWidth(nsIFrame* aFrame, PRUint8 aEdge) const if (aFrame) { - nsStyleSpacing* spacing; - aFrame->GetStyleData(eStyleStruct_Spacing, (nsStyleStruct*&)spacing); + const nsStyleSpacing* spacing; + aFrame->GetStyleData(eStyleStruct_Spacing, (const nsStyleStruct*&)spacing); nsMargin border; spacing->CalcBorderFor(aFrame, border); switch (aEdge) @@ -200,8 +200,8 @@ nscoord nsCellLayoutData::GetPadding(nsIFrame* aFrame, PRUint8 aEdge) const if (aFrame) { - nsStyleSpacing* spacing; - aFrame->GetStyleData(eStyleStruct_Spacing, (nsStyleStruct*&)spacing); + const nsStyleSpacing* spacing; + aFrame->GetStyleData(eStyleStruct_Spacing, (const nsStyleStruct*&)spacing); nsMargin padding; spacing->CalcPaddingFor(aFrame, padding); switch (aEdge) @@ -301,10 +301,10 @@ nsIFrame* nsCellLayoutData::CompareCellBorders(nsIFrame* aFrame1, result = aFrame2; else // width1 == width2 { - nsStyleSpacing* border1; - nsStyleSpacing* border2; - aFrame1->GetStyleData(eStyleStruct_Spacing, (nsStyleStruct*&)border1); - aFrame2->GetStyleData(eStyleStruct_Spacing, (nsStyleStruct*&)border2); + const nsStyleSpacing* border1; + const nsStyleSpacing* border2; + aFrame1->GetStyleData(eStyleStruct_Spacing, (const nsStyleStruct*&)border1); + aFrame2->GetStyleData(eStyleStruct_Spacing, (const nsStyleStruct*&)border2); if (border1->mBorderStyle[aEdge1] >= border2->mBorderStyle[aEdge2]) result = aFrame1; else @@ -527,8 +527,8 @@ void nsCellLayoutData::CalculateMargins(nsTableFrame* aTableFrame, { // By default the margin is just the margin found in the // table cells style - nsStyleSpacing* spacing; - mCellFrame->GetStyleData(eStyleStruct_Spacing, (nsStyleStruct*&)spacing); + const nsStyleSpacing* spacing; + mCellFrame->GetStyleData(eStyleStruct_Spacing, (const 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 0f1091eefc3..dc589b9862d 100644 --- a/mozilla/layout/html/table/src/nsTableCaptionFrame.cpp +++ b/mozilla/layout/html/table/src/nsTableCaptionFrame.cpp @@ -70,10 +70,10 @@ PRInt32 nsTableCaptionFrame::GetMaxWidth() void nsTableCaptionFrame::VerticallyAlignChild(nsIPresContext* aPresContext) { - nsStyleText* textStyle = - (nsStyleText*)mStyleContext->GetData(eStyleStruct_Text); - nsStyleSpacing* spacing = - (nsStyleSpacing*)mStyleContext->GetData(eStyleStruct_Spacing); + const nsStyleText* textStyle = + (const nsStyleText*)mStyleContext->GetStyleData(eStyleStruct_Text); + const nsStyleSpacing* spacing = + (const nsStyleSpacing*)mStyleContext->GetStyleData(eStyleStruct_Spacing); nsMargin borderPadding; spacing->CalcBorderPaddingFor(this, borderPadding); diff --git a/mozilla/layout/html/table/src/nsTableCell.cpp b/mozilla/layout/html/table/src/nsTableCell.cpp index 53b312d04f9..f9c4717fbdf 100644 --- a/mozilla/layout/html/table/src/nsTableCell.cpp +++ b/mozilla/layout/html/table/src/nsTableCell.cpp @@ -219,7 +219,7 @@ void nsTableCell::MapAttributesInto(nsIStyleContext* aContext, GetAttribute(nsHTMLAtoms::align, value); if (value.GetUnit() == eHTMLUnit_Enumerated) { - nsStyleText* text = (nsStyleText*)aContext->GetData(eStyleStruct_Text); + nsStyleText* text = (nsStyleText*)aContext->GetMutableStyleData(eStyleStruct_Text); text->mTextAlign = value.GetIntValue(); } @@ -227,7 +227,7 @@ void nsTableCell::MapAttributesInto(nsIStyleContext* aContext, GetAttribute(nsHTMLAtoms::valign, value); if (value.GetUnit() == eHTMLUnit_Enumerated) { - nsStyleText* text = (nsStyleText*)aContext->GetData(eStyleStruct_Text); + nsStyleText* text = (nsStyleText*)aContext->GetMutableStyleData(eStyleStruct_Text); text->mTextAlign = value.GetIntValue(); } @@ -236,7 +236,7 @@ void nsTableCell::MapAttributesInto(nsIStyleContext* aContext, // width: pixel float p2t = aPresContext->GetPixelsToTwips(); nsStylePosition* pos = (nsStylePosition*) - aContext->GetData(eStyleStruct_Position); + aContext->GetMutableStyleData(eStyleStruct_Position); GetAttribute(nsHTMLAtoms::width, value); if (value.GetUnit() == eHTMLUnit_Pixel) { nscoord twips = nscoord(p2t * value.GetPixelValue()); diff --git a/mozilla/layout/html/table/src/nsTableCellFrame.cpp b/mozilla/layout/html/table/src/nsTableCellFrame.cpp index 24b28799bbe..0fc1179d797 100644 --- a/mozilla/layout/html/table/src/nsTableCellFrame.cpp +++ b/mozilla/layout/html/table/src/nsTableCellFrame.cpp @@ -57,14 +57,14 @@ NS_METHOD nsTableCellFrame::Paint(nsIPresContext& aPresContext, nsIRenderingContext& aRenderingContext, const nsRect& aDirtyRect) { - nsStyleDisplay* disp = - (nsStyleDisplay*)mStyleContext->GetData(eStyleStruct_Display); + const nsStyleDisplay* disp = + (const nsStyleDisplay*)mStyleContext->GetStyleData(eStyleStruct_Display); if (disp->mVisible) { - nsStyleColor* myColor = - (nsStyleColor*)mStyleContext->GetData(eStyleStruct_Color); - nsStyleSpacing* mySpacing = - (nsStyleSpacing*)mStyleContext->GetData(eStyleStruct_Spacing); + const nsStyleColor* myColor = + (const nsStyleColor*)mStyleContext->GetStyleData(eStyleStruct_Color); + const nsStyleSpacing* mySpacing = + (const nsStyleSpacing*)mStyleContext->GetStyleData(eStyleStruct_Spacing); NS_ASSERTION(nsnull!=myColor, "bad style color"); NS_ASSERTION(nsnull!=mySpacing, "bad style spacing"); @@ -98,10 +98,10 @@ NS_METHOD nsTableCellFrame::Paint(nsIPresContext& aPresContext, void nsTableCellFrame::VerticallyAlignChild(nsIPresContext* aPresContext) { - nsStyleSpacing* spacing = - (nsStyleSpacing*)mStyleContext->GetData(eStyleStruct_Spacing); - nsStyleText* textStyle = - (nsStyleText*)mStyleContext->GetData(eStyleStruct_Text); + const nsStyleSpacing* spacing = + (const nsStyleSpacing*)mStyleContext->GetStyleData(eStyleStruct_Spacing); + const nsStyleText* textStyle = + (const nsStyleText*)mStyleContext->GetStyleData(eStyleStruct_Text); nsMargin borderPadding; spacing->CalcBorderPaddingFor(this, borderPadding); @@ -269,8 +269,8 @@ NS_METHOD nsTableCellFrame::Reflow(nsIPresContext* aPresContext, // SEC: what about ascent and decent??? // Compute the insets (sum of border and padding) - nsStyleSpacing* spacing = - (nsStyleSpacing*)mStyleContext->GetData(eStyleStruct_Spacing); + const nsStyleSpacing* spacing = + (const nsStyleSpacing*)mStyleContext->GetStyleData(eStyleStruct_Spacing); nsMargin borderPadding; spacing->CalcBorderPaddingFor(this, borderPadding); @@ -454,7 +454,7 @@ void nsTableCellFrame::MapHTMLBorderStyle(nsIPresContext* aPresContext, nsStyleS tableFrame->GetStyleContext(aPresContext,styleContext); - nsStyleColor* colorData = (nsStyleColor*)styleContext->GetData(eStyleStruct_Color); + const nsStyleColor* colorData = (const nsStyleColor*)styleContext->GetStyleData(eStyleStruct_Color); // Look until we find a style context with a NON-transparent background color while (styleContext) @@ -464,7 +464,7 @@ void nsTableCellFrame::MapHTMLBorderStyle(nsIPresContext* aPresContext, nsStyleS nsIStyleContext* temp = styleContext; styleContext = styleContext->GetParent(); NS_RELEASE(temp); - colorData = (nsStyleColor*)styleContext->GetData(eStyleStruct_Color); + colorData = (const nsStyleColor*)styleContext->GetStyleData(eStyleStruct_Color); } else { @@ -539,7 +539,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(eStyleStruct_Spacing); + nsStyleSpacing* spacingData = (nsStyleSpacing*)mStyleContext->GetMutableStyleData(eStyleStruct_Spacing); // check to see if cellpadding or cellspacing is defined if (spacing_result == eContentAttr_HasValue || padding_result == eContentAttr_HasValue) @@ -586,7 +586,7 @@ void nsTableCellFrame::MapTextAttributes(nsIPresContext* aPresContext) ((nsTableCell*)mContent)->GetAttribute(nsHTMLAtoms::align, value); if (value.GetUnit() == eHTMLUnit_Enumerated) { - nsStyleText* text = (nsStyleText*)mStyleContext->GetData(eStyleStruct_Text); + nsStyleText* text = (nsStyleText*)mStyleContext->GetMutableStyleData(eStyleStruct_Text); text->mTextAlign = value.GetIntValue(); } } diff --git a/mozilla/layout/html/table/src/nsTableColGroup.cpp b/mozilla/layout/html/table/src/nsTableColGroup.cpp index 6c43fedad2e..57e01196fc7 100644 --- a/mozilla/layout/html/table/src/nsTableColGroup.cpp +++ b/mozilla/layout/html/table/src/nsTableColGroup.cpp @@ -368,7 +368,7 @@ void nsTableColGroup::MapAttributesInto(nsIStyleContext* aContext, GetAttribute(nsHTMLAtoms::width, value); if (value.GetUnit() != eHTMLUnit_Null) { nsStylePosition* position = (nsStylePosition*) - aContext->GetData(eStyleStruct_Position); + aContext->GetMutableStyleData(eStyleStruct_Position); switch (value.GetUnit()) { case eHTMLUnit_Percent: position->mWidth.SetPercentValue(value.GetPercentValue()); @@ -385,7 +385,7 @@ void nsTableColGroup::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(eStyleStruct_Display); + nsStyleDisplay* display = (nsStyleDisplay*)aContext->GetMutableStyleData(eStyleStruct_Display); switch (value.GetIntValue()) { case NS_STYLE_TEXT_ALIGN_LEFT: diff --git a/mozilla/layout/html/table/src/nsTableColGroupFrame.cpp b/mozilla/layout/html/table/src/nsTableColGroupFrame.cpp index f7df48a7063..1b2ceadb014 100644 --- a/mozilla/layout/html/table/src/nsTableColGroupFrame.cpp +++ b/mozilla/layout/html/table/src/nsTableColGroupFrame.cpp @@ -77,8 +77,8 @@ NS_METHOD nsTableColGroupFrame::Reflow(nsIPresContext* aPresContext, // Resolve style nsIStyleContextPtr kidSC = aPresContext->ResolveStyleContextFor(kid, this); - nsStyleSpacing* kidSpacing = (nsStyleSpacing*) - kidSC->GetData(eStyleStruct_Spacing); + const nsStyleSpacing* kidSpacing = (const nsStyleSpacing*) + kidSC->GetStyleData(eStyleStruct_Spacing); // Create a child frame nsIContentDelegate* kidDel = nsnull; @@ -151,17 +151,17 @@ NS_METHOD nsTableColGroupFrame::SetStyleContextForFirstPass(nsIPresContext* aPre PRInt32 colIndex=0; nsIFrame *colFrame=nsnull; - nsIStyleContext *colStyleContext; + nsIStyleContextPtr colStyleContext; for (; colIndexGetStyleData(eStyleStruct_Position, (nsStyleStruct*&)colPosition); + colFrame->GetStyleContext(aPresContext, colStyleContext.AssignRef()); + colPosition = (nsStylePosition*)colStyleContext->GetMutableStyleData(eStyleStruct_Position); nsStyleCoord width (1, eStyleUnit_Proportional); colPosition->mWidth = width; - colFrame->GetStyleContext(aPresContext, colStyleContext); colStyleContext->RecalcAutomaticData(aPresContext); } // if there are more columns, there width is set to "minimum" @@ -172,9 +172,9 @@ NS_METHOD nsTableColGroupFrame::SetStyleContextForFirstPass(nsIPresContext* aPre ChildAt(colIndex, colFrame); NS_ASSERTION(nsnull!=colFrame, "bad column frame"); nsStylePosition * colPosition=nsnull; - colFrame->GetStyleData(eStyleStruct_Position, (nsStyleStruct*&)colPosition); + colFrame->GetStyleContext(aPresContext, colStyleContext.AssignRef()); + colPosition = (nsStylePosition*)colStyleContext->GetMutableStyleData(eStyleStruct_Position); colPosition->mWidth.SetCoordValue(0); - colFrame->GetStyleContext(aPresContext, colStyleContext); colStyleContext->RecalcAutomaticData(aPresContext); } diff --git a/mozilla/layout/html/table/src/nsTableFrame.cpp b/mozilla/layout/html/table/src/nsTableFrame.cpp index 26db465bbc3..b2b6d22108e 100644 --- a/mozilla/layout/html/table/src/nsTableFrame.cpp +++ b/mozilla/layout/html/table/src/nsTableFrame.cpp @@ -550,14 +550,14 @@ NS_METHOD nsTableFrame::Paint(nsIPresContext& aPresContext, const nsRect& aDirtyRect) { // table paint code is concerned primarily with borders and bg color - nsStyleDisplay* disp = - (nsStyleDisplay*)mStyleContext->GetData(eStyleStruct_Display); + const nsStyleDisplay* disp = + (const nsStyleDisplay*)mStyleContext->GetStyleData(eStyleStruct_Display); if (disp->mVisible) { - nsStyleColor* myColor = - (nsStyleColor*)mStyleContext->GetData(eStyleStruct_Color); - nsStyleSpacing* mySpacing = - (nsStyleSpacing*)mStyleContext->GetData(eStyleStruct_Spacing); + const nsStyleColor* myColor = + (const nsStyleColor*)mStyleContext->GetStyleData(eStyleStruct_Color); + const nsStyleSpacing* mySpacing = + (const nsStyleSpacing*)mStyleContext->GetStyleData(eStyleStruct_Spacing); NS_ASSERTION(nsnull != myColor, "null style color"); NS_ASSERTION(nsnull != mySpacing, "null style spacing"); if (nsnull!=mySpacing) @@ -717,8 +717,8 @@ nsReflowStatus nsTableFrame::ResizeReflowPass1(nsIPresContext* aPresContext, nsIFrame* prevKidFrame = nsnull;/* XXX incremental reflow! */ // Compute the insets (sum of border and padding) - nsStyleSpacing* spacing = - (nsStyleSpacing*)mStyleContext->GetData(eStyleStruct_Spacing); + const nsStyleSpacing* spacing = + (const nsStyleSpacing*)mStyleContext->GetStyleData(eStyleStruct_Spacing); nsMargin borderPadding; spacing->CalcBorderPaddingFor(this, borderPadding); nscoord topInset = borderPadding.top; @@ -883,8 +883,8 @@ nsReflowStatus nsTableFrame::ResizeReflowPass2(nsIPresContext* aPresContext, // Check for an overflow list MoveOverflowToChildList(); - nsStyleSpacing* mySpacing = (nsStyleSpacing*) - mStyleContext->GetData(eStyleStruct_Spacing); + const nsStyleSpacing* mySpacing = (const nsStyleSpacing*) + mStyleContext->GetStyleData(eStyleStruct_Spacing); nsMargin myBorderPadding; mySpacing->CalcBorderPaddingFor(this, myBorderPadding); @@ -1125,8 +1125,8 @@ PRBool nsTableFrame::ReflowMappedChildren( nsIPresContext* aPresContext, nsIStyleContextPtr kidSC; kidFrame->GetStyleContext(aPresContext, kidSC.AssignRef()); - nsStyleSpacing* kidSpacing = (nsStyleSpacing*) - kidSC->GetData(eStyleStruct_Spacing); + const nsStyleSpacing* kidSpacing = (const nsStyleSpacing*) + kidSC->GetStyleData(eStyleStruct_Spacing); nsMargin kidMargin; kidSpacing->CalcMarginFor(kidFrame, kidMargin); @@ -1683,16 +1683,16 @@ void nsTableFrame::BalanceColumnWidths(nsIPresContext* aPresContext, PRInt32 maxTableWidth = 0; PRInt32 totalFixedWidth = 0; - nsStyleSpacing* spacing = - (nsStyleSpacing*)mStyleContext->GetData(eStyleStruct_Spacing); + const nsStyleSpacing* spacing = + (const nsStyleSpacing*)mStyleContext->GetStyleData(eStyleStruct_Spacing); nsMargin borderPadding; spacing->CalcBorderPaddingFor(this, borderPadding); // need to figure out the overall table width constraint // default case, get 100% of available space PRInt32 maxWidth; - nsStylePosition* position = - (nsStylePosition*)mStyleContext->GetData(eStyleStruct_Position); + const nsStylePosition* position = + (const nsStylePosition*)mStyleContext->GetStyleData(eStyleStruct_Position); switch (position->mWidth.GetUnit()) { case eStyleUnit_Coord: maxWidth = position->mWidth.GetCoordValue(); @@ -1752,8 +1752,8 @@ void nsTableFrame::SetTableWidth(nsIPresContext* aPresContext) } // Compute the insets (sum of border and padding) - nsStyleSpacing* spacing = - (nsStyleSpacing*)mStyleContext->GetData(eStyleStruct_Spacing); + const nsStyleSpacing* spacing = + (const nsStyleSpacing*)mStyleContext->GetStyleData(eStyleStruct_Spacing); nsMargin borderPadding; spacing->CalcBorderPaddingFor(this, borderPadding); @@ -1786,8 +1786,8 @@ void nsTableFrame::ShrinkWrapChildren(nsIPresContext* aPresContext, PRInt32 rowIndex; PRInt32 tableHeight = 0; - nsStyleSpacing* spacing = (nsStyleSpacing*) - mStyleContext->GetData(eStyleStruct_Spacing); + const nsStyleSpacing* spacing = (const nsStyleSpacing*) + mStyleContext->GetStyleData(eStyleStruct_Spacing); nsMargin borderPadding; spacing->CalcBorderPaddingFor(this, borderPadding); @@ -2139,7 +2139,7 @@ PRBool nsTableFrame::SetCellLayoutData(nsIPresContext* aPresContext, // assumes that the col style has been twiddled to account for first cell width attribute nsIStyleContextPtr colSC; colFrame->GetStyleContext(aPresContext, colSC.AssignRef()); - nsStylePosition* colPosition = (nsStylePosition*)colSC->GetData(eStyleStruct_Position); + const nsStylePosition* colPosition = (const nsStylePosition*)colSC->GetStyleData(eStyleStruct_Position); mColCache->AddColumnInfo(colPosition->mWidth.GetUnit(), colFrame->GetColumnIndex()); } } @@ -2396,7 +2396,7 @@ void nsTableFrame::MapHTMLBorderStyle(nsStyleSpacing& aSpacingStyle, nscoord aBo nsIStyleContext* styleContext = mStyleContext; - nsStyleColor* colorData = (nsStyleColor*)styleContext->GetData(eStyleStruct_Color); + const nsStyleColor* colorData = (const nsStyleColor*)styleContext->GetStyleData(eStyleStruct_Color); // Look until we find a style context with a NON-transparent background color while (styleContext) @@ -2407,7 +2407,7 @@ void nsTableFrame::MapHTMLBorderStyle(nsStyleSpacing& aSpacingStyle, nscoord aBo styleContext = styleContext->GetParent(); if (temp != mStyleContext) NS_RELEASE(temp); - colorData = (nsStyleColor*)styleContext->GetData(eStyleStruct_Color); + colorData = (const nsStyleColor*)styleContext->GetStyleData(eStyleStruct_Color); } else { @@ -2482,7 +2482,7 @@ void nsTableFrame::MapBorderMarginPadding(nsIPresContext* aPresContext) if (!table) return; - nsStyleSpacing* spacingData = (nsStyleSpacing*)mStyleContext->GetData(eStyleStruct_Spacing); + nsStyleSpacing* spacingData = (nsStyleSpacing*)mStyleContext->GetMutableStyleData(eStyleStruct_Spacing); border_result = table->GetAttribute(nsHTMLAtoms::border,border_value); if (border_result == eContentAttr_HasValue) @@ -2632,7 +2632,7 @@ PRBool nsTableFrame::TableIsAutoWidth(nsTableFrame *aTableFrame, nsIFrame * parent = nsnull; aTableFrame->GetGeometricParent(parent); parent->GetStyleContext(nsnull, parentStyle); - nsStylePosition* tablePosition = (nsStylePosition*)parentStyle->GetData(eStyleStruct_Position); + const nsStylePosition* tablePosition = (const nsStylePosition*)parentStyle->GetStyleData(eStyleStruct_Position); // end REMOVE_ME_WHEN_TABLE_STYLE_IS_RESOLVED! switch (tablePosition->mWidth.GetUnit()) { case eStyleUnit_Auto: // specified auto width diff --git a/mozilla/layout/html/table/src/nsTableFrame.h b/mozilla/layout/html/table/src/nsTableFrame.h index 70657556236..8ec93598d03 100644 --- a/mozilla/layout/html/table/src/nsTableFrame.h +++ b/mozilla/layout/html/table/src/nsTableFrame.h @@ -20,6 +20,7 @@ #include "nscore.h" #include "nsContainerFrame.h" +#include "nsStyleCoord.h" class nsCellLayoutData; class nsTableCell; @@ -33,7 +34,6 @@ class ColumnInfoCache; struct InnerTableReflowState; struct nsStylePosition; struct nsStyleSpacing; -enum nsStyleUnit; /** nsTableFrame maps the inner portion of a table (everything except captions.) * Used as a pseudo-frame within nsTableOuterFrame, diff --git a/mozilla/layout/html/table/src/nsTableOuterFrame.cpp b/mozilla/layout/html/table/src/nsTableOuterFrame.cpp index dd43e395400..353ae3675a7 100644 --- a/mozilla/layout/html/table/src/nsTableOuterFrame.cpp +++ b/mozilla/layout/html/table/src/nsTableOuterFrame.cpp @@ -458,8 +458,8 @@ PRBool nsTableOuterFrame::ReflowMappedChildren( nsIPresContext* aPresContex nsIStyleContextPtr kidSC; kidFrame->GetStyleContext(aPresContext, kidSC.AssignRef()); - nsStyleSpacing* kidSpacing = - (nsStyleSpacing*)kidSC->GetData(eStyleStruct_Spacing); + const nsStyleSpacing* kidSpacing = + (const nsStyleSpacing*)kidSC->GetStyleData(eStyleStruct_Spacing); nsMargin kidMargin; kidSpacing->CalcMarginFor(kidFrame, kidMargin); nscoord topMargin = GetTopMarginFor(aPresContext, aState, kidMargin); @@ -895,8 +895,8 @@ nsTableOuterFrame::ReflowChild( nsIFrame* aKidFrame, aKidFrame->GetStyleContext(aPresContext, captionStyleContext.AssignRef()); NS_ASSERTION(captionStyleContext.IsNotNull(), "null style context for caption"); - nsStyleText* captionStyle = - (nsStyleText*)captionStyleContext->GetData(eStyleStruct_Text); + const nsStyleText* captionStyle = + (const nsStyleText*)captionStyleContext->GetStyleData(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())) @@ -974,8 +974,8 @@ void nsTableOuterFrame::CreateChildFrames(nsIPresContext* aPresContext) nsIStyleContextPtr captionStyleContext = aPresContext->ResolveStyleContextFor(caption, this); NS_ASSERTION(captionStyleContext.IsNotNull(), "bad style context for caption."); - nsStyleText* captionStyle = - (nsStyleText*)captionStyleContext->GetData(eStyleStruct_Text); + const nsStyleText* captionStyle = + (const nsStyleText*)captionStyleContext->GetStyleData(eStyleStruct_Text); // create the frame nsIFrame *captionFrame=nsnull; frameCreated = ((nsIHTMLContent*)(nsIContent*)caption)->CreateFrame(aPresContext, @@ -1072,8 +1072,8 @@ nsTableOuterFrame::ResizeReflowTopCaptionsPass2(nsIPresContext* aPresCont captionFrame->GetStyleContext(aPresContext, captionStyleContext.AssignRef()); NS_ASSERTION(captionStyleContext.IsNotNull(), "null style context for caption"); - nsStyleText* captionStyle = - (nsStyleText*)captionStyleContext->GetData(eStyleStruct_Text); + const nsStyleText* captionStyle = + (const nsStyleText*)captionStyleContext->GetStyleData(eStyleStruct_Text); NS_ASSERTION(nsnull != captionStyle, "null style molecule for caption"); if ((eStyleUnit_Enumerated == captionStyle->mVerticalAlign.GetUnit()) && diff --git a/mozilla/layout/html/table/src/nsTablePart.cpp b/mozilla/layout/html/table/src/nsTablePart.cpp index faafdc1422a..21e447b307d 100644 --- a/mozilla/layout/html/table/src/nsTablePart.cpp +++ b/mozilla/layout/html/table/src/nsTablePart.cpp @@ -1128,7 +1128,7 @@ void nsTablePart::MapAttributesInto(nsIStyleContext* aContext, GetAttribute(nsHTMLAtoms::width, value); if (value.GetUnit() != eHTMLUnit_Null) { nsStylePosition* position = (nsStylePosition*) - aContext->GetData(eStyleStruct_Position); + aContext->GetMutableStyleData(eStyleStruct_Position); switch (value.GetUnit()) { case eHTMLUnit_Percent: position->mWidth.SetPercentValue(value.GetPercentValue()); @@ -1147,7 +1147,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(eStyleStruct_Display); + nsStyleDisplay* display = (nsStyleDisplay*)aContext->GetMutableStyleData(eStyleStruct_Display); switch (value.GetIntValue()) { case NS_STYLE_TEXT_ALIGN_LEFT: @@ -1176,7 +1176,7 @@ void nsTablePart::GetTableBorder(nsIHTMLContent* aContent, if ((value.GetUnit() == eHTMLUnit_Pixel) || (value.GetUnit() == eHTMLUnit_Empty)) { nsStyleSpacing* spacing = (nsStyleSpacing*) - aContext->GetData(eStyleStruct_Spacing); + aContext->GetMutableStyleData(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 5d79e2e8a1f..07184333afa 100644 --- a/mozilla/layout/html/table/src/nsTableRowFrame.cpp +++ b/mozilla/layout/html/table/src/nsTableRowFrame.cpp @@ -424,8 +424,8 @@ PRBool nsTableRowFrame::ReflowMappedChildren(nsIPresContext* aPresContext, nscoord cellHeight = desiredSize.height; nsIStyleContextPtr kidSC; kidFrame->GetStyleContext(aPresContext, kidSC.AssignRef()); - nsStylePosition* kidPosition = (nsStylePosition*) - kidSC->GetData(eStyleStruct_Position); + const nsStylePosition* kidPosition = (const nsStylePosition*) + kidSC->GetStyleData(eStyleStruct_Position); switch (kidPosition->mHeight.GetUnit()) { case eStyleUnit_Coord: specifiedHeight = kidPosition->mHeight.GetCoordValue(); @@ -1163,7 +1163,7 @@ nsTableRowFrame::SetColumnStyleFromCell(nsIPresContext* aPresContext, if (0==rowIndex) { // get the cell style info - nsStylePosition* cellPosition = (nsStylePosition*) aCellSC->GetData(eStyleStruct_Position); + const nsStylePosition* cellPosition = (const nsStylePosition*) aCellSC->GetStyleData(eStyleStruct_Position); if ((eStyleUnit_Coord == cellPosition->mWidth.GetUnit()) || (eStyleUnit_Percent==cellPosition->mWidth.GetUnit())) { @@ -1179,7 +1179,7 @@ nsTableRowFrame::SetColumnStyleFromCell(nsIPresContext* aPresContext, // get the column style and set the width attribute nsIStyleContextPtr colSC; colFrame->GetStyleContext(aPresContext, colSC.AssignRef()); - nsStylePosition* colPosition = (nsStylePosition*) colSC->GetData(eStyleStruct_Position); + nsStylePosition* colPosition = (nsStylePosition*) colSC->GetMutableStyleData(eStyleStruct_Position); // set the column width attribute if (eStyleUnit_Coord == cellPosition->mWidth.GetUnit()) { diff --git a/mozilla/layout/html/table/src/nsTableRowGroupFrame.cpp b/mozilla/layout/html/table/src/nsTableRowGroupFrame.cpp index e86476cc8f3..578c6a375b4 100644 --- a/mozilla/layout/html/table/src/nsTableRowGroupFrame.cpp +++ b/mozilla/layout/html/table/src/nsTableRowGroupFrame.cpp @@ -283,8 +283,8 @@ PRBool nsTableRowGroupFrame::ReflowMappedChildren( nsIPresContext* aPresCon nsIStyleContextPtr kidSC; kidFrame->GetStyleContext(aPresContext, kidSC.AssignRef()); - nsStyleSpacing* kidSpacing = (nsStyleSpacing*) - kidSC->GetData(eStyleStruct_Spacing); + const nsStyleSpacing* kidSpacing = (const nsStyleSpacing*) + kidSC->GetStyleData(eStyleStruct_Spacing); nsMargin kidMargin; kidSpacing->CalcMarginFor(this, kidMargin); nscoord topMargin = GetTopMarginFor(aPresContext, aState, kidMargin); @@ -744,8 +744,8 @@ nsTableRowGroupFrame::ReflowUnmappedChildren(nsIPresContext* aPresContext, // Resolve style nsIStyleContextPtr kidSC = aPresContext->ResolveStyleContextFor(kid, this); - nsStyleSpacing* kidSpacing = (nsStyleSpacing*) - kidSC->GetData(eStyleStruct_Spacing); + const nsStyleSpacing* kidSpacing = (const nsStyleSpacing*) + kidSC->GetStyleData(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 b3c267cda08..f20d9b0af6c 100644 --- a/mozilla/layout/style/nsCSSStyleRule.cpp +++ b/mozilla/layout/style/nsCSSStyleRule.cpp @@ -160,10 +160,10 @@ public: virtual PRInt32 GetWeight(void) const; virtual void SetWeight(PRInt32 aWeight); - virtual nscoord CalcLength(const nsCSSValue& aValue, nsStyleFont* aFont, + virtual nscoord CalcLength(const nsCSSValue& aValue, const nsStyleFont* aFont, nsIPresContext* aPresContext); virtual PRBool SetCoord(const nsCSSValue& aValue, nsStyleCoord& aCoord, - PRInt32 aMask, nsStyleFont* aFont, + PRInt32 aMask, const nsStyleFont* aFont, nsIPresContext* aPresContext); virtual void MapStyleInto(nsIStyleContext* aContext, nsIPresContext* aPresContext); @@ -416,7 +416,7 @@ void CSSStyleRuleImpl::SetWeight(PRInt32 aWeight) } nscoord CSSStyleRuleImpl::CalcLength(const nsCSSValue& aValue, - nsStyleFont* aFont, + const nsStyleFont* aFont, nsIPresContext* aPresContext) { NS_ASSERTION(aValue.IsLengthUnit(), "not a length unit"); @@ -462,7 +462,7 @@ nscoord CSSStyleRuleImpl::CalcLength(const nsCSSValue& aValue, #define SETCOORD_IAH (SETCOORD_INTEGER | SETCOORD_AH) PRBool CSSStyleRuleImpl::SetCoord(const nsCSSValue& aValue, nsStyleCoord& aCoord, - PRInt32 aMask, nsStyleFont* aFont, + PRInt32 aMask, const nsStyleFont* aFont, nsIPresContext* aPresContext) { PRBool result = PR_TRUE; @@ -510,15 +510,15 @@ PRBool CSSStyleRuleImpl::SetCoord(const nsCSSValue& aValue, nsStyleCoord& aCoord void CSSStyleRuleImpl::MapStyleInto(nsIStyleContext* aContext, nsIPresContext* aPresContext) { if (nsnull != mDeclaration) { - nsStyleFont* font = (nsStyleFont*)aContext->GetData(eStyleStruct_Font); + nsStyleFont* font = (nsStyleFont*)aContext->GetMutableStyleData(eStyleStruct_Font); nsCSSFont* ourFont; if (NS_OK == mDeclaration->GetData(kCSSFontSID, (nsCSSStruct**)&ourFont)) { if (nsnull != ourFont) { - nsStyleFont* parentFont = font; + const nsStyleFont* parentFont = font; nsIStyleContext* parentContext = aContext->GetParent(); if (nsnull != parentContext) { - parentFont = (nsStyleFont*)parentContext->GetData(eStyleStruct_Font); + parentFont = (const nsStyleFont*)parentContext->GetStyleData(eStyleStruct_Font); } // font-family: string list @@ -620,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(eStyleStruct_Text); + nsStyleText* text = (nsStyleText*) aContext->GetMutableStyleData(eStyleStruct_Text); // letter-spacing SetCoord(ourText->mLetterSpacing, text->mLetterSpacing, SETCOORD_LH | SETCOORD_NORMAL, @@ -670,12 +670,12 @@ void CSSStyleRuleImpl::MapStyleInto(nsIStyleContext* aContext, nsIPresContext* a if (nsnull != ourDisplay) { // Get our style and our parent's style nsStyleDisplay* display = (nsStyleDisplay*) - aContext->GetData(eStyleStruct_Display); + aContext->GetMutableStyleData(eStyleStruct_Display); - nsStyleDisplay* parentDisplay = display; + const nsStyleDisplay* parentDisplay = display; nsIStyleContext* parentContext = aContext->GetParent(); if (nsnull != parentContext) { - parentDisplay = (nsStyleDisplay*)parentContext->GetData(eStyleStruct_Display); + parentDisplay = (const nsStyleDisplay*)parentContext->GetStyleData(eStyleStruct_Display); } // display @@ -767,7 +767,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(eStyleStruct_Color); + nsStyleColor* color = (nsStyleColor*)aContext->GetMutableStyleData(eStyleStruct_Color); // color: color if (ourColor->mColor.GetUnit() == eCSSUnit_Color) { @@ -850,12 +850,11 @@ void CSSStyleRuleImpl::MapStyleInto(nsIStyleContext* aContext, nsIPresContext* a else if (ourColor->mOpacity.GetUnit() == eCSSUnit_Number) { color->mOpacity = ourColor->mOpacity.GetFloatValue(); } - else if (ourColor->mOpacity.GetUnit() == eCSSUnit_Enumerated) { - // Only enum value is inherit - nsStyleColor* parentColor = color; + else if (ourColor->mOpacity.GetUnit() == eCSSUnit_Inherit) { + const nsStyleColor* parentColor = color; nsIStyleContext* parentContext = aContext->GetParent(); if (nsnull != parentContext) { - parentColor = (nsStyleColor*)parentContext->GetData(eStyleStruct_Color); + parentColor = (const nsStyleColor*)parentContext->GetStyleData(eStyleStruct_Color); color->mOpacity = parentColor->mOpacity; NS_RELEASE(parentContext); } @@ -870,7 +869,7 @@ void CSSStyleRuleImpl::MapStyleInto(nsIStyleContext* aContext, nsIPresContext* a if (NS_OK == mDeclaration->GetData(kCSSMarginSID, (nsCSSStruct**)&ourMargin)) { if (nsnull != ourMargin) { nsStyleSpacing* spacing = (nsStyleSpacing*) - aContext->GetData(eStyleStruct_Spacing); + aContext->GetMutableStyleData(eStyleStruct_Spacing); // margin: length, percent, auto, inherit if (nsnull != ourMargin->mMargin) { @@ -941,7 +940,6 @@ void CSSStyleRuleImpl::MapStyleInto(nsIStyleContext* aContext, nsIPresContext* a } // border-color - nsStyleColor* color = (nsStyleColor*)aContext->GetData(eStyleStruct_Color); if (nsnull != ourMargin->mColor) { nsCSSRect* ourColor = ourMargin->mColor; if (ourColor->mTop.GetUnit() == eCSSUnit_Color) { @@ -963,7 +961,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(eStyleStruct_Position); + nsStylePosition* position = (nsStylePosition*)aContext->GetMutableStyleData(eStyleStruct_Position); // position: normal, enum, inherit if (ourPosition->mPosition.GetUnit() == eCSSUnit_Normal) { @@ -976,7 +974,7 @@ void CSSStyleRuleImpl::MapStyleInto(nsIStyleContext* aContext, nsIPresContext* a // explicit inheritance nsIStyleContext* parentContext = aContext->GetParent(); if (nsnull != parentContext) { - nsStylePosition* parentPosition = (nsStylePosition*)parentContext->GetData(eStyleStruct_Position); + const nsStylePosition* parentPosition = (const nsStylePosition*)parentContext->GetStyleData(eStyleStruct_Position); position->mPosition = parentPosition->mPosition; } } @@ -995,7 +993,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(eStyleStruct_List); + nsStyleList* list = (nsStyleList*)aContext->GetMutableStyleData(eStyleStruct_List); // list-style-type: enum if (ourList->mType.GetUnit() == eCSSUnit_Enumerated) { diff --git a/mozilla/layout/tables/BasicTableLayoutStrategy.cpp b/mozilla/layout/tables/BasicTableLayoutStrategy.cpp index f726a4989aa..ae24fc07ab5 100644 --- a/mozilla/layout/tables/BasicTableLayoutStrategy.cpp +++ b/mozilla/layout/tables/BasicTableLayoutStrategy.cpp @@ -74,7 +74,7 @@ struct ProportionalColumnLayoutStruct /* return true if the style indicates that the width is proportional * for the purposes of column width determination */ -PRBool BasicTableLayoutStrategy::IsFixedWidth(nsStylePosition* aStylePosition) +PRBool BasicTableLayoutStrategy::IsFixedWidth(const nsStylePosition* aStylePosition) { PRBool result = PR_FALSE; // assume that it is not fixed width PRInt32 unitType; @@ -105,7 +105,7 @@ PRBool BasicTableLayoutStrategy::IsFixedWidth(nsStylePosition* aStylePosition) return result; } -PRBool BasicTableLayoutStrategy::IsAutoWidth(nsStylePosition* aStylePosition) +PRBool BasicTableLayoutStrategy::IsAutoWidth(const nsStylePosition* aStylePosition) { PRBool result = PR_TRUE; // assume that it is if (nsnull!=aStylePosition) @@ -240,7 +240,7 @@ PRBool BasicTableLayoutStrategy::AssignFixedColumnWidths(nsIPresContext* aPresCo // Get the columns's style nsIStyleContextPtr colSC; colFrame->GetStyleContext(aPresContext, colSC.AssignRef()); - nsStylePosition* colPosition = (nsStylePosition*) colSC->GetData(eStyleStruct_Position); + const nsStylePosition* colPosition = (const nsStylePosition*) colSC->GetStyleData(eStyleStruct_Position); // Get column width if it has one PRBool haveColWidth = PR_FALSE; @@ -320,8 +320,8 @@ PRBool BasicTableLayoutStrategy::AssignFixedColumnWidths(nsIPresContext* aPresCo // Get the cell's style nsIStyleContextPtr cellSC; cellFrame->GetStyleContext(aPresContext, cellSC.AssignRef()); - nsStylePosition* cellPosition = (nsStylePosition*) - cellSC->GetData(eStyleStruct_Position); + const nsStylePosition* cellPosition = (const nsStylePosition*) + cellSC->GetStyleData(eStyleStruct_Position); switch (cellPosition->mWidth.GetUnit()) { case eStyleUnit_Coord: haveCellWidth = PR_TRUE; @@ -496,7 +496,7 @@ PRBool BasicTableLayoutStrategy::SetColumnsToMinWidth(nsIPresContext* aPresConte if (gsDebug==PR_TRUE) printf (" for col %d\n", colIndex); // XXX need column frame to ask this question - nsStylePosition* colPosition = nsnull; + const nsStylePosition* colPosition = nsnull; if (PR_FALSE==IsFixedWidth(colPosition)) { @@ -569,7 +569,7 @@ PRBool BasicTableLayoutStrategy::BalanceColumnsTableFits(nsIPresContext* aPresCo NS_ASSERTION(nsnull!=colFrame, "bad col frame"); nsIStyleContextPtr colSC; colFrame->GetStyleContext(aPresContext, colSC.AssignRef()); - nsStylePosition* colPosition = (nsStylePosition*) colSC->GetData(eStyleStruct_Position); + const nsStylePosition* colPosition = (const nsStylePosition*) colSC->GetStyleData(eStyleStruct_Position); if (gsDebug) printf("col %d has frame %p with style %p and pos %p\n", colIndex, colFrame, (nsIStyleContext *)colSC, colPosition); @@ -622,8 +622,8 @@ PRBool BasicTableLayoutStrategy::BalanceColumnsTableFits(nsIPresContext* aPresCo nscoord specifiedCellWidth=-1; nsIStyleContextPtr cellSC; data->GetCellFrame()->GetStyleContext(aPresContext, cellSC.AssignRef()); - nsStylePosition* cellPosition = (nsStylePosition*) - cellSC->GetData(eStyleStruct_Position); + const nsStylePosition* cellPosition = (const nsStylePosition*) + cellSC->GetStyleData(eStyleStruct_Position); switch (cellPosition->mWidth.GetUnit()) { case eStyleUnit_Coord: specifiedCellWidth = cellPosition->mWidth.GetCoordValue(); @@ -896,7 +896,7 @@ PRBool BasicTableLayoutStrategy::BalanceColumnsConstrained( nsIPresContext* aPre NS_ASSERTION(nsnull!=colFrame, "bad col frame"); nsIStyleContextPtr colSC; colFrame->GetStyleContext(aPresContext, colSC.AssignRef()); - nsStylePosition* colPosition = (nsStylePosition*) colSC->GetData(eStyleStruct_Position); + const nsStylePosition* colPosition = (const nsStylePosition*) colSC->GetStyleData(eStyleStruct_Position); if (PR_FALSE==IsFixedWidth(colPosition)) { diff --git a/mozilla/layout/tables/BasicTableLayoutStrategy.h b/mozilla/layout/tables/BasicTableLayoutStrategy.h index 1fe2a9066b9..166e801c718 100644 --- a/mozilla/layout/tables/BasicTableLayoutStrategy.h +++ b/mozilla/layout/tables/BasicTableLayoutStrategy.h @@ -164,9 +164,9 @@ public: * for the purposes of column width determination. * return false if the width changes based on content, parent size, etc. */ - virtual PRBool IsFixedWidth(nsStylePosition* aStylePosition); + virtual PRBool IsFixedWidth(const nsStylePosition* aStylePosition); - virtual PRBool IsAutoWidth(nsStylePosition* aStylePosition); + virtual PRBool IsAutoWidth(const nsStylePosition* aStylePosition); protected: nsTableFrame * mTableFrame; diff --git a/mozilla/layout/tables/nsTableCellFrame.cpp b/mozilla/layout/tables/nsTableCellFrame.cpp index 24b28799bbe..0fc1179d797 100644 --- a/mozilla/layout/tables/nsTableCellFrame.cpp +++ b/mozilla/layout/tables/nsTableCellFrame.cpp @@ -57,14 +57,14 @@ NS_METHOD nsTableCellFrame::Paint(nsIPresContext& aPresContext, nsIRenderingContext& aRenderingContext, const nsRect& aDirtyRect) { - nsStyleDisplay* disp = - (nsStyleDisplay*)mStyleContext->GetData(eStyleStruct_Display); + const nsStyleDisplay* disp = + (const nsStyleDisplay*)mStyleContext->GetStyleData(eStyleStruct_Display); if (disp->mVisible) { - nsStyleColor* myColor = - (nsStyleColor*)mStyleContext->GetData(eStyleStruct_Color); - nsStyleSpacing* mySpacing = - (nsStyleSpacing*)mStyleContext->GetData(eStyleStruct_Spacing); + const nsStyleColor* myColor = + (const nsStyleColor*)mStyleContext->GetStyleData(eStyleStruct_Color); + const nsStyleSpacing* mySpacing = + (const nsStyleSpacing*)mStyleContext->GetStyleData(eStyleStruct_Spacing); NS_ASSERTION(nsnull!=myColor, "bad style color"); NS_ASSERTION(nsnull!=mySpacing, "bad style spacing"); @@ -98,10 +98,10 @@ NS_METHOD nsTableCellFrame::Paint(nsIPresContext& aPresContext, void nsTableCellFrame::VerticallyAlignChild(nsIPresContext* aPresContext) { - nsStyleSpacing* spacing = - (nsStyleSpacing*)mStyleContext->GetData(eStyleStruct_Spacing); - nsStyleText* textStyle = - (nsStyleText*)mStyleContext->GetData(eStyleStruct_Text); + const nsStyleSpacing* spacing = + (const nsStyleSpacing*)mStyleContext->GetStyleData(eStyleStruct_Spacing); + const nsStyleText* textStyle = + (const nsStyleText*)mStyleContext->GetStyleData(eStyleStruct_Text); nsMargin borderPadding; spacing->CalcBorderPaddingFor(this, borderPadding); @@ -269,8 +269,8 @@ NS_METHOD nsTableCellFrame::Reflow(nsIPresContext* aPresContext, // SEC: what about ascent and decent??? // Compute the insets (sum of border and padding) - nsStyleSpacing* spacing = - (nsStyleSpacing*)mStyleContext->GetData(eStyleStruct_Spacing); + const nsStyleSpacing* spacing = + (const nsStyleSpacing*)mStyleContext->GetStyleData(eStyleStruct_Spacing); nsMargin borderPadding; spacing->CalcBorderPaddingFor(this, borderPadding); @@ -454,7 +454,7 @@ void nsTableCellFrame::MapHTMLBorderStyle(nsIPresContext* aPresContext, nsStyleS tableFrame->GetStyleContext(aPresContext,styleContext); - nsStyleColor* colorData = (nsStyleColor*)styleContext->GetData(eStyleStruct_Color); + const nsStyleColor* colorData = (const nsStyleColor*)styleContext->GetStyleData(eStyleStruct_Color); // Look until we find a style context with a NON-transparent background color while (styleContext) @@ -464,7 +464,7 @@ void nsTableCellFrame::MapHTMLBorderStyle(nsIPresContext* aPresContext, nsStyleS nsIStyleContext* temp = styleContext; styleContext = styleContext->GetParent(); NS_RELEASE(temp); - colorData = (nsStyleColor*)styleContext->GetData(eStyleStruct_Color); + colorData = (const nsStyleColor*)styleContext->GetStyleData(eStyleStruct_Color); } else { @@ -539,7 +539,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(eStyleStruct_Spacing); + nsStyleSpacing* spacingData = (nsStyleSpacing*)mStyleContext->GetMutableStyleData(eStyleStruct_Spacing); // check to see if cellpadding or cellspacing is defined if (spacing_result == eContentAttr_HasValue || padding_result == eContentAttr_HasValue) @@ -586,7 +586,7 @@ void nsTableCellFrame::MapTextAttributes(nsIPresContext* aPresContext) ((nsTableCell*)mContent)->GetAttribute(nsHTMLAtoms::align, value); if (value.GetUnit() == eHTMLUnit_Enumerated) { - nsStyleText* text = (nsStyleText*)mStyleContext->GetData(eStyleStruct_Text); + nsStyleText* text = (nsStyleText*)mStyleContext->GetMutableStyleData(eStyleStruct_Text); text->mTextAlign = value.GetIntValue(); } } diff --git a/mozilla/layout/tables/nsTableColGroupFrame.cpp b/mozilla/layout/tables/nsTableColGroupFrame.cpp index f7df48a7063..1b2ceadb014 100644 --- a/mozilla/layout/tables/nsTableColGroupFrame.cpp +++ b/mozilla/layout/tables/nsTableColGroupFrame.cpp @@ -77,8 +77,8 @@ NS_METHOD nsTableColGroupFrame::Reflow(nsIPresContext* aPresContext, // Resolve style nsIStyleContextPtr kidSC = aPresContext->ResolveStyleContextFor(kid, this); - nsStyleSpacing* kidSpacing = (nsStyleSpacing*) - kidSC->GetData(eStyleStruct_Spacing); + const nsStyleSpacing* kidSpacing = (const nsStyleSpacing*) + kidSC->GetStyleData(eStyleStruct_Spacing); // Create a child frame nsIContentDelegate* kidDel = nsnull; @@ -151,17 +151,17 @@ NS_METHOD nsTableColGroupFrame::SetStyleContextForFirstPass(nsIPresContext* aPre PRInt32 colIndex=0; nsIFrame *colFrame=nsnull; - nsIStyleContext *colStyleContext; + nsIStyleContextPtr colStyleContext; for (; colIndexGetStyleData(eStyleStruct_Position, (nsStyleStruct*&)colPosition); + colFrame->GetStyleContext(aPresContext, colStyleContext.AssignRef()); + colPosition = (nsStylePosition*)colStyleContext->GetMutableStyleData(eStyleStruct_Position); nsStyleCoord width (1, eStyleUnit_Proportional); colPosition->mWidth = width; - colFrame->GetStyleContext(aPresContext, colStyleContext); colStyleContext->RecalcAutomaticData(aPresContext); } // if there are more columns, there width is set to "minimum" @@ -172,9 +172,9 @@ NS_METHOD nsTableColGroupFrame::SetStyleContextForFirstPass(nsIPresContext* aPre ChildAt(colIndex, colFrame); NS_ASSERTION(nsnull!=colFrame, "bad column frame"); nsStylePosition * colPosition=nsnull; - colFrame->GetStyleData(eStyleStruct_Position, (nsStyleStruct*&)colPosition); + colFrame->GetStyleContext(aPresContext, colStyleContext.AssignRef()); + colPosition = (nsStylePosition*)colStyleContext->GetMutableStyleData(eStyleStruct_Position); colPosition->mWidth.SetCoordValue(0); - colFrame->GetStyleContext(aPresContext, colStyleContext); colStyleContext->RecalcAutomaticData(aPresContext); } diff --git a/mozilla/layout/tables/nsTableFrame.cpp b/mozilla/layout/tables/nsTableFrame.cpp index 26db465bbc3..b2b6d22108e 100644 --- a/mozilla/layout/tables/nsTableFrame.cpp +++ b/mozilla/layout/tables/nsTableFrame.cpp @@ -550,14 +550,14 @@ NS_METHOD nsTableFrame::Paint(nsIPresContext& aPresContext, const nsRect& aDirtyRect) { // table paint code is concerned primarily with borders and bg color - nsStyleDisplay* disp = - (nsStyleDisplay*)mStyleContext->GetData(eStyleStruct_Display); + const nsStyleDisplay* disp = + (const nsStyleDisplay*)mStyleContext->GetStyleData(eStyleStruct_Display); if (disp->mVisible) { - nsStyleColor* myColor = - (nsStyleColor*)mStyleContext->GetData(eStyleStruct_Color); - nsStyleSpacing* mySpacing = - (nsStyleSpacing*)mStyleContext->GetData(eStyleStruct_Spacing); + const nsStyleColor* myColor = + (const nsStyleColor*)mStyleContext->GetStyleData(eStyleStruct_Color); + const nsStyleSpacing* mySpacing = + (const nsStyleSpacing*)mStyleContext->GetStyleData(eStyleStruct_Spacing); NS_ASSERTION(nsnull != myColor, "null style color"); NS_ASSERTION(nsnull != mySpacing, "null style spacing"); if (nsnull!=mySpacing) @@ -717,8 +717,8 @@ nsReflowStatus nsTableFrame::ResizeReflowPass1(nsIPresContext* aPresContext, nsIFrame* prevKidFrame = nsnull;/* XXX incremental reflow! */ // Compute the insets (sum of border and padding) - nsStyleSpacing* spacing = - (nsStyleSpacing*)mStyleContext->GetData(eStyleStruct_Spacing); + const nsStyleSpacing* spacing = + (const nsStyleSpacing*)mStyleContext->GetStyleData(eStyleStruct_Spacing); nsMargin borderPadding; spacing->CalcBorderPaddingFor(this, borderPadding); nscoord topInset = borderPadding.top; @@ -883,8 +883,8 @@ nsReflowStatus nsTableFrame::ResizeReflowPass2(nsIPresContext* aPresContext, // Check for an overflow list MoveOverflowToChildList(); - nsStyleSpacing* mySpacing = (nsStyleSpacing*) - mStyleContext->GetData(eStyleStruct_Spacing); + const nsStyleSpacing* mySpacing = (const nsStyleSpacing*) + mStyleContext->GetStyleData(eStyleStruct_Spacing); nsMargin myBorderPadding; mySpacing->CalcBorderPaddingFor(this, myBorderPadding); @@ -1125,8 +1125,8 @@ PRBool nsTableFrame::ReflowMappedChildren( nsIPresContext* aPresContext, nsIStyleContextPtr kidSC; kidFrame->GetStyleContext(aPresContext, kidSC.AssignRef()); - nsStyleSpacing* kidSpacing = (nsStyleSpacing*) - kidSC->GetData(eStyleStruct_Spacing); + const nsStyleSpacing* kidSpacing = (const nsStyleSpacing*) + kidSC->GetStyleData(eStyleStruct_Spacing); nsMargin kidMargin; kidSpacing->CalcMarginFor(kidFrame, kidMargin); @@ -1683,16 +1683,16 @@ void nsTableFrame::BalanceColumnWidths(nsIPresContext* aPresContext, PRInt32 maxTableWidth = 0; PRInt32 totalFixedWidth = 0; - nsStyleSpacing* spacing = - (nsStyleSpacing*)mStyleContext->GetData(eStyleStruct_Spacing); + const nsStyleSpacing* spacing = + (const nsStyleSpacing*)mStyleContext->GetStyleData(eStyleStruct_Spacing); nsMargin borderPadding; spacing->CalcBorderPaddingFor(this, borderPadding); // need to figure out the overall table width constraint // default case, get 100% of available space PRInt32 maxWidth; - nsStylePosition* position = - (nsStylePosition*)mStyleContext->GetData(eStyleStruct_Position); + const nsStylePosition* position = + (const nsStylePosition*)mStyleContext->GetStyleData(eStyleStruct_Position); switch (position->mWidth.GetUnit()) { case eStyleUnit_Coord: maxWidth = position->mWidth.GetCoordValue(); @@ -1752,8 +1752,8 @@ void nsTableFrame::SetTableWidth(nsIPresContext* aPresContext) } // Compute the insets (sum of border and padding) - nsStyleSpacing* spacing = - (nsStyleSpacing*)mStyleContext->GetData(eStyleStruct_Spacing); + const nsStyleSpacing* spacing = + (const nsStyleSpacing*)mStyleContext->GetStyleData(eStyleStruct_Spacing); nsMargin borderPadding; spacing->CalcBorderPaddingFor(this, borderPadding); @@ -1786,8 +1786,8 @@ void nsTableFrame::ShrinkWrapChildren(nsIPresContext* aPresContext, PRInt32 rowIndex; PRInt32 tableHeight = 0; - nsStyleSpacing* spacing = (nsStyleSpacing*) - mStyleContext->GetData(eStyleStruct_Spacing); + const nsStyleSpacing* spacing = (const nsStyleSpacing*) + mStyleContext->GetStyleData(eStyleStruct_Spacing); nsMargin borderPadding; spacing->CalcBorderPaddingFor(this, borderPadding); @@ -2139,7 +2139,7 @@ PRBool nsTableFrame::SetCellLayoutData(nsIPresContext* aPresContext, // assumes that the col style has been twiddled to account for first cell width attribute nsIStyleContextPtr colSC; colFrame->GetStyleContext(aPresContext, colSC.AssignRef()); - nsStylePosition* colPosition = (nsStylePosition*)colSC->GetData(eStyleStruct_Position); + const nsStylePosition* colPosition = (const nsStylePosition*)colSC->GetStyleData(eStyleStruct_Position); mColCache->AddColumnInfo(colPosition->mWidth.GetUnit(), colFrame->GetColumnIndex()); } } @@ -2396,7 +2396,7 @@ void nsTableFrame::MapHTMLBorderStyle(nsStyleSpacing& aSpacingStyle, nscoord aBo nsIStyleContext* styleContext = mStyleContext; - nsStyleColor* colorData = (nsStyleColor*)styleContext->GetData(eStyleStruct_Color); + const nsStyleColor* colorData = (const nsStyleColor*)styleContext->GetStyleData(eStyleStruct_Color); // Look until we find a style context with a NON-transparent background color while (styleContext) @@ -2407,7 +2407,7 @@ void nsTableFrame::MapHTMLBorderStyle(nsStyleSpacing& aSpacingStyle, nscoord aBo styleContext = styleContext->GetParent(); if (temp != mStyleContext) NS_RELEASE(temp); - colorData = (nsStyleColor*)styleContext->GetData(eStyleStruct_Color); + colorData = (const nsStyleColor*)styleContext->GetStyleData(eStyleStruct_Color); } else { @@ -2482,7 +2482,7 @@ void nsTableFrame::MapBorderMarginPadding(nsIPresContext* aPresContext) if (!table) return; - nsStyleSpacing* spacingData = (nsStyleSpacing*)mStyleContext->GetData(eStyleStruct_Spacing); + nsStyleSpacing* spacingData = (nsStyleSpacing*)mStyleContext->GetMutableStyleData(eStyleStruct_Spacing); border_result = table->GetAttribute(nsHTMLAtoms::border,border_value); if (border_result == eContentAttr_HasValue) @@ -2632,7 +2632,7 @@ PRBool nsTableFrame::TableIsAutoWidth(nsTableFrame *aTableFrame, nsIFrame * parent = nsnull; aTableFrame->GetGeometricParent(parent); parent->GetStyleContext(nsnull, parentStyle); - nsStylePosition* tablePosition = (nsStylePosition*)parentStyle->GetData(eStyleStruct_Position); + const nsStylePosition* tablePosition = (const nsStylePosition*)parentStyle->GetStyleData(eStyleStruct_Position); // end REMOVE_ME_WHEN_TABLE_STYLE_IS_RESOLVED! switch (tablePosition->mWidth.GetUnit()) { case eStyleUnit_Auto: // specified auto width diff --git a/mozilla/layout/tables/nsTableFrame.h b/mozilla/layout/tables/nsTableFrame.h index 70657556236..8ec93598d03 100644 --- a/mozilla/layout/tables/nsTableFrame.h +++ b/mozilla/layout/tables/nsTableFrame.h @@ -20,6 +20,7 @@ #include "nscore.h" #include "nsContainerFrame.h" +#include "nsStyleCoord.h" class nsCellLayoutData; class nsTableCell; @@ -33,7 +34,6 @@ class ColumnInfoCache; struct InnerTableReflowState; struct nsStylePosition; struct nsStyleSpacing; -enum nsStyleUnit; /** nsTableFrame maps the inner portion of a table (everything except captions.) * Used as a pseudo-frame within nsTableOuterFrame, diff --git a/mozilla/layout/tables/nsTableOuterFrame.cpp b/mozilla/layout/tables/nsTableOuterFrame.cpp index dd43e395400..353ae3675a7 100644 --- a/mozilla/layout/tables/nsTableOuterFrame.cpp +++ b/mozilla/layout/tables/nsTableOuterFrame.cpp @@ -458,8 +458,8 @@ PRBool nsTableOuterFrame::ReflowMappedChildren( nsIPresContext* aPresContex nsIStyleContextPtr kidSC; kidFrame->GetStyleContext(aPresContext, kidSC.AssignRef()); - nsStyleSpacing* kidSpacing = - (nsStyleSpacing*)kidSC->GetData(eStyleStruct_Spacing); + const nsStyleSpacing* kidSpacing = + (const nsStyleSpacing*)kidSC->GetStyleData(eStyleStruct_Spacing); nsMargin kidMargin; kidSpacing->CalcMarginFor(kidFrame, kidMargin); nscoord topMargin = GetTopMarginFor(aPresContext, aState, kidMargin); @@ -895,8 +895,8 @@ nsTableOuterFrame::ReflowChild( nsIFrame* aKidFrame, aKidFrame->GetStyleContext(aPresContext, captionStyleContext.AssignRef()); NS_ASSERTION(captionStyleContext.IsNotNull(), "null style context for caption"); - nsStyleText* captionStyle = - (nsStyleText*)captionStyleContext->GetData(eStyleStruct_Text); + const nsStyleText* captionStyle = + (const nsStyleText*)captionStyleContext->GetStyleData(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())) @@ -974,8 +974,8 @@ void nsTableOuterFrame::CreateChildFrames(nsIPresContext* aPresContext) nsIStyleContextPtr captionStyleContext = aPresContext->ResolveStyleContextFor(caption, this); NS_ASSERTION(captionStyleContext.IsNotNull(), "bad style context for caption."); - nsStyleText* captionStyle = - (nsStyleText*)captionStyleContext->GetData(eStyleStruct_Text); + const nsStyleText* captionStyle = + (const nsStyleText*)captionStyleContext->GetStyleData(eStyleStruct_Text); // create the frame nsIFrame *captionFrame=nsnull; frameCreated = ((nsIHTMLContent*)(nsIContent*)caption)->CreateFrame(aPresContext, @@ -1072,8 +1072,8 @@ nsTableOuterFrame::ResizeReflowTopCaptionsPass2(nsIPresContext* aPresCont captionFrame->GetStyleContext(aPresContext, captionStyleContext.AssignRef()); NS_ASSERTION(captionStyleContext.IsNotNull(), "null style context for caption"); - nsStyleText* captionStyle = - (nsStyleText*)captionStyleContext->GetData(eStyleStruct_Text); + const nsStyleText* captionStyle = + (const nsStyleText*)captionStyleContext->GetStyleData(eStyleStruct_Text); NS_ASSERTION(nsnull != captionStyle, "null style molecule for caption"); if ((eStyleUnit_Enumerated == captionStyle->mVerticalAlign.GetUnit()) && diff --git a/mozilla/layout/tables/nsTableRowFrame.cpp b/mozilla/layout/tables/nsTableRowFrame.cpp index 5d79e2e8a1f..07184333afa 100644 --- a/mozilla/layout/tables/nsTableRowFrame.cpp +++ b/mozilla/layout/tables/nsTableRowFrame.cpp @@ -424,8 +424,8 @@ PRBool nsTableRowFrame::ReflowMappedChildren(nsIPresContext* aPresContext, nscoord cellHeight = desiredSize.height; nsIStyleContextPtr kidSC; kidFrame->GetStyleContext(aPresContext, kidSC.AssignRef()); - nsStylePosition* kidPosition = (nsStylePosition*) - kidSC->GetData(eStyleStruct_Position); + const nsStylePosition* kidPosition = (const nsStylePosition*) + kidSC->GetStyleData(eStyleStruct_Position); switch (kidPosition->mHeight.GetUnit()) { case eStyleUnit_Coord: specifiedHeight = kidPosition->mHeight.GetCoordValue(); @@ -1163,7 +1163,7 @@ nsTableRowFrame::SetColumnStyleFromCell(nsIPresContext* aPresContext, if (0==rowIndex) { // get the cell style info - nsStylePosition* cellPosition = (nsStylePosition*) aCellSC->GetData(eStyleStruct_Position); + const nsStylePosition* cellPosition = (const nsStylePosition*) aCellSC->GetStyleData(eStyleStruct_Position); if ((eStyleUnit_Coord == cellPosition->mWidth.GetUnit()) || (eStyleUnit_Percent==cellPosition->mWidth.GetUnit())) { @@ -1179,7 +1179,7 @@ nsTableRowFrame::SetColumnStyleFromCell(nsIPresContext* aPresContext, // get the column style and set the width attribute nsIStyleContextPtr colSC; colFrame->GetStyleContext(aPresContext, colSC.AssignRef()); - nsStylePosition* colPosition = (nsStylePosition*) colSC->GetData(eStyleStruct_Position); + nsStylePosition* colPosition = (nsStylePosition*) colSC->GetMutableStyleData(eStyleStruct_Position); // set the column width attribute if (eStyleUnit_Coord == cellPosition->mWidth.GetUnit()) { diff --git a/mozilla/layout/tables/nsTableRowGroupFrame.cpp b/mozilla/layout/tables/nsTableRowGroupFrame.cpp index e86476cc8f3..578c6a375b4 100644 --- a/mozilla/layout/tables/nsTableRowGroupFrame.cpp +++ b/mozilla/layout/tables/nsTableRowGroupFrame.cpp @@ -283,8 +283,8 @@ PRBool nsTableRowGroupFrame::ReflowMappedChildren( nsIPresContext* aPresCon nsIStyleContextPtr kidSC; kidFrame->GetStyleContext(aPresContext, kidSC.AssignRef()); - nsStyleSpacing* kidSpacing = (nsStyleSpacing*) - kidSC->GetData(eStyleStruct_Spacing); + const nsStyleSpacing* kidSpacing = (const nsStyleSpacing*) + kidSC->GetStyleData(eStyleStruct_Spacing); nsMargin kidMargin; kidSpacing->CalcMarginFor(this, kidMargin); nscoord topMargin = GetTopMarginFor(aPresContext, aState, kidMargin); @@ -744,8 +744,8 @@ nsTableRowGroupFrame::ReflowUnmappedChildren(nsIPresContext* aPresContext, // Resolve style nsIStyleContextPtr kidSC = aPresContext->ResolveStyleContextFor(kid, this); - nsStyleSpacing* kidSpacing = (nsStyleSpacing*) - kidSC->GetData(eStyleStruct_Spacing); + const nsStyleSpacing* kidSpacing = (const nsStyleSpacing*) + kidSC->GetStyleData(eStyleStruct_Spacing); nsMargin kidMargin; kidSpacing->CalcMarginFor(this, kidMargin); nscoord topMargin = GetTopMarginFor(aPresContext, aState, kidMargin);