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

Bug 232706: Remove unneccesary datatypes from nsHTMLValue and cleanup AttributeToString.

Browse Source 
r=caillon sr=jst


git-svn-id: svn://10.0.0.236/trunk@152623 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
sicking%bigfoot.com
2004-02-11 00:38:12 +00:00
parent 15ec97ef25
commit 26c9ab7b2b
15 changed files with 35 additions and 123 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
mozilla/layout/generic/nsFrameSetFrame.cpp
View File

@@ -656,11 +656,9 @@ PRInt32 nsHTMLFramesetFrame::GetBorderWidth(nsIPresContext* aPresContext,
if (NS_CONTENT_ATTR_HAS_VALUE == (content->GetHTMLAttribute(nsHTMLAtoms::border, htmlVal))) {
nsHTMLUnit unit = htmlVal.GetUnit();
PRInt32 intVal = 0;
if (eHTMLUnit_Pixel == unit) {
intVal = htmlVal.GetPixelValue();
} else if (eHTMLUnit_Integer == unit) {
if (eHTMLUnit_Integer == unit) {
intVal = htmlVal.GetIntValue();
}
}
if (intVal < 0) {
intVal = 0;
}
@@ -930,44 +928,35 @@ nsFrameborder nsHTMLFramesetFrame::GetFrameBorder(nsIContent* aContent)
nscolor nsHTMLFramesetFrame::GetBorderColor()
{
nscolor result = NO_COLOR;
nsCOMPtr<nsIHTMLContent> content(do_QueryInterface(mContent));
if (content) {
nsHTMLValue value;
if (NS_CONTENT_ATTR_HAS_VALUE == (content->GetHTMLAttribute(nsHTMLAtoms::bordercolor, value))) {
if ((eHTMLUnit_Color == value.GetUnit()) ||
(eHTMLUnit_ColorName == value.GetUnit())) {
result = value.GetColorValue();
nscolor color;
if (value.GetColorValue(color)) {
return color;
}
}
}
if (NO_COLOR == result) {
return mParentBorderColor;
}
return result;
return mParentBorderColor;
}
nscolor nsHTMLFramesetFrame::GetBorderColor(nsIContent* aContent)
{
nscolor result = NO_COLOR;
nsCOMPtr<nsIHTMLContent> content(do_QueryInterface(aContent));
if (content) {
nsHTMLValue value;
if (NS_CONTENT_ATTR_HAS_VALUE == (content->GetHTMLAttribute(nsHTMLAtoms::bordercolor, value))) {
if ((eHTMLUnit_Color == value.GetUnit()) ||
(eHTMLUnit_ColorName == value.GetUnit())) {
result = value.GetColorValue();
nscolor color;
if (value.GetColorValue(color)) {
return color;
}
}
}
if (NO_COLOR == result) {
return GetBorderColor();
}
return result;
return GetBorderColor();
}
NS_IMETHODIMP