Fixes a crash when hitting backspace in Composer
b=167543, r=timeless, sr=kin git-svn-id: svn://10.0.0.236/trunk@130134 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
parent
59155b6c17
commit
3d911d45f9
@ -2295,8 +2295,8 @@ nsHTMLEditor::GetCSSBackgroundColorState(PRBool *aMixed, nsAString &aOutColor, P
|
||||
htmlElement = do_QueryInterface(tmp);
|
||||
// look at parent if the queried color is transparent and if the node to
|
||||
// examine is not the root of the document
|
||||
} while ( aOutColor.Equals(NS_LITERAL_STRING("transparent")) && !htmlElement );
|
||||
if (htmlElement && aOutColor.Equals(NS_LITERAL_STRING("transparent"))) {
|
||||
} while ( aOutColor.Equals(NS_LITERAL_STRING("transparent")) && htmlElement );
|
||||
if (!htmlElement && aOutColor.Equals(NS_LITERAL_STRING("transparent"))) {
|
||||
// we have hit the root of the document and the color is still transparent !
|
||||
// Grumble... Let's look at the default background color because that's the
|
||||
// color we are looking for
|
||||
@ -2333,7 +2333,7 @@ nsHTMLEditor::GetCSSBackgroundColorState(PRBool *aMixed, nsAString &aOutColor, P
|
||||
if (NS_FAILED(res)) return res;
|
||||
nodeToExamine = tmp;
|
||||
htmlElement = do_QueryInterface(tmp);
|
||||
} while ( aOutColor.Equals(NS_LITERAL_STRING("transparent")) && !htmlElement );
|
||||
} while ( aOutColor.Equals(NS_LITERAL_STRING("transparent")) && htmlElement );
|
||||
}
|
||||
return NS_OK;
|
||||
}
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user