diff --git a/mozilla/content/html/style/src/nsComputedDOMStyle.cpp b/mozilla/content/html/style/src/nsComputedDOMStyle.cpp index da122ce410e..394ec4e3b66 100644 --- a/mozilla/content/html/style/src/nsComputedDOMStyle.cpp +++ b/mozilla/content/html/style/src/nsComputedDOMStyle.cpp @@ -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); diff --git a/mozilla/layout/style/nsComputedDOMStyle.cpp b/mozilla/layout/style/nsComputedDOMStyle.cpp index da122ce410e..394ec4e3b66 100644 --- a/mozilla/layout/style/nsComputedDOMStyle.cpp +++ b/mozilla/layout/style/nsComputedDOMStyle.cpp @@ -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);