From 44efd97f78de129742ecfd015db06bd435f239dd Mon Sep 17 00:00:00 2001 From: "karnaze%netscape.com" Date: Fri, 13 Nov 1998 23:44:50 +0000 Subject: [PATCH] bug 1374 (hometown.aol.com crash on resize) git-svn-id: svn://10.0.0.236/trunk@14635 18797224-902f-48f8-a5cc-f745e15eee43 --- mozilla/content/html/content/src/nsHTMLFrameSetElement.cpp | 2 +- mozilla/layout/generic/nsFrameSetFrame.cpp | 2 +- mozilla/layout/html/content/src/nsHTMLFrameSetElement.cpp | 2 +- mozilla/layout/html/document/src/nsFrameSetFrame.cpp | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/mozilla/content/html/content/src/nsHTMLFrameSetElement.cpp b/mozilla/content/html/content/src/nsHTMLFrameSetElement.cpp index e850b180e1b..8eef2f4052e 100644 --- a/mozilla/content/html/content/src/nsHTMLFrameSetElement.cpp +++ b/mozilla/content/html/content/src/nsHTMLFrameSetElement.cpp @@ -142,7 +142,7 @@ nsHTMLFrameSetElement::StringToAttribute(nsIAtom* aAttribute, return NS_CONTENT_ATTR_HAS_VALUE; } else if (aAttribute == nsHTMLAtoms::border) { - nsGenericHTMLElement::ParseValue(aValue, 1, 100, aResult, eHTMLUnit_Pixel); + nsGenericHTMLElement::ParseValue(aValue, 0, 100, aResult, eHTMLUnit_Pixel); return NS_CONTENT_ATTR_HAS_VALUE; } return NS_CONTENT_ATTR_NOT_THERE; diff --git a/mozilla/layout/generic/nsFrameSetFrame.cpp b/mozilla/layout/generic/nsFrameSetFrame.cpp index dc12d42feb4..6604c7c81ee 100644 --- a/mozilla/layout/generic/nsFrameSetFrame.cpp +++ b/mozilla/layout/generic/nsFrameSetFrame.cpp @@ -904,6 +904,7 @@ nsHTMLFramesetFrame::Reflow(nsIPresContext& aPresContext, PRInt32* childTypes; // frameset/frame distinction of children nsFrameborder* childFrameborder; // the frameborder attr of children nsFrameborder frameborder; + frameborder = GetFrameBorder(PR_FALSE); nsBorderColor* childBorderColors; nscolor borderColor; if (firstTime) { @@ -926,7 +927,6 @@ nsHTMLFramesetFrame::Reflow(nsIPresContext& aPresContext, } childTypes = new PRInt32[numCells]; childFrameborder = new nsFrameborder[numCells]; - frameborder = GetFrameBorder(PR_FALSE); childBorderColors = new nsBorderColor[numCells]; borderColor = GetBorderColor(); } diff --git a/mozilla/layout/html/content/src/nsHTMLFrameSetElement.cpp b/mozilla/layout/html/content/src/nsHTMLFrameSetElement.cpp index e850b180e1b..8eef2f4052e 100644 --- a/mozilla/layout/html/content/src/nsHTMLFrameSetElement.cpp +++ b/mozilla/layout/html/content/src/nsHTMLFrameSetElement.cpp @@ -142,7 +142,7 @@ nsHTMLFrameSetElement::StringToAttribute(nsIAtom* aAttribute, return NS_CONTENT_ATTR_HAS_VALUE; } else if (aAttribute == nsHTMLAtoms::border) { - nsGenericHTMLElement::ParseValue(aValue, 1, 100, aResult, eHTMLUnit_Pixel); + nsGenericHTMLElement::ParseValue(aValue, 0, 100, aResult, eHTMLUnit_Pixel); return NS_CONTENT_ATTR_HAS_VALUE; } return NS_CONTENT_ATTR_NOT_THERE; diff --git a/mozilla/layout/html/document/src/nsFrameSetFrame.cpp b/mozilla/layout/html/document/src/nsFrameSetFrame.cpp index dc12d42feb4..6604c7c81ee 100644 --- a/mozilla/layout/html/document/src/nsFrameSetFrame.cpp +++ b/mozilla/layout/html/document/src/nsFrameSetFrame.cpp @@ -904,6 +904,7 @@ nsHTMLFramesetFrame::Reflow(nsIPresContext& aPresContext, PRInt32* childTypes; // frameset/frame distinction of children nsFrameborder* childFrameborder; // the frameborder attr of children nsFrameborder frameborder; + frameborder = GetFrameBorder(PR_FALSE); nsBorderColor* childBorderColors; nscolor borderColor; if (firstTime) { @@ -926,7 +927,6 @@ nsHTMLFramesetFrame::Reflow(nsIPresContext& aPresContext, } childTypes = new PRInt32[numCells]; childFrameborder = new nsFrameborder[numCells]; - frameborder = GetFrameBorder(PR_FALSE); childBorderColors = new nsBorderColor[numCells]; borderColor = GetBorderColor(); }