corysanin/tubestation
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Bug 1361051: rename mozilla::FrameType to mozilla::LayoutFrameType. r=xidorn

Browse Source 
This avoids conflicts with mozilla::dom::FrameType.

MozReview-Commit-ID: 7aEMbHRaTFk
This commit is contained in:
Emilio Cobos Álvarez
2017-05-01 19:32:52 +02:00
parent 9387b22602
commit 643f3f8618
152 changed files with 642 additions and 613 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
layout/generic/nsFrameSetFrame.cpp
View File

@@ -159,7 +159,7 @@ public:
protected:
explicit nsHTMLFramesetBlankFrame(nsStyleContext* aContext)
: nsLeafFrame(aContext, FrameType::None)
: nsLeafFrame(aContext, LayoutFrameType::None)
{}
virtual ~nsHTMLFramesetBlankFrame();
@@ -177,7 +177,7 @@ bool nsHTMLFramesetFrame::gDragInProgress = false;
#define DEFAULT_BORDER_WIDTH_PX 6
nsHTMLFramesetFrame::nsHTMLFramesetFrame(nsStyleContext* aContext)
: nsContainerFrame(aContext, FrameType::FrameSet)
: nsContainerFrame(aContext, LayoutFrameType::FrameSet)
{
mNumRows = 0;
mNumCols = 0;
@@ -1337,7 +1337,7 @@ nsHTMLFramesetBorderFrame::nsHTMLFramesetBorderFrame(nsStyleContext* aContext,
int32_t aWidth,
bool aVertical,
bool aVisibility)
: nsLeafFrame(aContext, FrameType::None)
: nsLeafFrame(aContext, LayoutFrameType::None)
, mWidth(aWidth)
, mVertical(aVertical)
, mVisibility(aVisibility)