Bug 1053986 - Rename nsIFrame::GetDebug to GetXULDebug. r?dholbert draft
authorL. David Baron <dbaron@dbaron.org>
Wed, 20 Apr 2016 12:16:58 -0700
changeset 354392 ac9e7d45a1106d2fab6cf41d8fd2fb3a60141c4a
parent 354391 ddb91423388dca4d0e256e31dd36e57fc7d1426a
child 354393 35b631dce51ab4beb835246656ba2113bbfe9e98
push id16058
push userdbaron@mozilla.com
push dateWed, 20 Apr 2016 19:17:15 +0000
reviewersdholbert
bugs1053986
milestone48.0a1
Bug 1053986 - Rename nsIFrame::GetDebug to GetXULDebug. r?dholbert Written purely with sed, over .h and .cpp files in layout/. MozReview-Commit-ID: F88H1QCPSS7
layout/generic/nsIFrame.h
layout/xul/nsBox.cpp
layout/xul/nsBox.h
layout/xul/nsBoxFrame.cpp
layout/xul/nsBoxFrame.h
--- a/layout/generic/nsIFrame.h
+++ b/layout/generic/nsIFrame.h
@@ -2927,17 +2927,17 @@ public:
   bool IsXULHorizontal() const { return (mState & NS_STATE_IS_HORIZONTAL) != 0; }
   bool IsXULNormalDirection() const { return (mState & NS_STATE_IS_DIRECTION_NORMAL) != 0; }
 
   nsresult XULRedraw(nsBoxLayoutState& aState);
   virtual nsresult XULRelayoutChildAtOrdinal(nsIFrame* aChild)=0;
 
 #ifdef DEBUG_LAYOUT
   virtual nsresult SetXULDebug(nsBoxLayoutState& aState, bool aDebug)=0;
-  virtual nsresult GetDebug(bool& aDebug)=0;
+  virtual nsresult GetXULDebug(bool& aDebug)=0;
 
   virtual nsresult DumpBox(FILE* out)=0;
 #endif
 
   /**
    * @return true if this text frame ends with a newline character.  It
    * should return false if this is not a text frame.
    */
--- a/layout/xul/nsBox.cpp
+++ b/layout/xul/nsBox.cpp
@@ -976,15 +976,15 @@ nsBox::GetDebugBoxAt( const nsPoint& aPo
     return NS_OK;
   }
 
   return NS_ERROR_FAILURE;
 }
 
 
 nsresult
-nsBox::GetDebug(bool& aDebug)
+nsBox::GetXULDebug(bool& aDebug)
 {
   aDebug = false;
   return NS_OK;
 }
 
 #endif
--- a/layout/xul/nsBox.h
+++ b/layout/xul/nsBox.h
@@ -38,17 +38,17 @@ public:
 
   virtual Valignment GetXULVAlign() const override { return vAlign_Top; }
   virtual Halignment GetXULHAlign() const override { return hAlign_Left; }
 
   virtual nsresult XULRelayoutChildAtOrdinal(nsIFrame* aChild) override;
 
 #ifdef DEBUG_LAYOUT
   NS_IMETHOD GetDebugBoxAt(const nsPoint& aPoint, nsIFrame** aBox);
-  virtual nsresult GetDebug(bool& aDebug) override;
+  virtual nsresult GetXULDebug(bool& aDebug) override;
   virtual nsresult SetXULDebug(nsBoxLayoutState& aState, bool aDebug) override;
 
   virtual nsresult DumpBox(FILE* out) override;
   void PropagateDebug(nsBoxLayoutState& aState);
 #endif
 
   nsBox();
   virtual ~nsBox();
--- a/layout/xul/nsBoxFrame.cpp
+++ b/layout/xul/nsBoxFrame.cpp
@@ -1534,17 +1534,17 @@ nsBoxFrame::GetFrameName(nsAString& aRes
 nsIAtom*
 nsBoxFrame::GetType() const
 {
   return nsGkAtoms::boxFrame;
 }
 
 #ifdef DEBUG_LAYOUT
 nsresult
-nsBoxFrame::GetDebug(bool& aDebug)
+nsBoxFrame::GetXULDebug(bool& aDebug)
 {
   aDebug = (mState & NS_STATE_CURRENTLY_IN_DEBUG);
   return NS_OK;
 }
 #endif
 
 // REVIEW: nsBoxFrame::GetFrameForPoint is a problem because of 'mousethrough'
 // attribute support. Here's how it works:
--- a/layout/xul/nsBoxFrame.h
+++ b/layout/xul/nsBoxFrame.h
@@ -63,17 +63,17 @@ public:
 
   virtual nsSize GetXULPrefSize(nsBoxLayoutState& aBoxLayoutState) override;
   virtual nsSize GetXULMinSize(nsBoxLayoutState& aBoxLayoutState) override;
   virtual nsSize GetXULMaxSize(nsBoxLayoutState& aBoxLayoutState) override;
   virtual nscoord GetXULFlex() override;
   virtual nscoord GetXULBoxAscent(nsBoxLayoutState& aBoxLayoutState) override;
 #ifdef DEBUG_LAYOUT
   virtual nsresult SetXULDebug(nsBoxLayoutState& aBoxLayoutState, bool aDebug) override;
-  virtual nsresult GetDebug(bool& aDebug) override;
+  virtual nsresult GetXULDebug(bool& aDebug) override;
 #endif
   virtual Valignment GetXULVAlign() const override { return mValign; }
   virtual Halignment GetXULHAlign() const override { return mHalign; }
   NS_IMETHOD DoLayout(nsBoxLayoutState& aBoxLayoutState) override;
 
   virtual bool ComputesOwnOverflowArea() override { return false; }
 
   // ----- child and sibling operations ---