mirror of
https://repo.dactyloidae.xyz/Dactyloidae/UXP.git
synced 2026-09-05 15:28:39 +09:00
Bug 1382357 - Wait to destroy frames until after we've successfully fetched the binding
Tag #1375
This commit is contained in:
parent
6ce9cc2a25
commit
a25be6bc13
1 changed files with 9 additions and 7 deletions
|
|
@ -115,7 +115,15 @@ public:
|
|||
if (!doc)
|
||||
return;
|
||||
|
||||
// Destroy the frames for mBoundElement.
|
||||
// Get the binding.
|
||||
bool ready = false;
|
||||
nsXBLService::GetInstance()->BindingReady(mBoundElement, mBindingURI, &ready);
|
||||
if (!ready)
|
||||
return;
|
||||
|
||||
// Destroy the frames for mBoundElement. Do this after getting the binding,
|
||||
// since if the binding fetch fails then we don't want to destroy the
|
||||
// frames.
|
||||
nsIContent* destroyedFramesFor = nullptr;
|
||||
nsIPresShell* shell = doc->GetShell();
|
||||
if (shell) {
|
||||
|
|
@ -123,12 +131,6 @@ public:
|
|||
}
|
||||
MOZ_ASSERT(!mBoundElement->GetPrimaryFrame());
|
||||
|
||||
// Get the binding.
|
||||
bool ready = false;
|
||||
nsXBLService::GetInstance()->BindingReady(mBoundElement, mBindingURI, &ready);
|
||||
if (!ready)
|
||||
return;
|
||||
|
||||
// If |mBoundElement| is (in addition to having binding |mBinding|)
|
||||
// also a descendant of another element with binding |mBinding|,
|
||||
// then we might have just constructed it due to the
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue