Bommels05/Mozilla
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Getting rid of a conflict that I had.

Browse Source 
git-svn-id: svn://10.0.0.236/trunk@18756 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
hyatt%netscape.com
1999-01-27 07:23:58 +00:00
parent eeb09800bb
commit bfe575e019
3 changed files with 3 additions and 81 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
mozilla/content/html/style/src/nsHTMLStyleSheet.cpp
View File

@@ -491,35 +491,9 @@ protected:
nsIStyleContext* aStyleContext,
nsAbsoluteItems& aAbsoluteItems,
nsFrameItems& aFrameItems,
<<<<<<< nsHTMLStyleSheet.cpp
PRBool& haltProcessing);
=======
nsAbsoluteItems& aFixedItems,
PRBool& haltProcessing);
>>>>>>> 3.141
PRBool& aHaltProcessing);
<<<<<<< nsHTMLStyleSheet.cpp
nsresult ConstructTreeFrame(nsIPresContext* aPresContext,
nsIContent* aContent,
nsIFrame* aParent,
nsIStyleContext* aStyleContext,
nsAbsoluteItems& aAboluteItems,
nsIFrame*& aNewFrame);
nsresult ConstructTreeBodyFrame(nsIPresContext* aPresContext,
nsIContent* aContent,
nsIFrame* aParent,
nsIStyleContext* aStyleContext,
nsIFrame*& aNewScrollFrame,
nsIFrame*& aNewFrame);
nsresult ConstructTreeCellFrame(nsIPresContext* aPresContext,
nsIContent* aContent,
nsIFrame* aParentFrame,
nsIStyleContext* aStyleContext,
nsAbsoluteItems& aAbsoluteItems,
nsIFrame*& aNewFrame);
=======
nsresult ConstructTreeFrame(nsIPresContext* aPresContext,
nsIContent* aContent,
nsIFrame* aParent,

28
mozilla/layout/html/style/src/nsHTMLStyleSheet.cpp
View File

@@ -491,35 +491,9 @@ protected:
nsIStyleContext* aStyleContext,
nsAbsoluteItems& aAbsoluteItems,
nsFrameItems& aFrameItems,
<<<<<<< nsHTMLStyleSheet.cpp
PRBool& haltProcessing);
=======
nsAbsoluteItems& aFixedItems,
PRBool& haltProcessing);
>>>>>>> 3.141
PRBool& aHaltProcessing);
<<<<<<< nsHTMLStyleSheet.cpp
nsresult ConstructTreeFrame(nsIPresContext* aPresContext,
nsIContent* aContent,
nsIFrame* aParent,
nsIStyleContext* aStyleContext,
nsAbsoluteItems& aAboluteItems,
nsIFrame*& aNewFrame);
nsresult ConstructTreeBodyFrame(nsIPresContext* aPresContext,
nsIContent* aContent,
nsIFrame* aParent,
nsIStyleContext* aStyleContext,
nsIFrame*& aNewScrollFrame,
nsIFrame*& aNewFrame);
nsresult ConstructTreeCellFrame(nsIPresContext* aPresContext,
nsIContent* aContent,
nsIFrame* aParentFrame,
nsIStyleContext* aStyleContext,
nsAbsoluteItems& aAbsoluteItems,
nsIFrame*& aNewFrame);
=======
nsresult ConstructTreeFrame(nsIPresContext* aPresContext,
nsIContent* aContent,
nsIFrame* aParent,

28
mozilla/layout/style/nsHTMLStyleSheet.cpp
View File

@@ -491,35 +491,9 @@ protected:
nsIStyleContext* aStyleContext,
nsAbsoluteItems& aAbsoluteItems,
nsFrameItems& aFrameItems,
<<<<<<< nsHTMLStyleSheet.cpp
PRBool& haltProcessing);
=======
nsAbsoluteItems& aFixedItems,
PRBool& haltProcessing);
>>>>>>> 3.141
PRBool& aHaltProcessing);
<<<<<<< nsHTMLStyleSheet.cpp
nsresult ConstructTreeFrame(nsIPresContext* aPresContext,
nsIContent* aContent,
nsIFrame* aParent,
nsIStyleContext* aStyleContext,
nsAbsoluteItems& aAboluteItems,
nsIFrame*& aNewFrame);
nsresult ConstructTreeBodyFrame(nsIPresContext* aPresContext,
nsIContent* aContent,
nsIFrame* aParent,
nsIStyleContext* aStyleContext,
nsIFrame*& aNewScrollFrame,
nsIFrame*& aNewFrame);
nsresult ConstructTreeCellFrame(nsIPresContext* aPresContext,
nsIContent* aContent,
nsIFrame* aParentFrame,
nsIStyleContext* aStyleContext,
nsAbsoluteItems& aAbsoluteItems,
nsIFrame*& aNewFrame);
=======
nsresult ConstructTreeFrame(nsIPresContext* aPresContext,
nsIContent* aContent,
nsIFrame* aParent,