Bug 1264837 Part 3 - Remove nsFormControlFrameSuper. r=dholbert
authorTing-Yu Lin <tlin@mozilla.com>
Mon, 18 Apr 2016 13:42:26 +0800
changeset 331561 7fd8b1e1be1494b652f8345add87ab7cb789dfee
parent 331560 c857149cf48ad6dee35cc972cbaad29e48ab86ad
child 331562 02d2f37a90ccdaa228dce857803a4cf3c04b2f2b
push id6048
push userkmoir@mozilla.com
push dateMon, 06 Jun 2016 19:02:08 +0000
treeherdermozilla-beta@46d72a56c57d [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersdholbert
bugs1264837
milestone48.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 1264837 Part 3 - Remove nsFormControlFrameSuper. r=dholbert MozReview-Commit-ID: 4JTfaUgsVoA
layout/forms/nsFormControlFrame.cpp
layout/forms/nsFormControlFrame.h
--- a/layout/forms/nsFormControlFrame.cpp
+++ b/layout/forms/nsFormControlFrame.cpp
@@ -12,42 +12,42 @@
 #include "mozilla/LookAndFeel.h"
 #include "nsDeviceContext.h"
 #include "nsIContent.h"
 
 using namespace mozilla;
 
 //#define FCF_NOISY
 
-nsFormControlFrame::nsFormControlFrame(nsStyleContext* aContext) :
-  nsFormControlFrameSuper(aContext)
+nsFormControlFrame::nsFormControlFrame(nsStyleContext* aContext)
+  : nsAtomicContainerFrame(aContext)
 {
 }
 
 nsFormControlFrame::~nsFormControlFrame()
 {
 }
 
 nsIAtom*
 nsFormControlFrame::GetType() const
 {
-  return nsGkAtoms::formControlFrame; 
+  return nsGkAtoms::formControlFrame;
 }
 
 void
 nsFormControlFrame::DestroyFrom(nsIFrame* aDestructRoot)
 {
   // Unregister the access key registered in reflow
   nsFormControlFrame::RegUnRegAccessKey(static_cast<nsIFrame*>(this), false);
-  nsFormControlFrameSuper::DestroyFrom(aDestructRoot);
+  nsAtomicContainerFrame::DestroyFrom(aDestructRoot);
 }
 
 NS_QUERYFRAME_HEAD(nsFormControlFrame)
   NS_QUERYFRAME_ENTRY(nsIFormControlFrame)
-NS_QUERYFRAME_TAIL_INHERITING(nsFormControlFrameSuper)
+NS_QUERYFRAME_TAIL_INHERITING(nsAtomicContainerFrame)
 
 /* virtual */ nscoord
 nsFormControlFrame::GetMinISize(nsRenderingContext *aRenderingContext)
 {
   nscoord result;
   DISPLAY_MIN_WIDTH(this, result);
   result = GetIntrinsicISize();
   return result;
--- a/layout/forms/nsFormControlFrame.h
+++ b/layout/forms/nsFormControlFrame.h
@@ -6,39 +6,37 @@
 #ifndef nsFormControlFrame_h___
 #define nsFormControlFrame_h___
 
 #include "mozilla/Attributes.h"
 #include "nsIFormControlFrame.h"
 #include "nsAtomicContainerFrame.h"
 #include "nsDisplayList.h"
 
-typedef nsAtomicContainerFrame nsFormControlFrameSuper;
-
-/** 
+/**
  * nsFormControlFrame is the base class for radio buttons and
  * checkboxes.  It also has two static methods (RegUnRegAccessKey and
  * GetScreenHeight) that are used by other form controls.
  */
-class nsFormControlFrame : public nsFormControlFrameSuper,
+class nsFormControlFrame : public nsAtomicContainerFrame,
                            public nsIFormControlFrame
 {
 public:
   /**
     * Main constructor
     * @param aContent the content representing this frame
     * @param aParentFrame the parent frame
     */
   explicit nsFormControlFrame(nsStyleContext*);
 
   virtual nsIAtom* GetType() const override;
 
   virtual bool IsFrameOfType(uint32_t aFlags) const override
   {
-    return nsFormControlFrameSuper::IsFrameOfType(aFlags &
+    return nsAtomicContainerFrame::IsFrameOfType(aFlags &
       ~(nsIFrame::eReplaced | nsIFrame::eReplacedContainsBlock));
   }
 
   NS_DECL_QUERYFRAME
   NS_DECL_ABSTRACT_FRAME(nsFormControlFrame)
 
   // nsIFrame replacements
   virtual void BuildDisplayList(nsDisplayListBuilder*   aBuilder,
@@ -63,21 +61,21 @@ public:
                   mozilla::WritingMode aWritingMode,
                   const mozilla::LogicalSize& aCBSize,
                   nscoord aAvailableISize,
                   const mozilla::LogicalSize& aMargin,
                   const mozilla::LogicalSize& aBorder,
                   const mozilla::LogicalSize& aPadding,
                   bool aShrinkWrap) override;
 
-  /** 
+  /**
     * Respond to a gui event
     * @see nsIFrame::HandleEvent
     */
-  virtual nsresult HandleEvent(nsPresContext* aPresContext, 
+  virtual nsresult HandleEvent(nsPresContext* aPresContext,
                                mozilla::WidgetGUIEvent* aEvent,
                                nsEventStatus* aEventStatus) override;
 
   virtual nscoord GetLogicalBaseline(mozilla::WritingMode aWritingMode)
     const override;
 
   /**
     * Respond to the request to resize and/or reflow
@@ -112,17 +110,17 @@ protected:
 
   nscoord GetIntrinsicISize();
   nscoord GetIntrinsicBSize();
 
 //
 //-------------------------------------------------------------------------------------
 //  Utility methods for managing checkboxes and radiobuttons
 //-------------------------------------------------------------------------------------
-//   
+//
    /**
     * Get the state of the checked attribute.
     * @param aState set to true if the checked attribute is set,
     * false if the checked attribute has been removed
     */
 
   void GetCurrentCheckState(bool* aState);
 };