Bug 1053986 - Rename nsBox::BeginLayout to BeginXULLayout. r=dholbert
authorL. David Baron <dbaron@dbaron.org>
Wed, 20 Apr 2016 21:28:34 -0700
changeset 294242 1ffc3f31dd98b47a16b16e6589512054c767ddba
parent 294241 dae8004cf486c2262fd65920e0c886b931244b2e
child 294243 acf9fa960f85b38665375e7f447d40cd14d19923
push id30201
push userkwierso@gmail.com
push dateThu, 21 Apr 2016 21:41:56 +0000
treeherdermozilla-central@0891f0fa044c [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersdholbert
bugs1053986
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 1053986 - Rename nsBox::BeginLayout to BeginXULLayout. r=dholbert Written purely with sed, over .h and .cpp files in layout/. (While this wasn't explicitly reviewed, I'm considering it as r=dholbert based on the request in comment 47 in the bug.) MozReview-Commit-ID: 5gQYEEY6jJ1
layout/xul/nsBox.cpp
layout/xul/nsBox.h
--- a/layout/xul/nsBox.cpp
+++ b/layout/xul/nsBox.cpp
@@ -112,17 +112,17 @@ nsBox::PropagateDebug(nsBoxLayoutState& 
 void
 nsBox::GetBoxName(nsAutoString& aName)
 {
   aName.AssignLiteral("Box");
 }
 #endif
 
 nsresult
-nsBox::BeginLayout(nsBoxLayoutState& aState)
+nsBox::BeginXULLayout(nsBoxLayoutState& aState)
 {
 #ifdef DEBUG_LAYOUT 
 
   nsBoxAddIndents();
   printf("XULLayout: ");
   XULDumpBox(stdout);
   printf("\n");
   gIndent++;
@@ -499,17 +499,17 @@ nsBox::IsXULCollapsed()
 nsresult
 nsIFrame::XULLayout(nsBoxLayoutState& aState)
 {
   NS_ASSERTION(aState.GetRenderingContext(), "must have rendering context");
 
   nsBox *box = static_cast<nsBox*>(this);
   DISPLAY_LAYOUT(box);
 
-  box->BeginLayout(aState);
+  box->BeginXULLayout(aState);
 
   box->DoLayout(aState);
 
   box->EndLayout(aState);
 
   return NS_OK;
 }
 
--- a/layout/xul/nsBox.h
+++ b/layout/xul/nsBox.h
@@ -86,17 +86,17 @@ protected:
 #ifdef DEBUG_LAYOUT
   virtual void AppendAttribute(const nsAutoString& aAttribute, const nsAutoString& aValue, nsAutoString& aResult);
 
   virtual void ListBox(nsAutoString& aResult);
 #endif
   
   virtual void GetLayoutFlags(uint32_t& aFlags);
 
-  nsresult BeginLayout(nsBoxLayoutState& aState);
+  nsresult BeginXULLayout(nsBoxLayoutState& aState);
   NS_IMETHOD DoLayout(nsBoxLayoutState& aBoxLayoutState);
   nsresult EndLayout(nsBoxLayoutState& aState);
 
 #ifdef DEBUG_LAYOUT
   virtual void GetBoxName(nsAutoString& aName);
   void PropagateDebug(nsBoxLayoutState& aState);
 #endif