Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-10-08 19:04:45 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Backing out Bernd's checkin for bug 110596 to fix crashes / weird display. b=118991 r=bernd

Browse Source
This commit is contained in:
dbaron%fas.harvard.edu 2002-01-09 19:17:46 +00:00
parent 39c50d6e53
commit 5d88648182
37 changed files with 7 additions and 232 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
content/shared/public/nsLayoutAtomList.h
View File

@ -103,23 +103,13 @@ LAYOUT_ATOM(blockFrame, "BlockFrame")
LAYOUT_ATOM(boxFrame, "BoxFrame")
LAYOUT_ATOM(brFrame, "BRFrame")
LAYOUT_ATOM(bulletFrame, "BulletFrame")
LAYOUT_ATOM(comboBoxFrame, "ComboBoxFrame")
LAYOUT_ATOM(fieldSetFrame, "FieldSetFrame")
LAYOUT_ATOM(fileControlFrame, "FileControlFrame")
LAYOUT_ATOM(formControlFrame, "FormControlFrame")
LAYOUT_ATOM(gfxButtonControlFrame, "gfxButtonControlFrame")
LAYOUT_ATOM(gfxCheckBoxFrame, "gfxCheckBoxFrame")
LAYOUT_ATOM(gfxRadioControlFrame, "gfxRadioControlFrame")
LAYOUT_ATOM(hrFrame, "HRFrame")
LAYOUT_ATOM(htmlButtonFrame, "htmlButtonFrame")
LAYOUT_ATOM(htmlFrameInnerFrame, "htmlFrameInnerFrame")
LAYOUT_ATOM(htmlFrameOuterFrame, "htmlFrameOuterFrame")
LAYOUT_ATOM(imageFrame, "ImageFrame")
LAYOUT_ATOM(imageControlFrame, "ImageControlFrame")
LAYOUT_ATOM(inlineFrame, "InlineFrame")
LAYOUT_ATOM(isIndexFrame, "IsIndexFrame")
LAYOUT_ATOM(labelFrame, "LabelFrame")
LAYOUT_ATOM(legendFrame, "LegendFrame")
LAYOUT_ATOM(letterFrame, "LetterFrame")
LAYOUT_ATOM(lineFrame, "LineFrame")
LAYOUT_ATOM(listControlFrame,"ListControlFrame")

10
layout/base/nsLayoutAtomList.h
View File

@ -103,23 +103,13 @@ LAYOUT_ATOM(blockFrame, "BlockFrame")
LAYOUT_ATOM(boxFrame, "BoxFrame")
LAYOUT_ATOM(brFrame, "BRFrame")
LAYOUT_ATOM(bulletFrame, "BulletFrame")
LAYOUT_ATOM(comboBoxFrame, "ComboBoxFrame")
LAYOUT_ATOM(fieldSetFrame, "FieldSetFrame")
LAYOUT_ATOM(fileControlFrame, "FileControlFrame")
LAYOUT_ATOM(formControlFrame, "FormControlFrame")
LAYOUT_ATOM(gfxButtonControlFrame, "gfxButtonControlFrame")
LAYOUT_ATOM(gfxCheckBoxFrame, "gfxCheckBoxFrame")
LAYOUT_ATOM(gfxRadioControlFrame, "gfxRadioControlFrame")
LAYOUT_ATOM(hrFrame, "HRFrame")
LAYOUT_ATOM(htmlButtonFrame, "htmlButtonFrame")
LAYOUT_ATOM(htmlFrameInnerFrame, "htmlFrameInnerFrame")
LAYOUT_ATOM(htmlFrameOuterFrame, "htmlFrameOuterFrame")
LAYOUT_ATOM(imageFrame, "ImageFrame")
LAYOUT_ATOM(imageControlFrame, "ImageControlFrame")
LAYOUT_ATOM(inlineFrame, "InlineFrame")
LAYOUT_ATOM(isIndexFrame, "IsIndexFrame")
LAYOUT_ATOM(labelFrame, "LabelFrame")
LAYOUT_ATOM(legendFrame, "LegendFrame")
LAYOUT_ATOM(letterFrame, "LetterFrame")
LAYOUT_ATOM(lineFrame, "LineFrame")
LAYOUT_ATOM(listControlFrame,"ListControlFrame")

11
layout/forms/nsComboboxControlFrame.cpp
View File

@ -46,9 +46,9 @@
#include "nsHTMLIIDs.h"
#include "nsHTMLAtoms.h"
#include "nsHTMLParts.h"
#include "nsLayoutAtoms.h"
#include "nsIFormControl.h"
#include "nsINameSpaceManager.h"
#include "nsLayoutAtoms.h"
#include "nsIDOMElement.h"
#include "nsIListControlFrame.h"
#include "nsIDOMHTMLCollection.h"
@ -1790,14 +1790,7 @@ nsComboboxControlFrame::GetFrameName(nsAString& aResult) const
}
#endif
NS_IMETHODIMP
nsComboboxControlFrame::GetFrameType(nsIAtom** aType) const
{
NS_PRECONDITION(nsnull != aType, "null OUT parameter pointer");
*aType = nsLayoutAtoms::comboBoxFrame;
NS_ADDREF(*aType);
return NS_OK;
}
//----------------------------------------------------------------------
// nsIComboboxControlFrame
//----------------------------------------------------------------------

1
layout/forms/nsComboboxControlFrame.h
View File

@ -131,7 +131,6 @@ public:
#ifdef NS_DEBUG
NS_IMETHOD GetFrameName(nsAString& aResult) const;
#endif
NS_IMETHOD GetFrameType(nsIAtom** aResult) const;
NS_IMETHOD Destroy(nsIPresContext* aPresContext);
NS_IMETHOD FirstChild(nsIPresContext* aPresContext,
nsIAtom* aListName,

11
layout/forms/nsFieldSetFrame.cpp
View File

@ -59,7 +59,6 @@
#include "nsStyleUtil.h"
#include "nsFont.h"
#include "nsCOMPtr.h"
#include "nsLayoutAtoms.h"
class nsLegendFrame;
@ -101,7 +100,6 @@ public:
nsIAtom* aListName,
nsIFrame* aOldFrame,
nsIFrame* aNewFrame);
NS_IMETHOD GetFrameType(nsIAtom** aResult) const;
#ifdef DEBUG
NS_IMETHOD GetFrameName(nsAString& aResult) const {
return MakeFrameName(NS_LITERAL_STRING("FieldSet"), aResult);
@ -673,13 +671,4 @@ nsFieldSetFrame::ReplaceFrame(nsIPresContext* aPresContext,
aNewFrame);
}
NS_IMETHODIMP
nsFieldSetFrame::GetFrameType(nsIAtom** aType) const
{
NS_PRECONDITION(nsnull != aType, "null OUT parameter pointer");
*aType = nsLayoutAtoms::fieldSetFrame;
NS_ADDREF(*aType);
return NS_OK;
}

9
layout/forms/nsFileControlFrame.cpp
View File

@ -568,15 +568,6 @@ nsFileControlFrame::GetFrameName(nsAString& aResult) const
}
#endif
NS_IMETHODIMP
nsFileControlFrame::GetFrameType(nsIAtom** aType) const
{
NS_PRECONDITION(nsnull != aType, "null OUT parameter pointer");
*aType = nsLayoutAtoms::fileControlFrame;
NS_ADDREF(*aType);
return NS_OK;
}
NS_IMETHODIMP
nsFileControlFrame::GetFormContent(nsIContent*& aContent) const
{

2
layout/forms/nsFileControlFrame.h
View File

@ -45,7 +45,6 @@
#include "nsIStatefulFrame.h"
#include "nsCOMPtr.h"
#include "nsIHTMLContent.h"
#include "nsLayoutAtoms.h"
#include "nsGfxTextControlFrame2.h"
#include "nsFormControlHelper.h"
@ -100,7 +99,6 @@ public:
#ifdef NS_DEBUG
NS_IMETHOD GetFrameName(nsAString& aResult) const;
#endif
NS_IMETHOD GetFrameType(nsIAtom** aResult) const;
NS_IMETHOD SetSuggestedSize(nscoord aWidth, nscoord aHeight) { return NS_OK; };
NS_IMETHOD GetFrameForPoint(nsIPresContext* aPresContext, const nsPoint& aPoint, nsFramePaintLayer aWhichLayer, nsIFrame** aFrame);
NS_IMETHOD AttributeChanged(nsIPresContext* aPresContext,

9
layout/forms/nsFormControlFrame.cpp
View File

@ -56,7 +56,6 @@
#include "nsIFormControl.h"
#include "nsIDeviceContext.h"
#include "nsHTMLAtoms.h"
#include "nsLayoutAtoms.h"
#include "nsIButton.h" // remove this when GetCID is pure virtual
#include "nsICheckButton.h" //remove this
#include "nsITextWidget.h" //remove this
@ -777,14 +776,6 @@ nsFormControlFrame::GetValue(nsAString* aResult)
return result;
}
NS_IMETHODIMP
nsFormControlFrame::GetFrameType(nsIAtom** aType) const
{
NS_PRECONDITION(nsnull != aType, "null OUT parameter pointer");
*aType = nsLayoutAtoms::formControlFrame;
NS_ADDREF(*aType);
return NS_OK;
}
NS_METHOD
nsFormControlFrame::HandleEvent(nsIPresContext* aPresContext,

2
layout/forms/nsFormControlFrame.h
View File

@ -159,8 +159,6 @@ public:
NS_IMETHOD GetName(nsAString* aName);
NS_IMETHOD GetValue(nsAString* aName);
NS_IMETHOD GetFrameType(nsIAtom** aResult) const;
/**
* Respond to a enter key being pressed
*/

11
layout/forms/nsGfxCheckboxControlFrame.cpp
View File

@ -54,7 +54,6 @@
#endif
#include "nsIServiceManager.h"
#include "nsIDOMNode.h"
#include "nsLayoutAtoms.h"
//------------------------------------------------------------
@ -123,16 +122,6 @@ NS_IMETHODIMP nsGfxCheckboxControlFrame::GetAccessible(nsIAccessible** aAccessib
}
#endif
NS_IMETHODIMP
nsGfxCheckboxControlFrame::GetFrameType(nsIAtom** aType) const
{
NS_PRECONDITION(nsnull != aType, "null OUT parameter pointer");
*aType = nsLayoutAtoms::gfxCheckBoxFrame;
NS_ADDREF(*aType);
return NS_OK;
}
//--------------------------------------------------------------
NS_IMETHODIMP
nsGfxCheckboxControlFrame::SetCheckboxFaceStyleContext(nsIStyleContext *aCheckboxFaceStyleContext)

1
layout/forms/nsGfxCheckboxControlFrame.h
View File

@ -92,7 +92,6 @@ public:
NS_IMETHOD GetAccessible(nsIAccessible** aAccessible);
#endif
NS_IMETHOD GetFrameType(nsIAtom** aResult) const;
//nsICheckboxControlFrame methods
NS_IMETHOD SetCheckboxFaceStyleContext(nsIStyleContext *aCheckboxFaceStyleContext);

10
layout/forms/nsGfxRadioControlFrame.cpp
View File

@ -54,7 +54,6 @@
#endif
#include "nsIServiceManager.h"
#include "nsIDOMNode.h"
#include "nsLayoutAtoms.h"
nsresult
@ -84,15 +83,6 @@ nsGfxRadioControlFrame::~nsGfxRadioControlFrame()
NS_IF_RELEASE(mRadioButtonFaceStyle);
}
NS_IMETHODIMP
nsGfxRadioControlFrame::GetFrameType(nsIAtom** aType) const
{
NS_PRECONDITION(nsnull != aType, "null OUT parameter pointer");
*aType = nsLayoutAtoms::gfxRadioControlFrame;
NS_ADDREF(*aType);
return NS_OK;
}
// Frames are not refcounted, no need to AddRef
NS_IMETHODIMP
nsGfxRadioControlFrame::QueryInterface(const nsIID& aIID, void** aInstancePtr)

1
layout/forms/nsGfxRadioControlFrame.h
View File

@ -61,7 +61,6 @@ private:
public:
nsGfxRadioControlFrame();
~nsGfxRadioControlFrame();
NS_IMETHOD GetFrameType(nsIAtom** aType) const;
//nsIRadioControlFrame methods
NS_IMETHOD QueryInterface(const nsIID& aIID, void** aInstancePtr);

8
layout/forms/nsHTMLButtonControlFrame.cpp
View File

@ -217,14 +217,6 @@ nsHTMLButtonControlFrame::GetDefaultLabel(nsString& aString)
}
}
NS_IMETHODIMP
nsHTMLButtonControlFrame::GetFrameType(nsIAtom** aType) const
{
NS_PRECONDITION(nsnull != aType, "null OUT parameter pointer");
*aType = nsLayoutAtoms::htmlButtonFrame;
NS_ADDREF(*aType);
return NS_OK;
}
NS_IMETHODIMP
nsHTMLButtonControlFrame::GetType(PRInt32* aType) const

4
layout/forms/nsHTMLButtonControlFrame.h
View File

@ -55,7 +55,6 @@
#include "nsHTMLIIDs.h"
#include "nsISupports.h"
#include "nsHTMLAtoms.h"
#include "nsLayoutAtoms.h"
#include "nsIImage.h"
#include "nsStyleUtil.h"
#include "nsStyleConsts.h"
@ -68,7 +67,6 @@
#include "nsIDocument.h"
#include "nsButtonFrameRenderer.h"
class nsHTMLButtonControlFrame : public nsHTMLContainerFrame,
public nsIFormControlFrame
{
@ -130,7 +128,7 @@ public:
virtual nsresult RequiresWidget(PRBool &aRequiresWidget);
NS_IMETHOD GetFrameType(nsIAtom** aResult) const;
NS_IMETHOD GetType(PRInt32* aType) const;
NS_IMETHOD GetName(nsAString* aName);
NS_IMETHOD GetValue(nsAString* aName);

11
layout/forms/nsIsIndexFrame.cpp
View File

@ -49,7 +49,6 @@
#include "nsIComponentManager.h"
#include "nsIView.h"
#include "nsHTMLParts.h"
#include "nsLayoutAtoms.h"
#include "nsIDOMHTMLInputElement.h"
#include "nsINameSpaceManager.h"
#include "nsCOMPtr.h"
@ -386,16 +385,6 @@ nsIsIndexFrame::GetFrameName(nsAString& aResult) const
}
#endif
NS_IMETHODIMP
nsIsIndexFrame::GetFrameType(nsIAtom** aType) const
{
NS_PRECONDITION(nsnull != aType, "null OUT parameter pointer");
*aType = nsLayoutAtoms::isIndexFrame;
NS_ADDREF(*aType);
return NS_OK;
}
// submission
// much of this is cut and paste from nsFormFrame::OnSubmit
NS_IMETHODIMP

2
layout/forms/nsIsIndexFrame.h
View File

@ -111,8 +111,6 @@ public:
#ifdef NS_DEBUG
NS_IMETHOD GetFrameName(nsAString& aResult) const;
#endif
NS_IMETHOD GetFrameType(nsIAtom** aResult) const;
NS_IMETHOD AttributeChanged(nsIPresContext* aPresContext,
nsIContent* aChild,
PRInt32 aNameSpaceID,

10
layout/forms/nsLegendFrame.cpp
View File

@ -49,7 +49,6 @@
#include "nsHTMLIIDs.h"
#include "nsHTMLParts.h"
#include "nsHTMLAtoms.h"
#include "nsLayoutAtoms.h"
#include "nsIStyleContext.h"
#include "nsStyleConsts.h"
#include "nsStyleUtil.h"
@ -159,12 +158,3 @@ nsLegendFrame::GetFrameName(nsAString& aResult) const
return MakeFrameName(NS_LITERAL_STRING("Legend"), aResult);
}
#endif
NS_IMETHODIMP
nsLegendFrame::GetFrameType(nsIAtom** aType) const
{
NS_PRECONDITION(nsnull != aType, "null OUT parameter pointer");
*aType = nsLayoutAtoms::legendFrame;
NS_ADDREF(*aType);
return NS_OK;
}

1
layout/forms/nsLegendFrame.h
View File

@ -76,7 +76,6 @@ public:
#ifdef NS_DEBUG
NS_IMETHOD GetFrameName(nsAString& aResult) const;
#endif
NS_IMETHOD GetFrameType(nsIAtom** aResult) const;
PRInt32 GetAlign();

11
layout/html/forms/src/nsComboboxControlFrame.cpp
View File

@ -46,9 +46,9 @@
#include "nsHTMLIIDs.h"
#include "nsHTMLAtoms.h"
#include "nsHTMLParts.h"
#include "nsLayoutAtoms.h"
#include "nsIFormControl.h"
#include "nsINameSpaceManager.h"
#include "nsLayoutAtoms.h"
#include "nsIDOMElement.h"
#include "nsIListControlFrame.h"
#include "nsIDOMHTMLCollection.h"
@ -1790,14 +1790,7 @@ nsComboboxControlFrame::GetFrameName(nsAString& aResult) const
}
#endif
NS_IMETHODIMP
nsComboboxControlFrame::GetFrameType(nsIAtom** aType) const
{
NS_PRECONDITION(nsnull != aType, "null OUT parameter pointer");
*aType = nsLayoutAtoms::comboBoxFrame;
NS_ADDREF(*aType);
return NS_OK;
}
//----------------------------------------------------------------------
// nsIComboboxControlFrame
//----------------------------------------------------------------------

1
layout/html/forms/src/nsComboboxControlFrame.h
View File

@ -131,7 +131,6 @@ public:
#ifdef NS_DEBUG
NS_IMETHOD GetFrameName(nsAString& aResult) const;
#endif
NS_IMETHOD GetFrameType(nsIAtom** aResult) const;
NS_IMETHOD Destroy(nsIPresContext* aPresContext);
NS_IMETHOD FirstChild(nsIPresContext* aPresContext,
nsIAtom* aListName,

11
layout/html/forms/src/nsFieldSetFrame.cpp
View File

@ -59,7 +59,6 @@
#include "nsStyleUtil.h"
#include "nsFont.h"
#include "nsCOMPtr.h"
#include "nsLayoutAtoms.h"
class nsLegendFrame;
@ -101,7 +100,6 @@ public:
nsIAtom* aListName,
nsIFrame* aOldFrame,
nsIFrame* aNewFrame);
NS_IMETHOD GetFrameType(nsIAtom** aResult) const;
#ifdef DEBUG
NS_IMETHOD GetFrameName(nsAString& aResult) const {
return MakeFrameName(NS_LITERAL_STRING("FieldSet"), aResult);
@ -673,13 +671,4 @@ nsFieldSetFrame::ReplaceFrame(nsIPresContext* aPresContext,
aNewFrame);
}
NS_IMETHODIMP
nsFieldSetFrame::GetFrameType(nsIAtom** aType) const
{
NS_PRECONDITION(nsnull != aType, "null OUT parameter pointer");
*aType = nsLayoutAtoms::fieldSetFrame;
NS_ADDREF(*aType);
return NS_OK;
}

9
layout/html/forms/src/nsFileControlFrame.cpp
View File

@ -568,15 +568,6 @@ nsFileControlFrame::GetFrameName(nsAString& aResult) const
}
#endif
NS_IMETHODIMP
nsFileControlFrame::GetFrameType(nsIAtom** aType) const
{
NS_PRECONDITION(nsnull != aType, "null OUT parameter pointer");
*aType = nsLayoutAtoms::fileControlFrame;
NS_ADDREF(*aType);
return NS_OK;
}
NS_IMETHODIMP
nsFileControlFrame::GetFormContent(nsIContent*& aContent) const
{

2
layout/html/forms/src/nsFileControlFrame.h
View File

@ -45,7 +45,6 @@
#include "nsIStatefulFrame.h"
#include "nsCOMPtr.h"
#include "nsIHTMLContent.h"
#include "nsLayoutAtoms.h"
#include "nsGfxTextControlFrame2.h"
#include "nsFormControlHelper.h"
@ -100,7 +99,6 @@ public:
#ifdef NS_DEBUG
NS_IMETHOD GetFrameName(nsAString& aResult) const;
#endif
NS_IMETHOD GetFrameType(nsIAtom** aResult) const;
NS_IMETHOD SetSuggestedSize(nscoord aWidth, nscoord aHeight) { return NS_OK; };
NS_IMETHOD GetFrameForPoint(nsIPresContext* aPresContext, const nsPoint& aPoint, nsFramePaintLayer aWhichLayer, nsIFrame** aFrame);
NS_IMETHOD AttributeChanged(nsIPresContext* aPresContext,

9
layout/html/forms/src/nsFormControlFrame.cpp
View File

@ -56,7 +56,6 @@
#include "nsIFormControl.h"
#include "nsIDeviceContext.h"
#include "nsHTMLAtoms.h"
#include "nsLayoutAtoms.h"
#include "nsIButton.h" // remove this when GetCID is pure virtual
#include "nsICheckButton.h" //remove this
#include "nsITextWidget.h" //remove this
@ -777,14 +776,6 @@ nsFormControlFrame::GetValue(nsAString* aResult)
return result;
}
NS_IMETHODIMP
nsFormControlFrame::GetFrameType(nsIAtom** aType) const
{
NS_PRECONDITION(nsnull != aType, "null OUT parameter pointer");
*aType = nsLayoutAtoms::formControlFrame;
NS_ADDREF(*aType);
return NS_OK;
}
NS_METHOD
nsFormControlFrame::HandleEvent(nsIPresContext* aPresContext,

2
layout/html/forms/src/nsFormControlFrame.h
View File

@ -159,8 +159,6 @@ public:
NS_IMETHOD GetName(nsAString* aName);
NS_IMETHOD GetValue(nsAString* aName);
NS_IMETHOD GetFrameType(nsIAtom** aResult) const;
/**
* Respond to a enter key being pressed
*/

11
layout/html/forms/src/nsGfxCheckboxControlFrame.cpp
View File

@ -54,7 +54,6 @@
#endif
#include "nsIServiceManager.h"
#include "nsIDOMNode.h"
#include "nsLayoutAtoms.h"
//------------------------------------------------------------
@ -123,16 +122,6 @@ NS_IMETHODIMP nsGfxCheckboxControlFrame::GetAccessible(nsIAccessible** aAccessib
}
#endif
NS_IMETHODIMP
nsGfxCheckboxControlFrame::GetFrameType(nsIAtom** aType) const
{
NS_PRECONDITION(nsnull != aType, "null OUT parameter pointer");
*aType = nsLayoutAtoms::gfxCheckBoxFrame;
NS_ADDREF(*aType);
return NS_OK;
}
//--------------------------------------------------------------
NS_IMETHODIMP
nsGfxCheckboxControlFrame::SetCheckboxFaceStyleContext(nsIStyleContext *aCheckboxFaceStyleContext)

1
layout/html/forms/src/nsGfxCheckboxControlFrame.h
View File

@ -92,7 +92,6 @@ public:
NS_IMETHOD GetAccessible(nsIAccessible** aAccessible);
#endif
NS_IMETHOD GetFrameType(nsIAtom** aResult) const;
//nsICheckboxControlFrame methods
NS_IMETHOD SetCheckboxFaceStyleContext(nsIStyleContext *aCheckboxFaceStyleContext);

10
layout/html/forms/src/nsGfxRadioControlFrame.cpp
View File

@ -54,7 +54,6 @@
#endif
#include "nsIServiceManager.h"
#include "nsIDOMNode.h"
#include "nsLayoutAtoms.h"
nsresult
@ -84,15 +83,6 @@ nsGfxRadioControlFrame::~nsGfxRadioControlFrame()
NS_IF_RELEASE(mRadioButtonFaceStyle);
}
NS_IMETHODIMP
nsGfxRadioControlFrame::GetFrameType(nsIAtom** aType) const
{
NS_PRECONDITION(nsnull != aType, "null OUT parameter pointer");
*aType = nsLayoutAtoms::gfxRadioControlFrame;
NS_ADDREF(*aType);
return NS_OK;
}
// Frames are not refcounted, no need to AddRef
NS_IMETHODIMP
nsGfxRadioControlFrame::QueryInterface(const nsIID& aIID, void** aInstancePtr)

1
layout/html/forms/src/nsGfxRadioControlFrame.h
View File

@ -61,7 +61,6 @@ private:
public:
nsGfxRadioControlFrame();
~nsGfxRadioControlFrame();
NS_IMETHOD GetFrameType(nsIAtom** aType) const;
//nsIRadioControlFrame methods
NS_IMETHOD QueryInterface(const nsIID& aIID, void** aInstancePtr);

8
layout/html/forms/src/nsHTMLButtonControlFrame.cpp
View File

@ -217,14 +217,6 @@ nsHTMLButtonControlFrame::GetDefaultLabel(nsString& aString)
}
}
NS_IMETHODIMP
nsHTMLButtonControlFrame::GetFrameType(nsIAtom** aType) const
{
NS_PRECONDITION(nsnull != aType, "null OUT parameter pointer");
*aType = nsLayoutAtoms::htmlButtonFrame;
NS_ADDREF(*aType);
return NS_OK;
}
NS_IMETHODIMP
nsHTMLButtonControlFrame::GetType(PRInt32* aType) const

4
layout/html/forms/src/nsHTMLButtonControlFrame.h
View File

@ -55,7 +55,6 @@
#include "nsHTMLIIDs.h"
#include "nsISupports.h"
#include "nsHTMLAtoms.h"
#include "nsLayoutAtoms.h"
#include "nsIImage.h"
#include "nsStyleUtil.h"
#include "nsStyleConsts.h"
@ -68,7 +67,6 @@
#include "nsIDocument.h"
#include "nsButtonFrameRenderer.h"
class nsHTMLButtonControlFrame : public nsHTMLContainerFrame,
public nsIFormControlFrame
{
@ -130,7 +128,7 @@ public:
virtual nsresult RequiresWidget(PRBool &aRequiresWidget);
NS_IMETHOD GetFrameType(nsIAtom** aResult) const;
NS_IMETHOD GetType(PRInt32* aType) const;
NS_IMETHOD GetName(nsAString* aName);
NS_IMETHOD GetValue(nsAString* aName);

11
layout/html/forms/src/nsIsIndexFrame.cpp
View File

@ -49,7 +49,6 @@
#include "nsIComponentManager.h"
#include "nsIView.h"
#include "nsHTMLParts.h"
#include "nsLayoutAtoms.h"
#include "nsIDOMHTMLInputElement.h"
#include "nsINameSpaceManager.h"
#include "nsCOMPtr.h"
@ -386,16 +385,6 @@ nsIsIndexFrame::GetFrameName(nsAString& aResult) const
}
#endif
NS_IMETHODIMP
nsIsIndexFrame::GetFrameType(nsIAtom** aType) const
{
NS_PRECONDITION(nsnull != aType, "null OUT parameter pointer");
*aType = nsLayoutAtoms::isIndexFrame;
NS_ADDREF(*aType);
return NS_OK;
}
// submission
// much of this is cut and paste from nsFormFrame::OnSubmit
NS_IMETHODIMP

2
layout/html/forms/src/nsIsIndexFrame.h
View File

@ -111,8 +111,6 @@ public:
#ifdef NS_DEBUG
NS_IMETHOD GetFrameName(nsAString& aResult) const;
#endif
NS_IMETHOD GetFrameType(nsIAtom** aResult) const;
NS_IMETHOD AttributeChanged(nsIPresContext* aPresContext,
nsIContent* aChild,
PRInt32 aNameSpaceID,

11
layout/html/forms/src/nsLabelFrame.cpp
View File

@ -39,7 +39,6 @@
#include "nsIPresShell.h"
#include "nsFormControlFrame.h"
#include "nsIDOMHTMLAnchorElement.h"
#include "nsLayoutAtoms.h"
typedef nsInlineFrame nsLabelFrameSuper;
@ -66,7 +65,7 @@ public:
return MakeFrameName(NS_LITERAL_STRING("Label"), aResult);
}
#endif
NS_IMETHOD GetFrameType(nsIAtom** aResult) const;
};
nsresult
@ -171,11 +170,3 @@ nsLabelFrame::GetFrameForPoint(nsIPresContext* aPresContext,
return rv;
}
NS_IMETHODIMP
nsLabelFrame::GetFrameType(nsIAtom** aType) const
{
NS_PRECONDITION(nsnull != aType, "null OUT parameter pointer");
*aType = nsLayoutAtoms::labelFrame;
NS_ADDREF(*aType);
return NS_OK;
}

10
layout/html/forms/src/nsLegendFrame.cpp
View File

@ -49,7 +49,6 @@
#include "nsHTMLIIDs.h"
#include "nsHTMLParts.h"
#include "nsHTMLAtoms.h"
#include "nsLayoutAtoms.h"
#include "nsIStyleContext.h"
#include "nsStyleConsts.h"
#include "nsStyleUtil.h"
@ -159,12 +158,3 @@ nsLegendFrame::GetFrameName(nsAString& aResult) const
return MakeFrameName(NS_LITERAL_STRING("Legend"), aResult);
}
#endif
NS_IMETHODIMP
nsLegendFrame::GetFrameType(nsIAtom** aType) const
{
NS_PRECONDITION(nsnull != aType, "null OUT parameter pointer");
*aType = nsLayoutAtoms::legendFrame;
NS_ADDREF(*aType);
return NS_OK;
}

1
layout/html/forms/src/nsLegendFrame.h
View File

@ -76,7 +76,6 @@ public:
#ifdef NS_DEBUG
NS_IMETHOD GetFrameName(nsAString& aResult) const;
#endif
NS_IMETHOD GetFrameType(nsIAtom** aResult) const;
PRInt32 GetAlign();