Bug 838703 - Various nsFileControlFrame cleanup. r=bz

layout/forms/nsFileControlFrame.cpp

@@ -52,9 +52,6 @@
 
 using namespace mozilla;
 
-#define SYNC_TEXT 0x1
-#define SYNC_BUTTON 0x2
-
 nsIFrame*
 NS_NewFileControlFrame(nsIPresShell* aPresShell, nsStyleContext* aContext)
 {
@@ -63,8 +60,8 @@ NS_NewFileControlFrame(nsIPresShell* aPresShell, nsStyleContext* aContext)
 
 NS_IMPL_FRAMEARENA_HELPERS(nsFileControlFrame)
 
-nsFileControlFrame::nsFileControlFrame(nsStyleContext* aContext):
-  nsBlockFrame(aContext)
+nsFileControlFrame::nsFileControlFrame(nsStyleContext* aContext)
+  : nsBlockFrame(aContext)
 {
   AddStateBits(NS_BLOCK_FLOAT_MGR);
 }
@@ -85,7 +82,7 @@ nsFileControlFrame::DestroyFrom(nsIFrame* aDestructRoot)
 {
   ENSURE_TRUE(mContent);
 
-  // Remove the drag events
+  // Remove the events.
   if (mContent) {
     mContent->RemoveSystemEventListener(NS_LITERAL_STRING("drop"),
                                         mMouseListener, false);
@@ -306,12 +303,6 @@ nsFileControlFrame::ContentStatesChanged(nsEventStates aStates)
   }
 }
 
-bool
-nsFileControlFrame::IsLeaf() const
-{
-  return true;
-}
-
 #ifdef DEBUG
 NS_IMETHODIMP
 nsFileControlFrame::GetFrameName(nsAString& aResult) const

layout/forms/nsFileControlFrame.h

@@ -51,9 +51,10 @@ public:
                               nsIAtom*        aAttribute,
                               int32_t         aModType) MOZ_OVERRIDE;
   virtual void ContentStatesChanged(nsEventStates aStates);
-  virtual bool IsLeaf() const;
-
-
+  virtual bool IsLeaf() const
+  {
+    return true;
+  }
 
   // nsIAnonymousContentCreator
   virtual nsresult CreateAnonymousContent(nsTArray<ContentInfo>& aElements) MOZ_OVERRIDE;
@@ -154,6 +155,4 @@ protected:
   void UpdateDisplayedValue(const nsAString& aValue, bool aNotify);
 };
 
-#endif
-
-
+#endif // nsFileControlFrame_h___