From bbcbc48d6ee22cdec5ad440e09d2f1e51b6a5f44 Mon Sep 17 00:00:00 2001 From: "mrbkap%gmail.com" Date: Tue, 18 Nov 2008 02:21:42 +0000 Subject: [PATCH] Bug 451680 - Use a more reliable function to compile and execute XBL. r+sr=bzbarsky a=dveditz git-svn-id: svn://10.0.0.236/trunk@255085 18797224-902f-48f8-a5cc-f745e15eee43 --- mozilla/content/xbl/src/nsXBLProtoImpl.cpp | 6 ++---- mozilla/content/xbl/src/nsXBLProtoImplMethod.cpp | 4 +--- mozilla/content/xbl/src/nsXBLProtoImplProperty.cpp | 4 +--- mozilla/content/xbl/src/nsXBLPrototypeHandler.cpp | 4 +--- 4 files changed, 5 insertions(+), 13 deletions(-) diff --git a/mozilla/content/xbl/src/nsXBLProtoImpl.cpp b/mozilla/content/xbl/src/nsXBLProtoImpl.cpp index 5c3e6fb70c0..a4154208589 100644 --- a/mozilla/content/xbl/src/nsXBLProtoImpl.cpp +++ b/mozilla/content/xbl/src/nsXBLProtoImpl.cpp @@ -64,7 +64,7 @@ nsXBLProtoImpl::InstallImplementation(nsXBLPrototypeBinding* aBinding, nsIConten nsIDocument* document = aBoundElement->GetOwnerDoc(); if (!document) return NS_OK; - nsIScriptGlobalObject *global = document->GetScriptGlobalObject(); + nsIScriptGlobalObject *global = document->GetScopeObject(); if (!global) return NS_OK; nsCOMPtr context = global->GetContext(); @@ -122,9 +122,7 @@ nsXBLProtoImpl::InitTargetObjects(nsXBLPrototypeBinding* aBinding, nsIDocument *ownerDoc = aBoundElement->GetOwnerDoc(); nsIScriptGlobalObject *sgo; - if (!ownerDoc || !(sgo = ownerDoc->GetScriptGlobalObject())) { - NS_ERROR("Can't find global object for bound content!"); - + if (!ownerDoc || !(sgo = ownerDoc->GetScopeObject())) { return NS_ERROR_UNEXPECTED; } diff --git a/mozilla/content/xbl/src/nsXBLProtoImplMethod.cpp b/mozilla/content/xbl/src/nsXBLProtoImplMethod.cpp index dca0a08bc05..2a5b418debb 100644 --- a/mozilla/content/xbl/src/nsXBLProtoImplMethod.cpp +++ b/mozilla/content/xbl/src/nsXBLProtoImplMethod.cpp @@ -132,9 +132,7 @@ nsXBLProtoImplMethod::InstallMember(nsIScriptContext* aContext, nsIDocument *ownerDoc = aBoundElement->GetOwnerDoc(); nsIScriptGlobalObject *sgo; - if (!ownerDoc || !(sgo = ownerDoc->GetScriptGlobalObject())) { - NS_ERROR("Can't find global object for bound content!"); - + if (!ownerDoc || !(sgo = ownerDoc->GetScopeObject())) { return NS_ERROR_UNEXPECTED; } diff --git a/mozilla/content/xbl/src/nsXBLProtoImplProperty.cpp b/mozilla/content/xbl/src/nsXBLProtoImplProperty.cpp index 8834d8665c5..2edef69cb52 100644 --- a/mozilla/content/xbl/src/nsXBLProtoImplProperty.cpp +++ b/mozilla/content/xbl/src/nsXBLProtoImplProperty.cpp @@ -160,9 +160,7 @@ nsXBLProtoImplProperty::InstallMember(nsIScriptContext* aContext, nsIDocument *ownerDoc = aBoundElement->GetOwnerDoc(); nsIScriptGlobalObject *sgo; - if (!ownerDoc || !(sgo = ownerDoc->GetScriptGlobalObject())) { - NS_ERROR("Can't find global object for bound content!"); - + if (!ownerDoc || !(sgo = ownerDoc->GetScopeObject())) { return NS_ERROR_UNEXPECTED; } diff --git a/mozilla/content/xbl/src/nsXBLPrototypeHandler.cpp b/mozilla/content/xbl/src/nsXBLPrototypeHandler.cpp index bb328c27a8c..851e4600dc3 100644 --- a/mozilla/content/xbl/src/nsXBLPrototypeHandler.cpp +++ b/mozilla/content/xbl/src/nsXBLPrototypeHandler.cpp @@ -302,11 +302,9 @@ nsXBLPrototypeHandler::ExecuteHandler(nsPIDOMEventTarget* aTarget, return NS_OK; } - boundGlobal = boundDocument->GetScriptGlobalObject(); + boundGlobal = boundDocument->GetScopeObject(); } - // If we still don't have a 'boundGlobal', we're doomed. bug 95465. - NS_ASSERTION(boundGlobal, "failed to get the nsIScriptGlobalObject. bug 95465?"); if (!boundGlobal) return NS_OK;