Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-10-07 18:04:46 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 1053986 - Rename nsIFrame::GetFlex to GetXULFlex. r=dholbert

Browse Source 
Written purely with sed, over .h and .cpp files in layout/.

MozReview-Commit-ID: DNL01eSXB73
This commit is contained in:
L. David Baron 2016-04-20 21:28:31 -07:00
parent 81bae7f235
commit 8e7c9500e2
16 changed files with 26 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
layout/generic/nsFrame.cpp
View File

@ -8785,13 +8785,13 @@ nsFrame::GetXULMaxSize(nsBoxLayoutState& aState)
}
nscoord
nsFrame::GetFlex()
nsFrame::GetXULFlex()
{
nsBoxLayoutMetrics *metrics = BoxMetrics();
if (!DoesNeedRecalc(metrics->mFlex))
return metrics->mFlex;
metrics->mFlex = nsBox::GetFlex();
metrics->mFlex = nsBox::GetXULFlex();
return metrics->mFlex;
}

2
layout/generic/nsFrame.h
View File

@ -411,7 +411,7 @@ public:
virtual nsSize GetXULPrefSize(nsBoxLayoutState& aBoxLayoutState) override;
virtual nsSize GetXULMinSize(nsBoxLayoutState& aBoxLayoutState) override;
virtual nsSize GetXULMaxSize(nsBoxLayoutState& aBoxLayoutState) override;
virtual nscoord GetFlex() override;
virtual nscoord GetXULFlex() override;
virtual nscoord GetBoxAscent(nsBoxLayoutState& aBoxLayoutState) override;
// We compute and store the HTML content's overflow area. So don't

2
layout/generic/nsIFrame.h
View File

@ -2898,7 +2898,7 @@ public:
// Implemented in nsBox, used in nsBoxFrame
uint32_t GetXULOrdinal();
virtual nscoord GetFlex() = 0;
virtual nscoord GetXULFlex() = 0;
virtual nscoord GetBoxAscent(nsBoxLayoutState& aBoxLayoutState) = 0;
virtual bool IsCollapsed() = 0;
// This does not alter the overflow area. If the caller is changing

4
layout/xul/grid/nsGrid.cpp
View File

@ -1105,7 +1105,7 @@ nsGrid::GetRowFlex(int32_t aIndex, bool aIsHorizontal)
// not flexible.
if (parentsParent) {
if (!IsGrid(parentsParent)) {
nscoord flex = parent->GetFlex();
nscoord flex = parent->GetXULFlex();
nsIFrame::AddCSSFlex(parent, flex);
if (flex == 0) {
row->mFlex = 0;
@ -1119,7 +1119,7 @@ nsGrid::GetRowFlex(int32_t aIndex, bool aIsHorizontal)
}
// get the row flex.
row->mFlex = box->GetFlex();
row->mFlex = box->GetXULFlex();
nsIFrame::AddCSSFlex(box, row->mFlex);
}

6
layout/xul/grid/nsGridRowGroupFrame.cpp
View File

@ -34,7 +34,7 @@ NS_IMPL_FRAMEARENA_HELPERS(nsGridRowGroupFrame)
* then their flex must be equal to the sum of their children's flexes.
*/
nscoord
nsGridRowGroupFrame::GetFlex()
nsGridRowGroupFrame::GetXULFlex()
{
// if we are flexible out flexibility is determined by our columns.
// so first get the our flex. If not 0 then our flex is the sum of
@ -43,7 +43,7 @@ nsGridRowGroupFrame::GetFlex()
if (!DoesNeedRecalc(mFlex))
return mFlex;
if (nsBoxFrame::GetFlex() == 0)
if (nsBoxFrame::GetXULFlex() == 0)
return 0;
// ok we are flexible add up our children
@ -51,7 +51,7 @@ nsGridRowGroupFrame::GetFlex()
nsIFrame* child = nsBox::GetChildBox(this);
while (child)
{
totalFlex += child->GetFlex();
totalFlex += child->GetXULFlex();
child = GetNextBox(child);
}

2
layout/xul/grid/nsGridRowGroupFrame.h
View File

@ -39,7 +39,7 @@ public:
nsBoxLayout* aLayoutManager):
nsBoxFrame(aContext, false, aLayoutManager) {}
virtual nscoord GetFlex() override;
virtual nscoord GetXULFlex() override;
}; // class nsGridRowGroupFrame

2
layout/xul/nsBox.cpp
View File

@ -452,7 +452,7 @@ nsBox::GetXULMaxSize(nsBoxLayoutState& aState)
}
nscoord
nsBox::GetFlex()
nsBox::GetXULFlex()
{
nscoord flex = 0;

2
layout/xul/nsBox.h
View File

@ -22,7 +22,7 @@ public:
virtual nsSize GetXULPrefSize(nsBoxLayoutState& aBoxLayoutState) override;
virtual nsSize GetXULMinSize(nsBoxLayoutState& aBoxLayoutState) override;
virtual nsSize GetXULMaxSize(nsBoxLayoutState& aBoxLayoutState) override;
virtual nscoord GetFlex() override;
virtual nscoord GetXULFlex() override;
virtual nscoord GetBoxAscent(nsBoxLayoutState& aBoxLayoutState) override;
virtual nsSize GetXULMinSizeForScrollArea(nsBoxLayoutState& aBoxLayoutState) override;

8
layout/xul/nsBoxFrame.cpp
View File

@ -887,12 +887,12 @@ nsBoxFrame::GetXULMaxSize(nsBoxLayoutState& aBoxLayoutState)
}
nscoord
nsBoxFrame::GetFlex()
nsBoxFrame::GetXULFlex()
{
if (!DoesNeedRecalc(mFlex))
return mFlex;
mFlex = nsBox::GetFlex();
mFlex = nsBox::GetXULFlex();
return mFlex;
}
@ -1499,7 +1499,7 @@ nsBoxFrame::PaintXULDebugOverlay(DrawTarget& aDrawTarget, nsPoint aPt)
spacerSize = debugBorder.left - onePixel*4;
}
nscoord flex = kid->GetFlex();
nscoord flex = kid->GetXULFlex();
if (!kid->IsCollapsed()) {
if (isHorizontal)
@ -1789,7 +1789,7 @@ nsBoxFrame::DisplayDebugInfoFor(nsIFrame* aBox,
nsSize prefSize = child->GetXULPrefSize(state);
nsSize minSize = child->GetXULMinSize(state);
nsSize maxSize = child->GetXULMaxSize(state);
nscoord flexSize = child->GetFlex();
nscoord flexSize = child->GetXULFlex();
nscoord ascentSize = child->GetBoxAscent(state);
char min[100];

2
layout/xul/nsBoxFrame.h
View File

@ -64,7 +64,7 @@ public:
virtual nsSize GetXULPrefSize(nsBoxLayoutState& aBoxLayoutState) override;
virtual nsSize GetXULMinSize(nsBoxLayoutState& aBoxLayoutState) override;
virtual nsSize GetXULMaxSize(nsBoxLayoutState& aBoxLayoutState) override;
virtual nscoord GetFlex() override;
virtual nscoord GetXULFlex() override;
virtual nscoord GetBoxAscent(nsBoxLayoutState& aBoxLayoutState) override;
#ifdef DEBUG_LAYOUT
virtual nsresult SetDebug(nsBoxLayoutState& aBoxLayoutState, bool aDebug) override;

4
layout/xul/nsLeafBoxFrame.cpp
View File

@ -365,9 +365,9 @@ nsLeafBoxFrame::GetXULMaxSize(nsBoxLayoutState& aState)
}
/* virtual */ nscoord
nsLeafBoxFrame::GetFlex()
nsLeafBoxFrame::GetXULFlex()
{
return nsBox::GetFlex();
return nsBox::GetXULFlex();
}
/* virtual */ nscoord

2
layout/xul/nsLeafBoxFrame.h
View File

@ -19,7 +19,7 @@ public:
virtual nsSize GetXULPrefSize(nsBoxLayoutState& aState) override;
virtual nsSize GetXULMinSize(nsBoxLayoutState& aState) override;
virtual nsSize GetXULMaxSize(nsBoxLayoutState& aState) override;
virtual nscoord GetFlex() override;
virtual nscoord GetXULFlex() override;
virtual nscoord GetBoxAscent(nsBoxLayoutState& aState) override;
virtual nsIAtom* GetType() const override;

2
layout/xul/nsMenuFrame.cpp
View File

@ -1346,7 +1346,7 @@ nsMenuFrame::SizeToPopup(nsBoxLayoutState& aState, nsSize& aSize)
bool widthSet, heightSet;
nsSize tmpSize(-1, 0);
nsIFrame::AddCSSPrefSize(this, tmpSize, widthSet, heightSet);
if (!widthSet && GetFlex() == 0) {
if (!widthSet && GetXULFlex() == 0) {
nsMenuPopupFrame* popupFrame = GetPopup();
if (!popupFrame)
return false;

2
layout/xul/nsSliderFrame.cpp
View File

@ -436,7 +436,7 @@ nsSliderFrame::DoLayout(nsBoxLayoutState& aState)
nscoord& availableLength = IsHorizontal() ? clientRect.width : clientRect.height;
nscoord& thumbLength = IsHorizontal() ? thumbSize.width : thumbSize.height;
if ((pageIncrement + maxPos - minPos) > 0 && thumbBox->GetFlex() > 0) {
if ((pageIncrement + maxPos - minPos) > 0 && thumbBox->GetXULFlex() > 0) {
float ratio = float(pageIncrement) / float(maxPos - minPos + pageIncrement);
thumbLength = std::max(thumbLength, NSToCoordRound(availableLength * ratio));
}

2
layout/xul/nsSplitterFrame.cpp
View File

@ -677,7 +677,7 @@ nsSplitterFrameInner::MouseDown(nsIDOMEvent* aMouseEvent)
mOuter->AddMargin(childBox, prefSize);
mOuter->AddMargin(childBox, maxSize);
nscoord flex = childBox->GetFlex();
nscoord flex = childBox->GetXULFlex();
nsMargin margin(0,0,0,0);
childBox->GetMargin(margin);

6
layout/xul/nsSprocketLayout.cpp
View File

@ -702,7 +702,7 @@ nsSprocketLayout::PopulateBoxSizes(nsIFrame* aBox, nsBoxLayoutState& aState, nsB
}
flex = child->GetFlex();
flex = child->GetXULFlex();
currentBox->flex = flex;
currentBox->collapsed = child->IsCollapsed();
@ -786,7 +786,7 @@ nsSprocketLayout::PopulateBoxSizes(nsIFrame* aBox, nsBoxLayoutState& aState, nsB
prefWidth = pref.height;
}
nscoord flex = child->GetFlex();
nscoord flex = child->GetXULFlex();
// set them if you collapsed you are not flexible.
if (collapsed) {
@ -1387,7 +1387,7 @@ nsSprocketLayout::GetXULMinSize(nsIFrame* aBox, nsBoxLayoutState& aState)
// if the child is not flexible then
// its min size is its pref size.
if (child->GetFlex() == 0) {
if (child->GetXULFlex() == 0) {
pref = child->GetXULPrefSize(aState);
if (isHorizontal)
min.width = pref.width;