Bug 1264837 Part 1 - Remove nsTextBoxFrameSuper.
MozReview-Commit-ID: DFQ77kfvhrB
--- a/layout/xul/nsTextBoxFrame.cpp
+++ b/layout/xul/nsTextBoxFrame.cpp
@@ -63,17 +63,17 @@ NS_NewTextBoxFrame (nsIPresShell* aPresS
{
return new (aPresShell) nsTextBoxFrame(aContext);
}
NS_IMPL_FRAMEARENA_HELPERS(nsTextBoxFrame)
NS_QUERYFRAME_HEAD(nsTextBoxFrame)
NS_QUERYFRAME_ENTRY(nsTextBoxFrame)
-NS_QUERYFRAME_TAIL_INHERITING(nsTextBoxFrameSuper)
+NS_QUERYFRAME_TAIL_INHERITING(nsLeafBoxFrame)
nsresult
nsTextBoxFrame::AttributeChanged(int32_t aNameSpaceID,
nsIAtom* aAttribute,
int32_t aModType)
{
bool aResize;
bool aRedraw;
@@ -110,32 +110,32 @@ nsTextBoxFrame::~nsTextBoxFrame()
}
void
nsTextBoxFrame::Init(nsIContent* aContent,
nsContainerFrame* aParent,
nsIFrame* aPrevInFlow)
{
- nsTextBoxFrameSuper::Init(aContent, aParent, aPrevInFlow);
+ nsLeafBoxFrame::Init(aContent, aParent, aPrevInFlow);
bool aResize;
bool aRedraw;
UpdateAttributes(nullptr, aResize, aRedraw); /* update all */
// register access key
RegUnregAccessKey(true);
}
void
nsTextBoxFrame::DestroyFrom(nsIFrame* aDestructRoot)
{
// unregister access key
RegUnregAccessKey(false);
- nsTextBoxFrameSuper::DestroyFrom(aDestructRoot);
+ nsLeafBoxFrame::DestroyFrom(aDestructRoot);
}
bool
nsTextBoxFrame::AlwaysAppendAccessKey()
{
if (!gAccessKeyPrefInitialized)
{
gAccessKeyPrefInitialized = true;
@@ -1016,17 +1016,17 @@ nsTextBoxFrame::ComputesOwnOverflowArea(
{
return true;
}
/* virtual */ void
nsTextBoxFrame::MarkIntrinsicISizesDirty()
{
mNeedsRecalc = true;
- nsTextBoxFrameSuper::MarkIntrinsicISizesDirty();
+ nsLeafBoxFrame::MarkIntrinsicISizesDirty();
}
void
nsTextBoxFrame::GetTextSize(nsRenderingContext& aRenderingContext,
const nsString& aString,
nsSize& aSize, nscoord& aAscent)
{
RefPtr<nsFontMetrics> fontMet =
--- a/layout/xul/nsTextBoxFrame.h
+++ b/layout/xul/nsTextBoxFrame.h
@@ -7,18 +7,17 @@
#include "mozilla/Attributes.h"
#include "nsLeafBoxFrame.h"
class nsAccessKeyInfo;
class nsAsyncAccesskeyUpdate;
class nsFontMetrics;
-typedef nsLeafBoxFrame nsTextBoxFrameSuper;
-class nsTextBoxFrame : public nsTextBoxFrameSuper
+class nsTextBoxFrame : public nsLeafBoxFrame
{
public:
NS_DECL_QUERYFRAME_TARGET(nsTextBoxFrame)
NS_DECL_QUERYFRAME
NS_DECL_FRAMEARENA_HELPERS
virtual nsSize GetPrefSize(nsBoxLayoutState& aBoxLayoutState) override;
virtual nsSize GetMinSize(nsBoxLayoutState& aBoxLayoutState) override;