Bug 1053986 - Rename nsBox::EndLayout to EndXULLayout. r=dholbert
authorL. David Baron <dbaron@dbaron.org>
Wed, 20 Apr 2016 21:28:35 -0700
changeset 294243 acf9fa960f85b38665375e7f447d40cd14d19923
parent 294242 1ffc3f31dd98b47a16b16e6589512054c767ddba
child 294244 583cdf2d877c00526826108c2a18eb4079200280
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::EndLayout to EndXULLayout. 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: 6D6A0XqArES
layout/xul/nsBox.cpp
layout/xul/nsBox.h
--- a/layout/xul/nsBox.cpp
+++ b/layout/xul/nsBox.cpp
@@ -158,17 +158,17 @@ nsBox::BeginXULLayout(nsBoxLayoutState& 
 
 NS_IMETHODIMP
 nsBox::DoLayout(nsBoxLayoutState& aState)
 {
   return NS_OK;
 }
 
 nsresult
-nsBox::EndLayout(nsBoxLayoutState& aState)
+nsBox::EndXULLayout(nsBoxLayoutState& aState)
 {
 
   #ifdef DEBUG_LAYOUT
       --gIndent;
   #endif
 
   return SyncLayout(aState);
 }
@@ -503,17 +503,17 @@ nsIFrame::XULLayout(nsBoxLayoutState& aS
 
   nsBox *box = static_cast<nsBox*>(this);
   DISPLAY_LAYOUT(box);
 
   box->BeginXULLayout(aState);
 
   box->DoLayout(aState);
 
-  box->EndLayout(aState);
+  box->EndXULLayout(aState);
 
   return NS_OK;
 }
 
 bool
 nsBox::DoesClipChildren()
 {
   const nsStyleDisplay* display = StyleDisplay();
--- a/layout/xul/nsBox.h
+++ b/layout/xul/nsBox.h
@@ -88,17 +88,17 @@ protected:
 
   virtual void ListBox(nsAutoString& aResult);
 #endif
   
   virtual void GetLayoutFlags(uint32_t& aFlags);
 
   nsresult BeginXULLayout(nsBoxLayoutState& aState);
   NS_IMETHOD DoLayout(nsBoxLayoutState& aBoxLayoutState);
-  nsresult EndLayout(nsBoxLayoutState& aState);
+  nsresult EndXULLayout(nsBoxLayoutState& aState);
 
 #ifdef DEBUG_LAYOUT
   virtual void GetBoxName(nsAutoString& aName);
   void PropagateDebug(nsBoxLayoutState& aState);
 #endif
 
   static bool gGotTheme;
   static nsITheme* gTheme;