Bug 519875: Rename SpacerFrame::GetType method to GetSpacerType so that it won't hide inherited method nsFrame::GetType. r=dbaron

layout/generic/nsSpacerFrame.cpp

@@ -65,7 +65,7 @@ public:
                     const nsHTMLReflowState& aReflowState,
                     nsReflowStatus&          aStatus);
 
-  PRUint8 GetType();
+  PRUint8 GetSpacerType();
 
 protected:
   SpacerFrame(nsStyleContext* aContext) : nsFrame(aContext) {}
@@ -126,7 +126,7 @@ SpacerFrame::Reflow(nsPresContext*          aPresContext,
   if (percentBase.height == NS_UNCONSTRAINEDSIZE)
     percentBase.height = 0;
 
-  if (GetType() == TYPE_LINE)
+  if (GetSpacerType() == TYPE_LINE)
     aStatus = NS_INLINE_LINE_BREAK_AFTER(NS_FRAME_COMPLETE);
 
   GetDesiredSize(aMetrics, percentBase);
@@ -150,7 +150,7 @@ SpacerFrame::GetDesiredSize(nsHTMLReflowMetrics& aMetrics, nsSize aPercentBase)
 
   const nsStylePosition* position = GetStylePosition();
 
-  PRUint8 type = GetType();
+  PRUint8 type = GetSpacerType();
   switch (type) {
   case TYPE_WORD:
     break;
@@ -194,7 +194,7 @@ SpacerFrame::GetDesiredSize(nsHTMLReflowMetrics& aMetrics, nsSize aPercentBase)
 }
 
 PRUint8
-SpacerFrame::GetType()
+SpacerFrame::GetSpacerType()
 {
   PRUint8 type = TYPE_WORD;
   static nsIContent::AttrValuesArray strings[] =