wine/gecko
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-gecko.git synced 2024-09-13 09:24:08 -07:00
Code Issues Packages Projects Releases Wiki Activity

Bug 962267: Move nsFlexContainerFrame.h's forward-decls into the class's scope. r=mats

Browse Source
This commit is contained in:
Daniel Holbert 2014-01-21 17:05:07 -08:00
parent 683a2b06e2
commit ac7ee96123
2 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
layout/generic/nsFlexContainerFrame.cpp
View File

@ -24,6 +24,9 @@ using namespace mozilla::layout;
// Convenience typedefs for helper classes that we forward-declare in .h file
// (so that nsFlexContainerFrame methods can use them as parameters):
typedef nsFlexContainerFrame::FlexItem FlexItem;
typedef nsFlexContainerFrame::FlexLine FlexLine;
typedef nsFlexContainerFrame::FlexboxAxisTracker FlexboxAxisTracker;
typedef nsFlexContainerFrame::StrutInfo StrutInfo;
#ifdef PR_LOGGING
@ -202,7 +205,7 @@ MarginComponentForSide(nsMargin& aMargin, Side aSide)
IsAxisHorizontal((axisTracker_).GetCrossAxis()) ? (width_) : (height_)
// Encapsulates our flex container's main & cross axes.
class MOZ_STACK_CLASS FlexboxAxisTracker {
class MOZ_STACK_CLASS nsFlexContainerFrame::FlexboxAxisTracker {
public:
FlexboxAxisTracker(nsFlexContainerFrame* aFlexContainerFrame);
@ -277,7 +280,7 @@ private:
// Represents a flex item.
// Includes the various pieces of input that the Flexbox Layout Algorithm uses
// to resolve a flexible width.
class FlexItem {
class nsFlexContainerFrame::FlexItem {
public:
// Normal constructor:
FlexItem(nsIFrame* aChildFrame,
@ -561,7 +564,7 @@ protected:
// Represents a single flex line in a flex container.
// Manages an array of the FlexItems that are in the line.
class FlexLine {
class nsFlexContainerFrame::FlexLine {
public:
FlexLine()
: mTotalInnerHypotheticalMainSize(0),

8
layout/generic/nsFlexContainerFrame.h
View File

@ -17,11 +17,6 @@ nsIFrame* NS_NewFlexContainerFrame(nsIPresShell* aPresShell,
typedef nsContainerFrame nsFlexContainerFrameSuper;
class FlexItem;
class FlexLine;
class FlexboxAxisTracker;
class MainAxisPositionTracker;
class SingleLineCrossAxisPositionTracker;
template <class T> class nsTArray;
class nsFlexContainerFrame : public nsFlexContainerFrameSuper {
@ -35,6 +30,9 @@ class nsFlexContainerFrame : public nsFlexContainerFrameSuper {
public:
// Forward-decls of helper classes
class FlexItem;
class FlexLine;
class FlexboxAxisTracker;
class StrutInfo;
// nsIFrame overrides