Bommels05/Mozilla
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Remove NS_ENSURE macros from my little empire. r=caesar

Browse Source 
git-svn-id: svn://10.0.0.236/trunk@55278 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
waterson%netscape.com
1999-12-04 07:41:07 +00:00
parent 23207ef36f
commit 40b96f684e
5 changed files with 18 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
mozilla/content/xul/content/src/nsXULElement.cpp
View File

@@ -3673,8 +3673,9 @@ nsXULPrototypeScript::Compile(const PRUnichar* aText, PRInt32 aTextLength,
nsCOMPtr<nsIScriptGlobalObject> global;
aDocument->GetScriptGlobalObject(getter_AddRefs(global));
NS_ENSURE_TRUE(global, NS_ERROR_UNEXPECTED);
NS_ASSERTION(global != nsnull, "no script global object");
if (! global)
return NS_ERROR_UNEXPECTED;
nsCOMPtr<nsIScriptContext> context;
rv = global->GetContext(getter_AddRefs(context));

6
mozilla/content/xul/templates/src/nsXULTemplateBuilder.cpp
View File

@@ -2958,11 +2958,13 @@ RDFGenericBuilderImpl::AddDatabasePropertyToHTMLElement(nsIContent* aElement, ns
nsCOMPtr<nsIScriptGlobalObject> global;
doc->GetScriptGlobalObject(getter_AddRefs(global));
NS_ENSURE_TRUE(global, NS_ERROR_UNEXPECTED);
if (! global)
return NS_ERROR_UNEXPECTED;
nsCOMPtr<nsIScriptContext> context;
global->GetContext(getter_AddRefs(context));
NS_ENSURE_TRUE(context, NS_ERROR_UNEXPECTED);
if (! context)
return NS_ERROR_UNEXPECTED;
JSContext* jscontext = NS_STATIC_CAST(JSContext*, context->GetNativeContext());
NS_ASSERTION(context != nsnull, "no jscontext");

6
mozilla/rdf/content/src/nsRDFGenericBuilder.cpp
View File

@@ -2958,11 +2958,13 @@ RDFGenericBuilderImpl::AddDatabasePropertyToHTMLElement(nsIContent* aElement, ns
nsCOMPtr<nsIScriptGlobalObject> global;
doc->GetScriptGlobalObject(getter_AddRefs(global));
NS_ENSURE_TRUE(global, NS_ERROR_UNEXPECTED);
if (! global)
return NS_ERROR_UNEXPECTED;
nsCOMPtr<nsIScriptContext> context;
global->GetContext(getter_AddRefs(context));
NS_ENSURE_TRUE(context, NS_ERROR_UNEXPECTED);
if (! context)
return NS_ERROR_UNEXPECTED;
JSContext* jscontext = NS_STATIC_CAST(JSContext*, context->GetNativeContext());
NS_ASSERTION(context != nsnull, "no jscontext");

5
mozilla/rdf/content/src/nsXULElement.cpp
View File

@@ -3673,8 +3673,9 @@ nsXULPrototypeScript::Compile(const PRUnichar* aText, PRInt32 aTextLength,
nsCOMPtr<nsIScriptGlobalObject> global;
aDocument->GetScriptGlobalObject(getter_AddRefs(global));
NS_ENSURE_TRUE(global, NS_ERROR_UNEXPECTED);
NS_ASSERTION(global != nsnull, "no script global object");
if (! global)
return NS_ERROR_UNEXPECTED;
nsCOMPtr<nsIScriptContext> context;
rv = global->GetContext(getter_AddRefs(context));

6
mozilla/rdf/content/src/nsXULTemplateBuilder.cpp
View File

@@ -2958,11 +2958,13 @@ RDFGenericBuilderImpl::AddDatabasePropertyToHTMLElement(nsIContent* aElement, ns
nsCOMPtr<nsIScriptGlobalObject> global;
doc->GetScriptGlobalObject(getter_AddRefs(global));
NS_ENSURE_TRUE(global, NS_ERROR_UNEXPECTED);
if (! global)
return NS_ERROR_UNEXPECTED;
nsCOMPtr<nsIScriptContext> context;
global->GetContext(getter_AddRefs(context));
NS_ENSURE_TRUE(context, NS_ERROR_UNEXPECTED);
if (! context)
return NS_ERROR_UNEXPECTED;
JSContext* jscontext = NS_STATIC_CAST(JSContext*, context->GetNativeContext());
NS_ASSERTION(context != nsnull, "no jscontext");