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

sync css declaration to xif with new api

Browse Source 
git-svn-id: svn://10.0.0.236/trunk@9701 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
peterl%netscape.com
1998-09-10 01:16:25 +00:00
parent 4a2003b48a
commit b2413c6722
2 changed files with 60 additions and 72 deletions
Download Patch File Download Diff File Expand all files Collapse all files

66
mozilla/content/html/document/src/nsMarkupDocument.cpp
View File

@@ -100,46 +100,40 @@ void nsMarkupDocument::CSSSelectorToXIF(nsXIFConverter& aConverter, nsCSSSelecto
*/
void nsMarkupDocument::CSSDeclarationToXIF(nsXIFConverter& aConverter, nsICSSDeclaration& aDeclaration)
{
PRInt32 propId;
nsCSSValue value;
nsString name;
nsString str;
nsAutoString list;
nsAutoString decl;
aConverter.BeginCSSDeclarationList();
for (propId = 0; propId < PROP_MAX; propId++)
{
switch(propId)
{
case PROP_BACKGROUND:
case PROP_BORDER:
case PROP_CLIP:
case PROP_FONT:
case PROP_LIST_STYLE:
case PROP_MARGIN:
case PROP_PADDING:
case PROP_BACKGROUND_POSITION:
case PROP_BORDER_TOP:
case PROP_BORDER_RIGHT:
case PROP_BORDER_BOTTOM:
case PROP_BORDER_LEFT:
case PROP_BORDER_COLOR:
case PROP_BORDER_STYLE:
case PROP_BORDER_WIDTH:
break;
aDeclaration.ToString(list);
default:
aDeclaration.GetValue(propId,value);
if (value.GetUnit() != eHTMLUnit_Null)
{
aConverter.BeginCSSDeclaration();
name = nsCSSProps::kNameTable[propId].name;
value.ToCSSString(str,propId);
aConverter.AddCSSDeclaration(name,str);
aConverter.EndCSSDeclaration();
}
PRInt32 start = 0;
PRInt32 semiColon = list.Find(';');
while (-1 < semiColon) {
decl.Truncate();
list.Mid(decl, start, semiColon - start);
if (0 == decl.Compare("/*", PR_FALSE, 2)) {
// XXX need to append comment
}
else {
PRInt32 colon = decl.Find(':');
nsAutoString property;
nsAutoString value;
aConverter.BeginCSSDeclaration();
if (-1 < colon) {
decl.Left(property, colon);
property.StripWhitespace();
decl.Right(value, (decl.Length() - colon) - 2);
aConverter.AddCSSDeclaration(property, value);
}
aConverter.EndCSSDeclaration();
}
start = ++semiColon;
semiColon = list.Find(';', start);
}
aConverter.EndCSSDeclarationList();
}

66
mozilla/layout/html/document/src/nsMarkupDocument.cpp
View File

@@ -100,46 +100,40 @@ void nsMarkupDocument::CSSSelectorToXIF(nsXIFConverter& aConverter, nsCSSSelecto
*/
void nsMarkupDocument::CSSDeclarationToXIF(nsXIFConverter& aConverter, nsICSSDeclaration& aDeclaration)
{
PRInt32 propId;
nsCSSValue value;
nsString name;
nsString str;
nsAutoString list;
nsAutoString decl;
aConverter.BeginCSSDeclarationList();
for (propId = 0; propId < PROP_MAX; propId++)
{
switch(propId)
{
case PROP_BACKGROUND:
case PROP_BORDER:
case PROP_CLIP:
case PROP_FONT:
case PROP_LIST_STYLE:
case PROP_MARGIN:
case PROP_PADDING:
case PROP_BACKGROUND_POSITION:
case PROP_BORDER_TOP:
case PROP_BORDER_RIGHT:
case PROP_BORDER_BOTTOM:
case PROP_BORDER_LEFT:
case PROP_BORDER_COLOR:
case PROP_BORDER_STYLE:
case PROP_BORDER_WIDTH:
break;
aDeclaration.ToString(list);
default:
aDeclaration.GetValue(propId,value);
if (value.GetUnit() != eHTMLUnit_Null)
{
aConverter.BeginCSSDeclaration();
name = nsCSSProps::kNameTable[propId].name;
value.ToCSSString(str,propId);
aConverter.AddCSSDeclaration(name,str);
aConverter.EndCSSDeclaration();
}
PRInt32 start = 0;
PRInt32 semiColon = list.Find(';');
while (-1 < semiColon) {
decl.Truncate();
list.Mid(decl, start, semiColon - start);
if (0 == decl.Compare("/*", PR_FALSE, 2)) {
// XXX need to append comment
}
else {
PRInt32 colon = decl.Find(':');
nsAutoString property;
nsAutoString value;
aConverter.BeginCSSDeclaration();
if (-1 < colon) {
decl.Left(property, colon);
property.StripWhitespace();
decl.Right(value, (decl.Length() - colon) - 2);
aConverter.AddCSSDeclaration(property, value);
}
aConverter.EndCSSDeclaration();
}
start = ++semiColon;
semiColon = list.Find(';', start);
}
aConverter.EndCSSDeclarationList();
}