bug 1374 (hometown.aol.com crash on resize)
git-svn-id: svn://10.0.0.236/trunk@14635 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
@@ -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;
|
||||
|
||||
@@ -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();
|
||||
}
|
||||
|
||||
@@ -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;
|
||||
|
||||
@@ -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();
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user