wine/gecko
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-gecko.git synced 2024-09-13 09:24:08 -07:00
Code Issues Packages Projects Releases Wiki Activity

Bug 747247: Fix assertions about null owners. r=khuey

Browse Source
This commit is contained in:
Ben Turner 2012-05-16 15:08:18 -07:00
parent ba7194aa4f
commit 9a9fb53b34
1 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
dom/indexedDB/IDBDatabase.cpp
View File

@ -112,7 +112,7 @@ public:
void OnError()
{
NS_ASSERTION(mTransaction->IsAborted(), "How else can this fail?!");
NS_ASSERTION(mTransaction->IsAborted(), "How elsehttps://bugzilla.mozilla.org/attachment.cgi?id=616806 can this fail?!");
}
private:
@ -222,7 +222,10 @@ IDBDatabase::Invalidate()
// When the IndexedDatabaseManager needs to invalidate databases, all it has
// is an origin, so we call back into the manager to cancel any prompts for
// our owner.
IndexedDatabaseManager::CancelPromptsForWindow(GetOwner());
nsPIDOMWindow* owner = GetOwner();
if (owner) {
IndexedDatabaseManager::CancelPromptsForWindow(owner);
}
mInvalidated = true;
}
@ -284,8 +287,6 @@ void
IDBDatabase::OnUnlink()
{
NS_ASSERTION(NS_IsMainThread(), "Wrong thread!");
NS_ASSERTION(!GetOwner() && !GetScriptOwner(),
"Should have been cleared already!");
// We've been unlinked, at the very least we should be able to prevent further
// transactions from starting and unblock any other SetVersion callers.
@ -680,7 +681,8 @@ IDBDatabase::PostHandleEvent(nsEventChainPostVisitor& aVisitor)
{
NS_ENSURE_TRUE(aVisitor.mDOMEvent, NS_ERROR_UNEXPECTED);
if (!GetOwner()) {
nsPIDOMWindow* owner = GetOwner();
if (!owner) {
return NS_OK;
}
@ -694,7 +696,7 @@ IDBDatabase::PostHandleEvent(nsEventChainPostVisitor& aVisitor)
CreateGenericEvent(type, eDoesNotBubble, eNotCancelable);
NS_ENSURE_STATE(duplicateEvent);
nsCOMPtr<nsIDOMEventTarget> target(do_QueryInterface(GetOwner()));
nsCOMPtr<nsIDOMEventTarget> target(do_QueryInterface(owner));
NS_ASSERTION(target, "How can this happen?!");
bool dummy;