From bfe575e019b3d48d697b2f1ee37c5a224a5e5d76 Mon Sep 17 00:00:00 2001 From: "hyatt%netscape.com" Date: Wed, 27 Jan 1999 07:23:58 +0000 Subject: [PATCH] Getting rid of a conflict that I had. git-svn-id: svn://10.0.0.236/trunk@18756 18797224-902f-48f8-a5cc-f745e15eee43 --- .../html/style/src/nsHTMLStyleSheet.cpp | 28 +------------------ .../html/style/src/nsHTMLStyleSheet.cpp | 28 +------------------ mozilla/layout/style/nsHTMLStyleSheet.cpp | 28 +------------------ 3 files changed, 3 insertions(+), 81 deletions(-) diff --git a/mozilla/content/html/style/src/nsHTMLStyleSheet.cpp b/mozilla/content/html/style/src/nsHTMLStyleSheet.cpp index ed795211afe..f970317ccbe 100644 --- a/mozilla/content/html/style/src/nsHTMLStyleSheet.cpp +++ b/mozilla/content/html/style/src/nsHTMLStyleSheet.cpp @@ -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, diff --git a/mozilla/layout/html/style/src/nsHTMLStyleSheet.cpp b/mozilla/layout/html/style/src/nsHTMLStyleSheet.cpp index ed795211afe..f970317ccbe 100644 --- a/mozilla/layout/html/style/src/nsHTMLStyleSheet.cpp +++ b/mozilla/layout/html/style/src/nsHTMLStyleSheet.cpp @@ -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, diff --git a/mozilla/layout/style/nsHTMLStyleSheet.cpp b/mozilla/layout/style/nsHTMLStyleSheet.cpp index ed795211afe..f970317ccbe 100644 --- a/mozilla/layout/style/nsHTMLStyleSheet.cpp +++ b/mozilla/layout/style/nsHTMLStyleSheet.cpp @@ -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,