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

fixing leak from earlier chekin. copied code, dont look at me. r=scc bug=34896

Browse Source
This commit is contained in:
mjudge@netscape.com
2000-06-09 04:19:09 +00:00
parent b7f845e65f
commit 6dd64a1dbe
2 changed files with 76 additions and 70 deletions
Download Patch File Download Diff File Expand all files Collapse all files

73
content/html/document/src/nsHTMLDocument.cpp
View File

@@ -104,6 +104,8 @@
#include "nsIDocumentEncoder.h" //for outputting selection #include "nsIDocumentEncoder.h" //for outputting selection
#include "nsIBookmarksService.h" #include "nsIBookmarksService.h"
#include "nsIXMLContent.h" //for createelementNS #include "nsIXMLContent.h" //for createelementNS
#include "nsHTMLParts.h" //for createelementNS
#define DETECTOR_PROGID_MAX 127 #define DETECTOR_PROGID_MAX 127
static char g_detector_progid[DETECTOR_PROGID_MAX + 1]; static char g_detector_progid[DETECTOR_PROGID_MAX + 1];
@@ -1259,6 +1261,42 @@ nsHTMLDocument::FlushPendingNotifications()
return result; return result;
} }
NS_IMETHODIMP
nsHTMLDocument::CreateElementNS(const nsString& aNamespaceURI,
const nsString& aQualifiedName,
nsIDOMElement** aReturn)
{
nsresult rv = NS_OK;
nsCOMPtr<nsINodeInfo> nodeInfo;
rv = mNodeInfoManager->GetNodeInfo(aQualifiedName, aNamespaceURI,
*getter_AddRefs(nodeInfo));
NS_ENSURE_SUCCESS(rv, rv);
PRInt32 namespaceID;
nodeInfo->GetNamespaceID(namespaceID);
nsCOMPtr<nsIContent> content;
if (namespaceID == kNameSpaceID_HTML) {
nsCOMPtr<nsIHTMLContent> htmlContent;
rv = NS_CreateHTMLElement(getter_AddRefs(htmlContent), nodeInfo);
content = do_QueryInterface(htmlContent);
}
else {
nsCOMPtr<nsIXMLContent> xmlContent;
rv = NS_NewXMLElement(getter_AddRefs(xmlContent), nodeInfo);
content = do_QueryInterface(xmlContent);
}
NS_ENSURE_SUCCESS(rv, rv);
content->SetContentID(mNextContentID++);
return content->QueryInterface(kIDOMElementIID, (void**)aReturn);
}
// //
// nsIDOMDocument interface implementation // nsIDOMDocument interface implementation
// //
@@ -2195,41 +2233,6 @@ nsHTMLDocument::ImportNode(nsIDOMNode* aImportedNode,
return NS_ERROR_NOT_IMPLEMENTED; return NS_ERROR_NOT_IMPLEMENTED;
} }
NS_IMETHODIMP
nsHTMLDocument::CreateElementNS(const nsString& aNamespaceURI,
const nsString& aQualifiedName,
nsIDOMElement** aReturn)
{
nsresult rv = NS_OK;
nsCOMPtr<nsINodeInfo> nodeInfo;
rv = mNodeInfoManager->GetNodeInfo(aQualifiedName, aNamespaceURI,
*getter_AddRefs(nodeInfo));
NS_ENSURE_SUCCESS(rv, rv);
PRInt32 namespaceID;
nodeInfo->GetNamespaceID(namespaceID);
nsIContent* content;
if (namespaceID == kNameSpaceID_HTML) {
nsIHTMLContent* htmlContent;
rv = NS_CreateHTMLElement(&htmlContent, nodeInfo);
content = (nsIContent*)htmlContent;
}
else {
nsIXMLContent* xmlContent;
rv = NS_NewXMLElement(&xmlContent, nodeInfo);
content = NS_STATIC_CAST(nsIXMLContent *, xmlContent);
}
NS_ENSURE_SUCCESS(rv, rv);
content->SetContentID(mNextContentID++);
return content->QueryInterface(kIDOMElementIID, (void**)aReturn);
}
NS_IMETHODIMP NS_IMETHODIMP
nsHTMLDocument::CreateAttributeNS(const nsString& aNamespaceURI, nsHTMLDocument::CreateAttributeNS(const nsString& aNamespaceURI,
const nsString& aQualifiedName, const nsString& aQualifiedName,

73
layout/html/document/src/nsHTMLDocument.cpp
View File

@@ -104,6 +104,8 @@
#include "nsIDocumentEncoder.h" //for outputting selection #include "nsIDocumentEncoder.h" //for outputting selection
#include "nsIBookmarksService.h" #include "nsIBookmarksService.h"
#include "nsIXMLContent.h" //for createelementNS #include "nsIXMLContent.h" //for createelementNS
#include "nsHTMLParts.h" //for createelementNS
#define DETECTOR_PROGID_MAX 127 #define DETECTOR_PROGID_MAX 127
static char g_detector_progid[DETECTOR_PROGID_MAX + 1]; static char g_detector_progid[DETECTOR_PROGID_MAX + 1];
@@ -1259,6 +1261,42 @@ nsHTMLDocument::FlushPendingNotifications()
return result; return result;
} }
NS_IMETHODIMP
nsHTMLDocument::CreateElementNS(const nsString& aNamespaceURI,
const nsString& aQualifiedName,
nsIDOMElement** aReturn)
{
nsresult rv = NS_OK;
nsCOMPtr<nsINodeInfo> nodeInfo;
rv = mNodeInfoManager->GetNodeInfo(aQualifiedName, aNamespaceURI,
*getter_AddRefs(nodeInfo));
NS_ENSURE_SUCCESS(rv, rv);
PRInt32 namespaceID;
nodeInfo->GetNamespaceID(namespaceID);
nsCOMPtr<nsIContent> content;
if (namespaceID == kNameSpaceID_HTML) {
nsCOMPtr<nsIHTMLContent> htmlContent;
rv = NS_CreateHTMLElement(getter_AddRefs(htmlContent), nodeInfo);
content = do_QueryInterface(htmlContent);
}
else {
nsCOMPtr<nsIXMLContent> xmlContent;
rv = NS_NewXMLElement(getter_AddRefs(xmlContent), nodeInfo);
content = do_QueryInterface(xmlContent);
}
NS_ENSURE_SUCCESS(rv, rv);
content->SetContentID(mNextContentID++);
return content->QueryInterface(kIDOMElementIID, (void**)aReturn);
}
// //
// nsIDOMDocument interface implementation // nsIDOMDocument interface implementation
// //
@@ -2195,41 +2233,6 @@ nsHTMLDocument::ImportNode(nsIDOMNode* aImportedNode,
return NS_ERROR_NOT_IMPLEMENTED; return NS_ERROR_NOT_IMPLEMENTED;
} }
NS_IMETHODIMP
nsHTMLDocument::CreateElementNS(const nsString& aNamespaceURI,
const nsString& aQualifiedName,
nsIDOMElement** aReturn)
{
nsresult rv = NS_OK;
nsCOMPtr<nsINodeInfo> nodeInfo;
rv = mNodeInfoManager->GetNodeInfo(aQualifiedName, aNamespaceURI,
*getter_AddRefs(nodeInfo));
NS_ENSURE_SUCCESS(rv, rv);
PRInt32 namespaceID;
nodeInfo->GetNamespaceID(namespaceID);
nsIContent* content;
if (namespaceID == kNameSpaceID_HTML) {
nsIHTMLContent* htmlContent;
rv = NS_CreateHTMLElement(&htmlContent, nodeInfo);
content = (nsIContent*)htmlContent;
}
else {
nsIXMLContent* xmlContent;
rv = NS_NewXMLElement(&xmlContent, nodeInfo);
content = NS_STATIC_CAST(nsIXMLContent *, xmlContent);
}
NS_ENSURE_SUCCESS(rv, rv);
content->SetContentID(mNextContentID++);
return content->QueryInterface(kIDOMElementIID, (void**)aReturn);
}
NS_IMETHODIMP NS_IMETHODIMP
nsHTMLDocument::CreateAttributeNS(const nsString& aNamespaceURI, nsHTMLDocument::CreateAttributeNS(const nsString& aNamespaceURI,
const nsString& aQualifiedName, const nsString& aQualifiedName,