corysanin/tubestation
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Activity

merge m-c to fx-team

Browse Source
This commit is contained in:
Rob Campbell
2011-09-20 11:42:20 -03:00
parent 25b0abdab9 48b4d40d83
commit 16e29b4813
578 changed files with 14658 additions and 7508 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
content/html/document/src/nsHTMLContentSink.cpp
View File

@@ -1544,7 +1544,7 @@ IsScriptEnabled(nsIDocument *aDoc, nsIDocShell *aContainer)
nsIScriptContext *scriptContext = globalObject->GetContext();
NS_ENSURE_TRUE(scriptContext, PR_TRUE);
JSContext* cx = (JSContext *) scriptContext->GetNativeContext();
JSContext* cx = scriptContext->GetNativeContext();
NS_ENSURE_TRUE(cx, PR_TRUE);
PRBool enabled = PR_TRUE;
@@ -2452,7 +2452,7 @@ HTMLContentSink::AddDocTypeDecl(const nsIParserNode& aNode)
nsAutoString voidString;
voidString.SetIsVoid(PR_TRUE);
rv = NS_NewDOMDocumentType(getter_AddRefs(docType),
mDocument->NodeInfoManager(), nsnull, nameAtom,
mDocument->NodeInfoManager(), nameAtom,
publicId, systemId, voidString);
NS_ENSURE_SUCCESS(rv, rv);