Backed out changeset bf998120b814 (bug 1326023) for hazard failure. r=backout

This commit is contained in:
Sebastian Hengst 2016-12-29 15:04:11 +01:00
Родитель c0c0027fee
Коммит d31ab3acdd
2 изменённых файлов: 6 добавлений и 4 удалений

Просмотреть файл

@ -448,6 +448,7 @@ Element::GetBindingURL(nsIDocument *aDocument, css::URLValue **aResult)
nsCOMPtr<nsIPresShell> shell = aDocument->GetShell();
if (!shell || GetPrimaryFrame() || !isXULorPluginElement) {
*aResult = nullptr;
return true;
}
@ -456,7 +457,8 @@ Element::GetBindingURL(nsIDocument *aDocument, css::URLValue **aResult)
nsComputedDOMStyle::GetStyleContextForElementNoFlush(this, nullptr, shell);
NS_ENSURE_TRUE(sc, false);
NS_IF_ADDREF(*aResult = sc->StyleDisplay()->mBinding);
*aResult = sc->StyleDisplay()->mBinding;
return true;
}
@ -533,8 +535,8 @@ Element::WrapObject(JSContext *aCx, JS::Handle<JSObject*> aGivenProto)
// Make sure the style context goes away _before_ we load the binding
// since that can destroy the relevant presshell.
RefPtr<css::URLValue> bindingURL;
bool ok = GetBindingURL(doc, getter_AddRefs(bindingURL));
mozilla::css::URLValue *bindingURL;
bool ok = GetBindingURL(doc, &bindingURL);
if (!ok) {
dom::Throw(aCx, NS_ERROR_FAILURE);
return nullptr;

Просмотреть файл

@ -387,7 +387,7 @@ public:
}
}
bool GetBindingURL(nsIDocument* aDocument, css::URLValue **aResult);
bool GetBindingURL(nsIDocument *aDocument, css::URLValue **aResult);
// The bdi element defaults to dir=auto if it has no dir attribute set.
// Other elements will only have dir=auto if they have an explicit dir=auto,