From cddf6f971f280c9be3faae00ff1b7dd057b026a7 Mon Sep 17 00:00:00 2001 From: "evaughan%netscape.com" Date: Sat, 27 Mar 1999 00:58:29 +0000 Subject: [PATCH] Added XUL based layout manager. git-svn-id: svn://10.0.0.236/trunk@25282 18797224-902f-48f8-a5cc-f745e15eee43 --- mozilla/content/shared/public/nsXULAtoms.h | 3 ++ mozilla/content/shared/src/nsXULAtoms.cpp | 8 +++++ mozilla/layout/base/nsCSSFrameConstructor.cpp | 16 ++++++--- .../layout/forms/nsButtonFrameRenderer.cpp | 33 +++++++++++++++---- mozilla/layout/forms/nsButtonFrameRenderer.h | 20 ++++++----- .../html/forms/src/nsButtonFrameRenderer.cpp | 33 +++++++++++++++---- .../html/forms/src/nsButtonFrameRenderer.h | 20 ++++++----- .../html/style/src/nsCSSFrameConstructor.cpp | 16 ++++++--- mozilla/layout/xul/base/src/Makefile.in | 3 +- mozilla/layout/xul/base/src/makefile.win | 2 ++ .../xul/base/src/nsProgressMeterFrame.cpp | 5 +-- .../xul/base/src/nsTitledButtonFrame.cpp | 26 +++++++++------ mozilla/layout/xul/content/src/nsXULAtoms.cpp | 8 +++++ mozilla/layout/xul/content/src/nsXULAtoms.h | 3 ++ 14 files changed, 143 insertions(+), 53 deletions(-) diff --git a/mozilla/content/shared/public/nsXULAtoms.h b/mozilla/content/shared/public/nsXULAtoms.h index 31cf0bbc399..ef8e33924b0 100644 --- a/mozilla/content/shared/public/nsXULAtoms.h +++ b/mozilla/content/shared/public/nsXULAtoms.h @@ -66,6 +66,9 @@ public: static nsIAtom* titledbutton; static nsIAtom* mode; + static nsIAtom* box; + static nsIAtom* flex; + static nsIAtom* widget; static nsIAtom* window; }; diff --git a/mozilla/content/shared/src/nsXULAtoms.cpp b/mozilla/content/shared/src/nsXULAtoms.cpp index 93aa0803c17..1518de97727 100644 --- a/mozilla/content/shared/src/nsXULAtoms.cpp +++ b/mozilla/content/shared/src/nsXULAtoms.cpp @@ -48,6 +48,8 @@ nsIAtom* nsXULAtoms::progressmeter; nsIAtom* nsXULAtoms::titledbutton; nsIAtom* nsXULAtoms::mode; +nsIAtom* nsXULAtoms::box; +nsIAtom* nsXULAtoms::flex; nsIAtom* nsXULAtoms::widget; nsIAtom* nsXULAtoms::window; @@ -91,6 +93,8 @@ void nsXULAtoms::AddrefAtoms() { titledbutton = NS_NewAtom("titledbutton"); mode = NS_NewAtom("mode"); + box = NS_NewAtom("box"); + flex = NS_NewAtom("flex"); widget = NS_NewAtom("widget"); window = NS_NewAtom("window"); @@ -124,6 +128,10 @@ void nsXULAtoms::ReleaseAtoms() { NS_RELEASE(progressmeter); NS_RELEASE(mode); + NS_RELEASE(box); + NS_RELEASE(flex); + + NS_RELEASE(widget); NS_RELEASE(window); NS_IF_RELEASE(gNameSpaceManager); diff --git a/mozilla/layout/base/nsCSSFrameConstructor.cpp b/mozilla/layout/base/nsCSSFrameConstructor.cpp index 1f616fde037..976c0103e25 100644 --- a/mozilla/layout/base/nsCSSFrameConstructor.cpp +++ b/mozilla/layout/base/nsCSSFrameConstructor.cpp @@ -70,10 +70,9 @@ NS_NewProgressMeterFrame ( nsIFrame*& aNewFrame ); nsresult NS_NewTitledButtonFrame ( nsIFrame*& aNewFrame ); -/* -#include "nsProgressMeterFrame.h" -#include "nsTitledButtonFrame.h" -*/ +nsresult +NS_NewBoxFrame ( nsIFrame*& aNewFrame ); + #endif //static NS_DEFINE_IID(kIStyleRuleIID, NS_ISTYLE_RULE_IID); @@ -1298,6 +1297,7 @@ nsCSSFrameConstructor::TableIsValidCellContent(nsIPresContext* aPresContext, (nsXULAtoms::treeindentation == tag.get()) || (nsXULAtoms::toolbox == tag.get()) || (nsXULAtoms::toolbar == tag.get()) || + (nsXULAtoms::box == tag.get()) || (nsXULAtoms::progressmeter == tag.get() )) { return PR_TRUE; } @@ -2246,6 +2246,14 @@ nsCSSFrameConstructor::ConstructXULFrame(nsIPresContext* aPresContext, } // End of PROGRESS METER CONSTRUCTION logic + // BOX CONSTRUCTION + else if (aTag == nsXULAtoms::box) { + processChildren = PR_TRUE; + isReplaced = PR_TRUE; + rv = NS_NewBoxFrame(newFrame); + } + // End of BOX CONSTRUCTION logic + // TITLED BUTTON CONSTRUCTION else if (aTag == nsXULAtoms::titledbutton) { processChildren = PR_TRUE; diff --git a/mozilla/layout/forms/nsButtonFrameRenderer.cpp b/mozilla/layout/forms/nsButtonFrameRenderer.cpp index 446c8b87f75..a5d39c7430c 100644 --- a/mozilla/layout/forms/nsButtonFrameRenderer.cpp +++ b/mozilla/layout/forms/nsButtonFrameRenderer.cpp @@ -27,12 +27,17 @@ nsButtonFrameRenderer::SetNameSpace(PRInt32 aNameSpace) } void -nsButtonFrameRenderer::SetFrame(nsIFrame* aFrame, nsIPresContext& aPresContext) +nsButtonFrameRenderer::SetFrame(nsFrame* aFrame, nsIPresContext& aPresContext) { mFrame = aFrame; ReResolveStyles(aPresContext); } +void +nsButtonFrameRenderer::Redraw() +{ + mFrame->Invalidate(mOutlineRect, PR_TRUE); +} nsString nsButtonFrameRenderer::GetPseudoClassAttribute() @@ -334,8 +339,14 @@ nsButtonFrameRenderer::PaintOutlineAndFocusBorders(nsIPresContext& aPresContext, nsRect rect; - if (NS_FRAME_PAINT_LAYER_BACKGROUND == aWhichLayer) + if (NS_FRAME_PAINT_LAYER_BACKGROUND == aWhichLayer) { + // because we have and outline rect we need to + // store our bounds for redraw. We will change + // these bounds when outline appears + mOutlineRect = rect; + mOutlineRect.width = 0; + mOutlineRect.height= 0; if (mOuterFocusStyle) { // ---------- paint the outer focus border ------------- @@ -360,11 +371,11 @@ nsButtonFrameRenderer::PaintOutlineAndFocusBorders(nsIPresContext& aPresContext, } } - if (NS_FRAME_PAINT_LAYER_FOREGROUND == aWhichLayer) + if (NS_FRAME_PAINT_LAYER_FOREGROUND == aWhichLayer) { - if /*(mOutlineStyle) */ (PR_FALSE) { + if (mOutlineStyle) { - GetButtonOutlineRect(aRect, rect); + GetButtonOutlineRect(aRect, mOutlineRect); const nsStyleSpacing* spacing = (const nsStyleSpacing*)mOutlineStyle ->GetStyleData(eStyleStruct_Spacing); @@ -374,7 +385,7 @@ nsButtonFrameRenderer::PaintOutlineAndFocusBorders(nsIPresContext& aPresContext, aRenderingContext.SetClipRect(rect, nsClipCombine_kReplace, clipEmpty); nsCSSRendering::PaintBorder(aPresContext, aRenderingContext, mFrame, - aDirtyRect, rect, *spacing, mOutlineStyle, 0); + aDirtyRect, mOutlineRect, *spacing, mOutlineStyle, 0); aRenderingContext.PopState(clipEmpty); } @@ -529,10 +540,18 @@ nsButtonFrameRenderer::GetButtonOutlineBorderAndPadding() return borderAndPadding; } +// gets the full size of our border with all the focus borders nsMargin nsButtonFrameRenderer::GetFullButtonBorderAndPadding() { - return GetButtonOuterFocusBorderAndPadding() + GetButtonBorderAndPadding() + GetButtonInnerFocusMargin() + GetButtonInnerFocusBorderAndPadding(); + return GetAddedButtonBorderAndPadding() + GetButtonBorderAndPadding(); +} + +// gets all the focus borders and padding that will be added to the regular border +nsMargin +nsButtonFrameRenderer::GetAddedButtonBorderAndPadding() +{ + return GetButtonOuterFocusBorderAndPadding() + GetButtonInnerFocusMargin() + GetButtonInnerFocusBorderAndPadding(); } void diff --git a/mozilla/layout/forms/nsButtonFrameRenderer.h b/mozilla/layout/forms/nsButtonFrameRenderer.h index 2076015711b..2432dd92566 100644 --- a/mozilla/layout/forms/nsButtonFrameRenderer.h +++ b/mozilla/layout/forms/nsButtonFrameRenderer.h @@ -65,7 +65,7 @@ public: const nsRect& aRect); virtual void SetNameSpace(PRInt32 aNameSpace); - virtual void SetFrame(nsIFrame* aFrame, nsIPresContext& aPresContext); + virtual void SetFrame(nsFrame* aFrame, nsIPresContext& aPresContext); virtual void SetActive(PRBool aActive, PRBool notify); virtual void SetHover(PRBool aHover, PRBool notify); @@ -82,12 +82,13 @@ public: virtual void GetButtonRect(const nsRect& aRect, nsRect& aResult); virtual void GetButtonInnerFocusRect(const nsRect& aRect, nsRect& aResult); virtual void GetButtonContentRect(const nsRect& aRect, nsRect& aResult); - virtual nsMargin GetButtonOuterFocusBorderAndPadding(); - virtual nsMargin GetButtonBorderAndPadding(); - virtual nsMargin GetButtonInnerFocusMargin(); - virtual nsMargin GetButtonInnerFocusBorderAndPadding(); - virtual nsMargin GetButtonOutlineBorderAndPadding(); - virtual nsMargin GetFullButtonBorderAndPadding(); + virtual nsMargin GetButtonOuterFocusBorderAndPadding(); + virtual nsMargin GetButtonBorderAndPadding(); + virtual nsMargin GetButtonInnerFocusMargin(); + virtual nsMargin GetButtonInnerFocusBorderAndPadding(); + virtual nsMargin GetButtonOutlineBorderAndPadding(); + virtual nsMargin GetFullButtonBorderAndPadding(); + virtual nsMargin GetAddedButtonBorderAndPadding(); virtual void ReResolveStyles(nsIPresContext& aPresContext); @@ -99,6 +100,7 @@ public: nsHTMLReflowMetrics& aDesiredSize, nsMargin& aBorderPadding); + virtual void Redraw(); protected: @@ -118,7 +120,9 @@ private: nsCOMPtr mOutlineStyle; PRInt32 mNameSpace; - nsIFrame* mFrame; + nsFrame* mFrame; + + nsRect mOutlineRect; }; diff --git a/mozilla/layout/html/forms/src/nsButtonFrameRenderer.cpp b/mozilla/layout/html/forms/src/nsButtonFrameRenderer.cpp index 446c8b87f75..a5d39c7430c 100644 --- a/mozilla/layout/html/forms/src/nsButtonFrameRenderer.cpp +++ b/mozilla/layout/html/forms/src/nsButtonFrameRenderer.cpp @@ -27,12 +27,17 @@ nsButtonFrameRenderer::SetNameSpace(PRInt32 aNameSpace) } void -nsButtonFrameRenderer::SetFrame(nsIFrame* aFrame, nsIPresContext& aPresContext) +nsButtonFrameRenderer::SetFrame(nsFrame* aFrame, nsIPresContext& aPresContext) { mFrame = aFrame; ReResolveStyles(aPresContext); } +void +nsButtonFrameRenderer::Redraw() +{ + mFrame->Invalidate(mOutlineRect, PR_TRUE); +} nsString nsButtonFrameRenderer::GetPseudoClassAttribute() @@ -334,8 +339,14 @@ nsButtonFrameRenderer::PaintOutlineAndFocusBorders(nsIPresContext& aPresContext, nsRect rect; - if (NS_FRAME_PAINT_LAYER_BACKGROUND == aWhichLayer) + if (NS_FRAME_PAINT_LAYER_BACKGROUND == aWhichLayer) { + // because we have and outline rect we need to + // store our bounds for redraw. We will change + // these bounds when outline appears + mOutlineRect = rect; + mOutlineRect.width = 0; + mOutlineRect.height= 0; if (mOuterFocusStyle) { // ---------- paint the outer focus border ------------- @@ -360,11 +371,11 @@ nsButtonFrameRenderer::PaintOutlineAndFocusBorders(nsIPresContext& aPresContext, } } - if (NS_FRAME_PAINT_LAYER_FOREGROUND == aWhichLayer) + if (NS_FRAME_PAINT_LAYER_FOREGROUND == aWhichLayer) { - if /*(mOutlineStyle) */ (PR_FALSE) { + if (mOutlineStyle) { - GetButtonOutlineRect(aRect, rect); + GetButtonOutlineRect(aRect, mOutlineRect); const nsStyleSpacing* spacing = (const nsStyleSpacing*)mOutlineStyle ->GetStyleData(eStyleStruct_Spacing); @@ -374,7 +385,7 @@ nsButtonFrameRenderer::PaintOutlineAndFocusBorders(nsIPresContext& aPresContext, aRenderingContext.SetClipRect(rect, nsClipCombine_kReplace, clipEmpty); nsCSSRendering::PaintBorder(aPresContext, aRenderingContext, mFrame, - aDirtyRect, rect, *spacing, mOutlineStyle, 0); + aDirtyRect, mOutlineRect, *spacing, mOutlineStyle, 0); aRenderingContext.PopState(clipEmpty); } @@ -529,10 +540,18 @@ nsButtonFrameRenderer::GetButtonOutlineBorderAndPadding() return borderAndPadding; } +// gets the full size of our border with all the focus borders nsMargin nsButtonFrameRenderer::GetFullButtonBorderAndPadding() { - return GetButtonOuterFocusBorderAndPadding() + GetButtonBorderAndPadding() + GetButtonInnerFocusMargin() + GetButtonInnerFocusBorderAndPadding(); + return GetAddedButtonBorderAndPadding() + GetButtonBorderAndPadding(); +} + +// gets all the focus borders and padding that will be added to the regular border +nsMargin +nsButtonFrameRenderer::GetAddedButtonBorderAndPadding() +{ + return GetButtonOuterFocusBorderAndPadding() + GetButtonInnerFocusMargin() + GetButtonInnerFocusBorderAndPadding(); } void diff --git a/mozilla/layout/html/forms/src/nsButtonFrameRenderer.h b/mozilla/layout/html/forms/src/nsButtonFrameRenderer.h index 2076015711b..2432dd92566 100644 --- a/mozilla/layout/html/forms/src/nsButtonFrameRenderer.h +++ b/mozilla/layout/html/forms/src/nsButtonFrameRenderer.h @@ -65,7 +65,7 @@ public: const nsRect& aRect); virtual void SetNameSpace(PRInt32 aNameSpace); - virtual void SetFrame(nsIFrame* aFrame, nsIPresContext& aPresContext); + virtual void SetFrame(nsFrame* aFrame, nsIPresContext& aPresContext); virtual void SetActive(PRBool aActive, PRBool notify); virtual void SetHover(PRBool aHover, PRBool notify); @@ -82,12 +82,13 @@ public: virtual void GetButtonRect(const nsRect& aRect, nsRect& aResult); virtual void GetButtonInnerFocusRect(const nsRect& aRect, nsRect& aResult); virtual void GetButtonContentRect(const nsRect& aRect, nsRect& aResult); - virtual nsMargin GetButtonOuterFocusBorderAndPadding(); - virtual nsMargin GetButtonBorderAndPadding(); - virtual nsMargin GetButtonInnerFocusMargin(); - virtual nsMargin GetButtonInnerFocusBorderAndPadding(); - virtual nsMargin GetButtonOutlineBorderAndPadding(); - virtual nsMargin GetFullButtonBorderAndPadding(); + virtual nsMargin GetButtonOuterFocusBorderAndPadding(); + virtual nsMargin GetButtonBorderAndPadding(); + virtual nsMargin GetButtonInnerFocusMargin(); + virtual nsMargin GetButtonInnerFocusBorderAndPadding(); + virtual nsMargin GetButtonOutlineBorderAndPadding(); + virtual nsMargin GetFullButtonBorderAndPadding(); + virtual nsMargin GetAddedButtonBorderAndPadding(); virtual void ReResolveStyles(nsIPresContext& aPresContext); @@ -99,6 +100,7 @@ public: nsHTMLReflowMetrics& aDesiredSize, nsMargin& aBorderPadding); + virtual void Redraw(); protected: @@ -118,7 +120,9 @@ private: nsCOMPtr mOutlineStyle; PRInt32 mNameSpace; - nsIFrame* mFrame; + nsFrame* mFrame; + + nsRect mOutlineRect; }; diff --git a/mozilla/layout/html/style/src/nsCSSFrameConstructor.cpp b/mozilla/layout/html/style/src/nsCSSFrameConstructor.cpp index 1f616fde037..976c0103e25 100644 --- a/mozilla/layout/html/style/src/nsCSSFrameConstructor.cpp +++ b/mozilla/layout/html/style/src/nsCSSFrameConstructor.cpp @@ -70,10 +70,9 @@ NS_NewProgressMeterFrame ( nsIFrame*& aNewFrame ); nsresult NS_NewTitledButtonFrame ( nsIFrame*& aNewFrame ); -/* -#include "nsProgressMeterFrame.h" -#include "nsTitledButtonFrame.h" -*/ +nsresult +NS_NewBoxFrame ( nsIFrame*& aNewFrame ); + #endif //static NS_DEFINE_IID(kIStyleRuleIID, NS_ISTYLE_RULE_IID); @@ -1298,6 +1297,7 @@ nsCSSFrameConstructor::TableIsValidCellContent(nsIPresContext* aPresContext, (nsXULAtoms::treeindentation == tag.get()) || (nsXULAtoms::toolbox == tag.get()) || (nsXULAtoms::toolbar == tag.get()) || + (nsXULAtoms::box == tag.get()) || (nsXULAtoms::progressmeter == tag.get() )) { return PR_TRUE; } @@ -2246,6 +2246,14 @@ nsCSSFrameConstructor::ConstructXULFrame(nsIPresContext* aPresContext, } // End of PROGRESS METER CONSTRUCTION logic + // BOX CONSTRUCTION + else if (aTag == nsXULAtoms::box) { + processChildren = PR_TRUE; + isReplaced = PR_TRUE; + rv = NS_NewBoxFrame(newFrame); + } + // End of BOX CONSTRUCTION logic + // TITLED BUTTON CONSTRUCTION else if (aTag == nsXULAtoms::titledbutton) { processChildren = PR_TRUE; diff --git a/mozilla/layout/xul/base/src/Makefile.in b/mozilla/layout/xul/base/src/Makefile.in index 37d6280944a..2c1fe21952b 100644 --- a/mozilla/layout/xul/base/src/Makefile.in +++ b/mozilla/layout/xul/base/src/Makefile.in @@ -35,7 +35,8 @@ LOCAL_INCLUDES = \ # Note the sophisticated alphabetical ordering :-| CPPSRCS = \ - nsProgressMeterFrame.cpp \ + nsBoxFrame.cpp \ + nsProgressMeterFrame.cpp \ nsTitledButtonFrame.cpp \ nsToolbarFrame.cpp \ nsToolboxFrame.cpp \ diff --git a/mozilla/layout/xul/base/src/makefile.win b/mozilla/layout/xul/base/src/makefile.win index a99e3618ac4..6e207b10db3 100644 --- a/mozilla/layout/xul/base/src/makefile.win +++ b/mozilla/layout/xul/base/src/makefile.win @@ -24,6 +24,7 @@ REQUIRES=xpcom raptor pref DEFINES=-D_IMPL_NS_HTML -DWIN32_LEAN_AND_MEAN CPPSRCS= \ + nsBoxFrame.cpp \ nsProgressMeterFrame.cpp \ nsTitledButtonFrame.cpp \ nsToolboxFrame.cpp \ @@ -34,6 +35,7 @@ CPPSRCS= \ $(NULL) CPP_OBJS= \ + .\$(OBJDIR)\nsBoxFrame.obj \ .\$(OBJDIR)\nsProgressMeterFrame.obj \ .\$(OBJDIR)\nsTitledButtonFrame.obj \ .\$(OBJDIR)\nsToolboxFrame.obj \ diff --git a/mozilla/layout/xul/base/src/nsProgressMeterFrame.cpp b/mozilla/layout/xul/base/src/nsProgressMeterFrame.cpp index d150b759bc3..0ac6076d6a8 100644 --- a/mozilla/layout/xul/base/src/nsProgressMeterFrame.cpp +++ b/mozilla/layout/xul/base/src/nsProgressMeterFrame.cpp @@ -601,10 +601,7 @@ nsProgressMeterFrame :: Reflow ( nsIPresContext& aPresContext, nsHTMLReflowMetrics& aDesiredSize, const nsHTMLReflowState& aReflowState, nsReflowStatus& aStatus) -{ - - ReResolveStyleContext(&aPresContext, mStyleContext, NS_STYLE_HINT_REFLOW, nsnull, nsnull); - +{ if (mUndetermined) gStripeAnimator->AddFrame(this); else diff --git a/mozilla/layout/xul/base/src/nsTitledButtonFrame.cpp b/mozilla/layout/xul/base/src/nsTitledButtonFrame.cpp index ad1f6797835..b105fb5bebc 100644 --- a/mozilla/layout/xul/base/src/nsTitledButtonFrame.cpp +++ b/mozilla/layout/xul/base/src/nsTitledButtonFrame.cpp @@ -193,11 +193,7 @@ nsTitledButtonFrame::AttributeChanged(nsIPresContext* aPresContext, mNeedsLayout = PR_TRUE; UpdateAttributes(*aPresContext); - // redraw - nsRect frameRect; - GetRect(frameRect); - nsRect rect(0,0,frameRect.width, frameRect.height); - Invalidate(rect, PR_TRUE); + mRenderer.Redraw(); return NS_OK; } @@ -800,18 +796,28 @@ nsTitledButtonFrame::GetDesiredSize(nsIPresContext* aPresContext, nsRect minSize(0,0,mMinSize.width, mMinSize.height); + // we need to factory or focus stuff into our computed size. + nscoord computedWidth = aReflowState.computedWidth; + nscoord computedHeight = aReflowState.computedHeight; + + + nsMargin added = mRenderer.GetAddedButtonBorderAndPadding(); + + computedWidth -= (added.left + added.right); + computedHeight -= (added.top + added.bottom); + // if the width is set if (fixedWidthContent) - if (aReflowState.computedWidth >= minSize.width) - aDesiredSize.width = aReflowState.computedWidth; + if (computedWidth >= minSize.width) + aDesiredSize.width = computedWidth; else - aDesiredSize.width = minSize.width; + aDesiredSize.width = minSize.width; // if the height is set if (fixedHeightContent) - if (aReflowState.computedWidth >= minSize.height) - aDesiredSize.height = aReflowState.computedHeight; + if (computedHeight >= minSize.height) + aDesiredSize.height = computedHeight; else aDesiredSize.height = minSize.height; } diff --git a/mozilla/layout/xul/content/src/nsXULAtoms.cpp b/mozilla/layout/xul/content/src/nsXULAtoms.cpp index 93aa0803c17..1518de97727 100644 --- a/mozilla/layout/xul/content/src/nsXULAtoms.cpp +++ b/mozilla/layout/xul/content/src/nsXULAtoms.cpp @@ -48,6 +48,8 @@ nsIAtom* nsXULAtoms::progressmeter; nsIAtom* nsXULAtoms::titledbutton; nsIAtom* nsXULAtoms::mode; +nsIAtom* nsXULAtoms::box; +nsIAtom* nsXULAtoms::flex; nsIAtom* nsXULAtoms::widget; nsIAtom* nsXULAtoms::window; @@ -91,6 +93,8 @@ void nsXULAtoms::AddrefAtoms() { titledbutton = NS_NewAtom("titledbutton"); mode = NS_NewAtom("mode"); + box = NS_NewAtom("box"); + flex = NS_NewAtom("flex"); widget = NS_NewAtom("widget"); window = NS_NewAtom("window"); @@ -124,6 +128,10 @@ void nsXULAtoms::ReleaseAtoms() { NS_RELEASE(progressmeter); NS_RELEASE(mode); + NS_RELEASE(box); + NS_RELEASE(flex); + + NS_RELEASE(widget); NS_RELEASE(window); NS_IF_RELEASE(gNameSpaceManager); diff --git a/mozilla/layout/xul/content/src/nsXULAtoms.h b/mozilla/layout/xul/content/src/nsXULAtoms.h index 31cf0bbc399..ef8e33924b0 100644 --- a/mozilla/layout/xul/content/src/nsXULAtoms.h +++ b/mozilla/layout/xul/content/src/nsXULAtoms.h @@ -66,6 +66,9 @@ public: static nsIAtom* titledbutton; static nsIAtom* mode; + static nsIAtom* box; + static nsIAtom* flex; + static nsIAtom* widget; static nsIAtom* window; };