From b2197b464de3eb61a522bd3dbf42411874820c2f Mon Sep 17 00:00:00 2001
From: Ting-Yu Lin <tlin@mozilla.com>
Date: Mon, 18 Apr 2016 13:51:36 +0800
Subject: [PATCH] Bug 1264837 Part 5 - Remove nsFlexContainerFrameSuper.
 r=dholbert

MozReview-Commit-ID: 1PejkyMfn0V

--HG--
extra : rebase_source : d8b63bd7f6fb064155eb40fa4b80f14e1f7f852a
---
 layout/generic/nsFlexContainerFrame.cpp | 2 +-
 layout/generic/nsFlexContainerFrame.h   | 8 +++-----
 2 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/layout/generic/nsFlexContainerFrame.cpp b/layout/generic/nsFlexContainerFrame.cpp
index 2d2dcd50236a..fecea291d2b1 100644
--- a/layout/generic/nsFlexContainerFrame.cpp
+++ b/layout/generic/nsFlexContainerFrame.cpp
@@ -2030,7 +2030,7 @@ public:
 
 NS_QUERYFRAME_HEAD(nsFlexContainerFrame)
   NS_QUERYFRAME_ENTRY(nsFlexContainerFrame)
-NS_QUERYFRAME_TAIL_INHERITING(nsFlexContainerFrameSuper)
+NS_QUERYFRAME_TAIL_INHERITING(nsContainerFrame)
 
 NS_IMPL_FRAMEARENA_HELPERS(nsFlexContainerFrame)
 
diff --git a/layout/generic/nsFlexContainerFrame.h b/layout/generic/nsFlexContainerFrame.h
index ee24052c2cf8..12d6ca5f472b 100644
--- a/layout/generic/nsFlexContainerFrame.h
+++ b/layout/generic/nsFlexContainerFrame.h
@@ -20,9 +20,7 @@ class LogicalPoint;
 nsContainerFrame* NS_NewFlexContainerFrame(nsIPresShell* aPresShell,
                                            nsStyleContext* aContext);
 
-typedef nsContainerFrame nsFlexContainerFrameSuper;
-
-class nsFlexContainerFrame : public nsFlexContainerFrameSuper {
+class nsFlexContainerFrame : public nsContainerFrame {
 public:
   NS_DECL_FRAMEARENA_HELPERS
   NS_DECL_QUERYFRAME_TARGET(nsFlexContainerFrame)
@@ -62,8 +60,8 @@ public:
 
 protected:
   // Protected constructor & destructor
-  explicit nsFlexContainerFrame(nsStyleContext* aContext) :
-    nsFlexContainerFrameSuper(aContext)
+  explicit nsFlexContainerFrame(nsStyleContext* aContext)
+    : nsContainerFrame(aContext)
   {}
   virtual ~nsFlexContainerFrame();