Moved text and comment code out of HTML-specific directories. Completed CloneNode for elements. Completed factory methods for intersection of XML and HTML.
git-svn-id: svn://10.0.0.236/trunk@17775 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
@@ -1237,7 +1237,7 @@ SinkContext::FlushText(PRBool* aDidFlush)
|
||||
nsresult rv = NS_OK;
|
||||
PRBool didFlush = PR_FALSE;
|
||||
if (0 != mTextLength) {
|
||||
nsIHTMLContent* content;
|
||||
nsIContent* content;
|
||||
rv = NS_NewTextNode(&content);
|
||||
if (NS_OK == rv) {
|
||||
// Set the content's document
|
||||
|
||||
@@ -72,7 +72,6 @@ static NS_DEFINE_IID(kIDocumentIID, NS_IDOCUMENT_IID);
|
||||
static NS_DEFINE_IID(kIContentIID, NS_ICONTENT_IID);
|
||||
static NS_DEFINE_IID(kIDOMElementIID, NS_IDOMELEMENT_IID);
|
||||
static NS_DEFINE_IID(kIDOMTextIID, NS_IDOMTEXT_IID);
|
||||
static NS_DEFINE_IID(kIDOMCommentIID, NS_IDOMCOMMENT_IID);
|
||||
static NS_DEFINE_IID(kIDOMNodeIID, NS_IDOMNODE_IID);
|
||||
static NS_DEFINE_IID(kIHTMLDocumentIID, NS_IHTMLDOCUMENT_IID);
|
||||
static NS_DEFINE_IID(kIDOMHTMLDocumentIID, NS_IDOMHTMLDOCUMENT_IID);
|
||||
@@ -532,35 +531,6 @@ nsHTMLDocument::CreateElement(const nsString& aTagName,
|
||||
return rv;
|
||||
}
|
||||
|
||||
NS_IMETHODIMP
|
||||
nsHTMLDocument::CreateTextNode(const nsString& aData, nsIDOMText** aTextNode)
|
||||
{
|
||||
nsIHTMLContent* text = nsnull;
|
||||
nsresult rv = NS_NewTextNode(&text);
|
||||
|
||||
if (NS_OK == rv) {
|
||||
rv = text->QueryInterface(kIDOMTextIID, (void**)aTextNode);
|
||||
(*aTextNode)->AppendData(aData);
|
||||
}
|
||||
|
||||
return rv;
|
||||
}
|
||||
|
||||
|
||||
NS_IMETHODIMP
|
||||
nsHTMLDocument::CreateComment(const nsString& aData, nsIDOMComment** aReturn)
|
||||
{
|
||||
nsIHTMLContent* comment = nsnull;
|
||||
nsresult rv = NS_NewCommentNode(&comment);
|
||||
|
||||
if (NS_OK == rv) {
|
||||
rv = comment->QueryInterface(kIDOMCommentIID, (void**)aReturn);
|
||||
(*aReturn)->AppendData(aData);
|
||||
}
|
||||
|
||||
return rv;
|
||||
}
|
||||
|
||||
NS_IMETHODIMP
|
||||
nsHTMLDocument::CreateProcessingInstruction(const nsString& aTarget,
|
||||
const nsString& aData,
|
||||
|
||||
@@ -90,13 +90,15 @@ public:
|
||||
NS_IMETHOD CreateEntityReference(const nsString& aName, nsIDOMEntityReference** aReturn);
|
||||
NS_IMETHOD CreateDocumentFragment(nsIDOMDocumentFragment** aReturn)
|
||||
{ return nsDocument::CreateDocumentFragment(aReturn); }
|
||||
NS_IMETHOD CreateComment(const nsString& aData, nsIDOMComment** aReturn);
|
||||
NS_IMETHOD CreateComment(const nsString& aData, nsIDOMComment** aReturn)
|
||||
{ return nsDocument::CreateComment(aData, aReturn); }
|
||||
NS_IMETHOD CreateProcessingInstruction(const nsString& aTarget, const nsString& aData, nsIDOMProcessingInstruction** aReturn);
|
||||
NS_IMETHOD CreateAttribute(const nsString& aName, nsIDOMAttr** aReturn)
|
||||
{ return nsDocument::CreateAttribute(aName, aReturn); }
|
||||
NS_IMETHOD CreateElement(const nsString& aTagName,
|
||||
nsIDOMElement** aReturn);
|
||||
NS_IMETHOD CreateTextNode(const nsString& aData, nsIDOMText** aReturn);
|
||||
NS_IMETHOD CreateTextNode(const nsString& aData, nsIDOMText** aReturn)
|
||||
{ return nsDocument::CreateTextNode(aData, aReturn); }
|
||||
NS_IMETHOD GetElementsByTagName(const nsString& aTagname, nsIDOMNodeList** aReturn)
|
||||
{ return nsDocument::GetElementsByTagName(aTagname, aReturn); }
|
||||
|
||||
|
||||
Reference in New Issue
Block a user