Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-11-25 22:01:30 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

bug 286899 Follow CSS 2.1, rather than css3-ui, for the computed style for the

Browse Source 
cursor property: Make it contain all URIs (absolutized) and the pointer.
r+sr=dbaron
This commit is contained in:
cbiesinger%web.de 2005-03-20 13:35:31 +00:00
parent 1d540761e2
commit 6f5951be02
2 changed files with 39 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

58
layout/style/nsComputedDOMStyle.cpp
View File

@ -2012,43 +2012,53 @@ nsresult
nsComputedDOMStyle::GetCursor(nsIFrame *aFrame,
nsIDOMCSSValue** aValue)
{
nsROCSSPrimitiveValue *val = GetROCSSPrimitiveValue();
NS_ENSURE_TRUE(val, NS_ERROR_OUT_OF_MEMORY);
nsDOMCSSValueList *valueList = GetROCSSValueList(PR_TRUE);
NS_ENSURE_TRUE(valueList, NS_ERROR_OUT_OF_MEMORY);
const nsStyleUserInterface *ui = nsnull;
GetStyleData(eStyleStruct_UserInterface, (const nsStyleStruct*&)ui, aFrame);
if (ui) {
PRBool found = PR_FALSE;
PRInt32 count = ui->mCursorArray.Count();
for (PRInt32 i = 0; i < count; i++) {
PRUint32 status;
nsresult rv = ui->mCursorArray[i]->GetImageStatus(&status);
if (NS_SUCCEEDED(rv) && (status & imgIRequest::STATUS_FRAME_COMPLETE)) {
// This is the one we want
nsCOMPtr<nsIURI> uri;
ui->mCursorArray[i]->GetURI(getter_AddRefs(uri));
if (uri) {
val->SetURI(uri);
found = PR_TRUE;
break;
}
nsCOMPtr<nsIURI> uri;
ui->mCursorArray[i]->GetURI(getter_AddRefs(uri));
nsROCSSPrimitiveValue *val = GetROCSSPrimitiveValue();
if (!val) {
delete valueList;
return NS_ERROR_OUT_OF_MEMORY;
}
val->SetURI(uri);
if (!valueList->AppendCSSValue(val)) {
delete valueList;
delete val;
return NS_ERROR_OUT_OF_MEMORY;
}
}
if (!found) {
if (ui->mCursor == NS_STYLE_CURSOR_AUTO) {
val->SetIdent(nsLayoutAtoms::autoAtom);
} else {
const nsAFlatCString& cursor =
nsCSSProps::ValueToKeyword(ui->mCursor,
nsCSSProps::kCursorKTable);
val->SetIdent(cursor);
}
nsROCSSPrimitiveValue *val = GetROCSSPrimitiveValue();
if (!val) {
delete valueList;
return NS_ERROR_OUT_OF_MEMORY;
}
if (ui->mCursor == NS_STYLE_CURSOR_AUTO) {
val->SetIdent(nsLayoutAtoms::autoAtom);
} else {
const nsAFlatCString& cursor =
nsCSSProps::ValueToKeyword(ui->mCursor,
nsCSSProps::kCursorKTable);
val->SetIdent(cursor);
}
if (!valueList->AppendCSSValue(val)) {
delete valueList;
delete val;
return NS_ERROR_OUT_OF_MEMORY;
}
}
return CallQueryInterface(val, aValue);
return CallQueryInterface(valueList, aValue);
}
nsresult

5
layout/style/nsDOMCSSValueList.h
View File

@ -59,6 +59,11 @@ public:
nsDOMCSSValueList(PRBool aCommaDelimited, PRBool aReadonly);
virtual ~nsDOMCSSValueList();
/**
* Adds a value to this list.
* @retval PR_TRUE Adding the value succeeded
* @retval PR_FALSE The value could not be added (Out of memory)
*/
PRBool AppendCSSValue(nsIDOMCSSValue* aValue);
private: