Bug 1264837 Part 9 - Remove nsRubyBaseFrameSuper. r=dholbert

MozReview-Commit-ID: 5o0wQcUX9uU

--HG--
extra : rebase_source : 08360a028089e74c85e258e042069c79ddb76df0

layout/generic/nsRubyBaseFrame.cpp

@@ -22,7 +22,7 @@ using namespace mozilla;
 
 NS_QUERYFRAME_HEAD(nsRubyBaseFrame)
   NS_QUERYFRAME_ENTRY(nsRubyBaseFrame)
-NS_QUERYFRAME_TAIL_INHERITING(nsRubyBaseFrameSuper)
+NS_QUERYFRAME_TAIL_INHERITING(nsRubyContentFrame)
 
 NS_IMPL_FRAMEARENA_HELPERS(nsRubyBaseFrame)
 

layout/generic/nsRubyBaseFrame.h

@@ -11,8 +11,6 @@
 
 #include "nsRubyContentFrame.h"
 
-typedef nsRubyContentFrame nsRubyBaseFrameSuper;
-
 /**
  * Factory function.
  * @return a newly allocated nsRubyBaseFrame (infallible)
@@ -20,7 +18,7 @@ typedef nsRubyContentFrame nsRubyBaseFrameSuper;
 nsContainerFrame* NS_NewRubyBaseFrame(nsIPresShell* aPresShell,
                                       nsStyleContext* aContext);
 
-class nsRubyBaseFrame final : public nsRubyBaseFrameSuper
+class nsRubyBaseFrame final : public nsRubyContentFrame
 {
 public:
   NS_DECL_FRAMEARENA_HELPERS
@@ -38,7 +36,7 @@ protected:
   friend nsContainerFrame* NS_NewRubyBaseFrame(nsIPresShell* aPresShell,
                                                nsStyleContext* aContext);
   explicit nsRubyBaseFrame(nsStyleContext* aContext)
-    : nsRubyBaseFrameSuper(aContext) {}
+    : nsRubyContentFrame(aContext) {}
 };
 
 #endif /* nsRubyBaseFrame_h___ */