зеркало из https://github.com/mozilla/gecko-dev.git
XBL expects computed -moz-binding to not have "url()" and to be empty
string for no binding. Bug 128428 redux, patch by caillon@returnzero.com (Christopher Aillon), r=bzbarsky, sr=shaver, a=brendan
This commit is contained in:
Родитель
5b6f148c58
Коммит
28e6030278
|
@ -761,11 +761,13 @@ nsComputedDOMStyle::GetBinding(nsIFrame *aFrame,
|
|||
|
||||
GetStyleData(eStyleStruct_Display, (const nsStyleStruct*&)display, aFrame);
|
||||
|
||||
// Break this temporarily to prevent assertions.
|
||||
// Add a new method to let XBL and others do this the right way in bug 129960
|
||||
if (display && !display->mBinding.IsEmpty()) {
|
||||
val->SetURI(display->mBinding);
|
||||
val->SetString(display->mBinding);
|
||||
}
|
||||
else {
|
||||
val->SetString(NS_LITERAL_STRING("none"));
|
||||
val->SetString(NS_LITERAL_STRING(""));
|
||||
}
|
||||
|
||||
return CallQueryInterface(val, &aValue);
|
||||
|
|
|
@ -761,11 +761,13 @@ nsComputedDOMStyle::GetBinding(nsIFrame *aFrame,
|
|||
|
||||
GetStyleData(eStyleStruct_Display, (const nsStyleStruct*&)display, aFrame);
|
||||
|
||||
// Break this temporarily to prevent assertions.
|
||||
// Add a new method to let XBL and others do this the right way in bug 129960
|
||||
if (display && !display->mBinding.IsEmpty()) {
|
||||
val->SetURI(display->mBinding);
|
||||
val->SetString(display->mBinding);
|
||||
}
|
||||
else {
|
||||
val->SetString(NS_LITERAL_STRING("none"));
|
||||
val->SetString(NS_LITERAL_STRING(""));
|
||||
}
|
||||
|
||||
return CallQueryInterface(val, &aValue);
|
||||
|
|
Загрузка…
Ссылка в новой задаче