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

Bug 123343. Make <base> and <meta http-equiv=".."> work in XSLT generated pages. Also adds keeping track of stylesheet index for inserted stylesheets.

Browse Source 
r=peterv sr=jst a=roc+moz


git-svn-id: svn://10.0.0.236/trunk@116419 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
sicking%bigfoot.com
2002-03-12 21:03:34 +00:00
parent 4c9ca3c3e8
commit cd8f65fca1
7 changed files with 247 additions and 131 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
mozilla/extensions/transformiix/build/Makefile.in
View File

@@ -46,6 +46,9 @@ REQUIRES = xpcom \
caps \
locale \
unicharutil \
htmlparser \
webshell \
docshell \
$(NULL)
IS_COMPONENT = 1
MODULE_NAME = TransformiixModule

3
mozilla/extensions/transformiix/build/makefile.win
View File

@@ -30,6 +30,9 @@ REQUIRES = xpcom \
content \
xpconnect \
js \
htmlparser \
webshell \
docshell \
$(NULL)
include <$(DEPTH)/config/config.mak>

3
mozilla/extensions/transformiix/source/xslt/Makefile.in
View File

@@ -41,6 +41,9 @@ REQUIRES = string \
unicharutil \
xpconnect \
js \
htmlparser \
webshell \
docshell \
$(NULL)
endif

3
mozilla/extensions/transformiix/source/xslt/makefile.win
View File

@@ -31,6 +31,9 @@ REQUIRES = string \
unicharutil \
xpconnect \
js \
htmlparser \
webshell \
docshell \
$(NULL)
include <$(DEPTH)/config/config.mak>

5
mozilla/extensions/transformiix/source/xslt/txHTMLAtomList.h
View File

@@ -44,6 +44,7 @@ TX_ATOM(button, "button");
TX_ATOM(checked, "checked");
TX_ATOM(col, "col");
TX_ATOM(compact, "compact");
TX_ATOM(content, "content");
TX_ATOM(declare, "declare");
TX_ATOM(defer, "defer");
TX_ATOM(dir, "dir");
@@ -53,6 +54,8 @@ TX_ATOM(frame, "frame");
TX_ATOM(headerDefaultStyle, "default-style");
TX_ATOM(head, "head");
TX_ATOM(hr, "hr");
TX_ATOM(href, "href");
TX_ATOM(httpEquiv, "http-equiv");
TX_ATOM(img, "img");
TX_ATOM(input, "input");
TX_ATOM(isindex, "isindex");
@@ -73,12 +76,14 @@ TX_ATOM(option, "option");
TX_ATOM(p, "p");
TX_ATOM(param, "param");
TX_ATOM(readonly, "readonly");
TX_ATOM(refresh, "refresh");
TX_ATOM(script, "script");
TX_ATOM(select, "select");
TX_ATOM(selected, "selected");
TX_ATOM(src, "src");
TX_ATOM(style, "style");
TX_ATOM(table, "table");
TX_ATOM(target, "target");
TX_ATOM(td, "td");
TX_ATOM(textarea, "textarea");
TX_ATOM(th, "th");

346
mozilla/extensions/transformiix/source/xslt/txMozillaXMLOutput.cpp
View File

@@ -49,6 +49,11 @@
#include "nsIDOMNSDocument.h"
#include "nsUnicharUtils.h"
#include "txAtoms.h"
#include "nsIParser.h"
#include "nsNetUtil.h"
#include "nsIScriptGlobalObject.h"
#include "nsIRefreshURI.h"
#include "nsIDocShell.h"
#define kXHTMLNameSpaceURI "http://www.w3.org/1999/xhtml"
#define kTXNameSpaceURI "http://www.mozilla.org/TransforMiix"
@@ -128,12 +133,28 @@ void txMozillaXMLOutput::disableStylesheetLoad()
void txMozillaXMLOutput::endDocument()
{
closePrevious(eCloseElement | eFlushText);
if (!mHaveTitle) {
if (!mHaveTitleElement) {
nsCOMPtr<nsIDOMNSDocument> domDoc = do_QueryInterface(mDocument);
if (domDoc) {
domDoc->SetTitle(NS_LITERAL_STRING(""));
}
}
if (!mRefreshString.IsEmpty()) {
nsCOMPtr<nsIDocument> doc = do_QueryInterface(mDocument);
nsCOMPtr<nsIScriptGlobalObject> sgo;
doc->GetScriptGlobalObject(getter_AddRefs(sgo));
if (sgo) {
nsCOMPtr<nsIDocShell> docShell;
sgo->GetDocShell(getter_AddRefs(docShell));
nsCOMPtr<nsIRefreshURI> refURI = do_QueryInterface(docShell);
if (refURI) {
nsCOMPtr<nsIURI> baseURI;
doc->GetBaseURL(*getter_AddRefs(baseURI));
refURI->SetupRefreshURIFromHeader(baseURI, mRefreshString);
}
}
}
}
void txMozillaXMLOutput::endElement(const String& aName, const PRInt32 aNsID)
@@ -147,88 +168,40 @@ void txMozillaXMLOutput::endElement(const String& aName, const PRInt32 aNsID)
closePrevious(eCloseElement | eFlushText);
nsresult rv;
nsCOMPtr<nsIContent> currentContent = do_QueryInterface(mCurrentNode, &rv);
NS_ASSERTION(NS_SUCCEEDED(rv), "Can't QI to nsIContent");
if (!currentContent)
return;
nsCOMPtr<nsIAtom> atom;
currentContent->GetTag(*getter_AddRefs(atom));
PRBool isHTML = (mOutputFormat.mMethod == eHTMLOutput) &&
(aNsID == kNameSpaceID_None);
if (isHTML && (atom == txHTMLAtoms::table)) {
// Check if we have any table section.
nsCOMPtr<nsIDOMHTMLTableSectionElement> section;
nsCOMPtr<nsIContent> childContent;
PRInt32 count, i = 0;
currentContent->ChildCount(count);
while (!section && (i < count)) {
rv = currentContent->ChildAt(i, *getter_AddRefs(childContent));
NS_ASSERTION(NS_SUCCEEDED(rv), "Something went wrong while getting a child");
section = do_QueryInterface(childContent);
++i;
}
if (!section && (count > 0)) {
// If no section, wrap table's children in a tbody.
nsCOMPtr<nsIDOMElement> wrapper;
rv = mDocument->CreateElementNS(NS_LITERAL_STRING(kXHTMLNameSpaceURI),
NS_LITERAL_STRING("tbody"),
getter_AddRefs(wrapper));
NS_ASSERTION(NS_SUCCEEDED(rv), "Can't create tbody element");
if (wrapper) {
nsCOMPtr<nsIDOMNode> resultNode;
wrapChildren(mCurrentNode, wrapper);
rv = mCurrentNode->AppendChild(wrapper, getter_AddRefs(resultNode));
NS_ASSERTION(NS_SUCCEEDED(rv), "Can't append tbody element");
}
}
}
else if (isHTML || (aNsID == kNameSpaceID_HTML)) {
if (mScriptParent && (atom == txHTMLAtoms::script)) {
// Add this script element to the array of loading script elements.
nsCOMPtr<nsIDOMHTMLScriptElement> scriptElement = do_QueryInterface(mCurrentNode, &rv);
NS_ASSERTION(NS_SUCCEEDED(rv), "Need script element");
if (!mScriptElements)
rv = NS_NewISupportsArray(getter_AddRefs(mScriptElements));
NS_ASSERTION(NS_SUCCEEDED(rv), "Can't create array");
if (NS_SUCCEEDED(rv))
mScriptElements->AppendElement(scriptElement);
// Add the script element to the tree.
nsCOMPtr<nsIDocument> document = do_QueryInterface(mScriptParent);
if (document && !mRootContent) {
mRootContent = do_QueryInterface(mCurrentNode);
mRootContent->SetDocument(document, PR_FALSE, PR_TRUE);
document->SetRootContent(mRootContent);
}
else {
nsCOMPtr<nsIDOMNode> resultNode;
rv = mScriptParent->AppendChild(mCurrentNode,
getter_AddRefs(resultNode));
NS_ASSERTION(NS_SUCCEEDED(rv), "Can't append script element");
}
mScriptParent = nsnull;
}
else if (mStyleElement && (atom == txHTMLAtoms::style)) {
if (!mDisableStylesheetLoad) {
mStyleElement->SetEnableUpdates(PR_TRUE);
mStyleElement->UpdateStyleSheet(PR_TRUE, nsnull, -1);
}
mStyleElement = nsnull;
}
// Handle html-elements
if ((mOutputFormat.mMethod == eHTMLOutput && aNsID == kNameSpaceID_None) ||
aNsID == kNameSpaceID_XHTML) {
nsCOMPtr<nsIDOMElement> element = do_QueryInterface(mCurrentNode);
NS_ASSERTION(element, "endElement'ing non-element");
endHTMLElement(element, aNsID == kNameSpaceID_XHTML);
}
nsCOMPtr<nsIDOMNode> tempNode = mCurrentNode;
tempNode->GetParentNode(getter_AddRefs(mCurrentNode));
// Add the element to the tree if it wasn't added before and take one step
// up the tree
// we can't use GetParentNode to check if mCurrentNode is the
// "non-added node" since that does strange things when we've called
// SetDocument manually
if (mCurrentNode == mNonAddedNode) {
nsCOMPtr<nsIDocument> document = do_QueryInterface(mNonAddedParent);
if (document && !mRootContent) {
mRootContent = do_QueryInterface(mCurrentNode);
mRootContent->SetDocument(document, PR_FALSE, PR_TRUE);
document->SetRootContent(mRootContent);
}
else {
nsCOMPtr<nsIDOMNode> resultNode;
mNonAddedParent->AppendChild(mCurrentNode,
getter_AddRefs(resultNode));
}
mCurrentNode = mNonAddedParent;
mNonAddedParent = nsnull;
mNonAddedNode = nsnull;
}
else {
nsCOMPtr<nsIDOMNode> parent;
mCurrentNode->GetParentNode(getter_AddRefs(parent));
mCurrentNode = parent;
}
}
nsresult txMozillaXMLOutput::getRootContent(nsIContent** aReturn)
@@ -263,10 +236,24 @@ void txMozillaXMLOutput::processingInstruction(const String& aTarget, const Stri
getter_AddRefs(pi));
NS_ASSERTION(NS_SUCCEEDED(rv), "Can't create entity reference");
nsCOMPtr<nsIDOMNode> node = do_QueryInterface(pi);
nsCOMPtr<nsIStyleSheetLinkingElement> ssle = do_QueryInterface(pi);
if (ssle) {
ssle->InitStyleLinkElement(nsnull, PR_FALSE);
ssle->SetEnableUpdates(PR_FALSE);
}
nsCOMPtr<nsIDOMNode> resultNode;
mCurrentNode->AppendChild(node, getter_AddRefs(resultNode));
mCurrentNode->AppendChild(pi, getter_AddRefs(resultNode));
NS_ASSERTION(NS_SUCCEEDED(rv), "Can't append entity reference");
if (NS_FAILED(rv))
return;
if (ssle) {
ssle->SetEnableUpdates(PR_TRUE);
rv = ssle->UpdateStyleSheet(PR_TRUE, nsnull, mStyleSheetCount);
if (NS_SUCCEEDED(rv) || (rv == NS_ERROR_HTMLPARSER_BLOCK))
mStyleSheetCount++;
}
}
void txMozillaXMLOutput::removeScriptElement(nsIDOMHTMLScriptElement *aElement)
@@ -286,7 +273,12 @@ void txMozillaXMLOutput::setOutputDocument(nsIDOMDocument* aDocument)
mDocument = aDocument;
mCurrentNode = mDocument;
mHaveTitle = PR_FALSE;
mStyleSheetCount = 0;
mHaveTitleElement = PR_FALSE;
mHaveBaseElement = PR_FALSE;
mNonAddedParent = nsnull;
mNonAddedNode = nsnull;
mRefreshString.Truncate();
nsCOMPtr<nsIDocument> doc = do_QueryInterface(aDocument);
doc->GetNameSpaceManager(*getter_AddRefs(mNameSpaceManager));
@@ -338,6 +330,7 @@ void txMozillaXMLOutput::startElement(const String& aName,
}
nsCOMPtr<nsIDOMElement> element;
mDontAddCurrent = PR_FALSE;
if ((mOutputFormat.mMethod == eHTMLOutput) && (aNsID == kNameSpaceID_None)) {
// Outputting HTML as XHTML, lowercase element names
@@ -377,12 +370,9 @@ void txMozillaXMLOutput::closePrevious(PRInt8 aAction)
nsresult rv;
PRInt32 namespaceID = kNameSpaceID_None;
nsCOMPtr<nsIContent> currentContent = do_QueryInterface(mCurrentNode, &rv);
nsCOMPtr<nsIContent> currentContent = do_QueryInterface(mCurrentNode);
if (currentContent)
currentContent->GetNameSpaceID(namespaceID);
PRBool isHTML = (namespaceID == kNameSpaceID_HTML) ||
((mOutputFormat.mMethod == eHTMLOutput) &&
(namespaceID == kNameSpaceID_None));
if ((aAction & eCloseElement) && mParentNode) {
nsCOMPtr<nsIDocument> document = do_QueryInterface(mParentNode);
@@ -406,28 +396,11 @@ void txMozillaXMLOutput::closePrevious(PRInt8 aAction)
document->SetRootContent(mRootContent);
}
PRBool appendNode = PR_TRUE;
if (isHTML) {
nsCOMPtr<nsIAtom> atom;
currentContent->GetTag(*getter_AddRefs(atom));
if (atom == txHTMLAtoms::script) {
appendNode = PR_FALSE;
mScriptParent = mParentNode;
}
else if (atom == txHTMLAtoms::style) {
mStyleElement = do_QueryInterface(mCurrentNode);
if (mStyleElement) {
// XXX Trick nsCSSLoader into blocking/notifying us?
// We would need to implement nsIParser and
// pass ourselves as first parameter to
// InitStyleLinkElement. We would then be notified
// of stylesheet loads/load failures.
mStyleElement->InitStyleLinkElement(nsnull, PR_FALSE);
mStyleElement->SetEnableUpdates(PR_FALSE);
}
}
if (mDontAddCurrent && !mNonAddedParent) {
mNonAddedParent = mParentNode;
mNonAddedNode = mCurrentNode;
}
if (appendNode) {
else {
if (document && !mRootContent) {
mRootContent = do_QueryInterface(mCurrentNode);
mRootContent->SetDocument(document, PR_FALSE, PR_TRUE);
@@ -447,25 +420,10 @@ void txMozillaXMLOutput::closePrevious(PRInt8 aAction)
rv = mDocument->CreateTextNode(mText, getter_AddRefs(text));
NS_ASSERTION(NS_SUCCEEDED(rv), "Can't create text node");
nsCOMPtr<nsIDOMNode> node = do_QueryInterface(text);
nsCOMPtr<nsIDOMNode> resultNode;
mCurrentNode->AppendChild(node, getter_AddRefs(resultNode));
mCurrentNode->AppendChild(text, getter_AddRefs(resultNode));
NS_ASSERTION(NS_SUCCEEDED(rv), "Can't append text node");
if (currentContent && !mHaveTitle) {
nsCOMPtr<nsIAtom> atom;
currentContent->GetTag(*getter_AddRefs(atom));
if ((atom == txHTMLAtoms::title) && mTitleElement) {
// The first title wins
mHaveTitle = PR_TRUE;
nsCOMPtr<nsIDOMNSDocument> domDoc = do_QueryInterface(mDocument);
if (domDoc) {
mText.CompressWhitespace();
domDoc->SetTitle(mText);
}
mTitleElement = nsnull;
}
}
mText.Truncate();
}
}
@@ -476,11 +434,145 @@ void txMozillaXMLOutput::startHTMLElement(nsIDOMElement* aElement)
nsCOMPtr<nsIContent> content = do_QueryInterface(aElement);
content->GetTag(*getter_AddRefs(atom));
if ((atom == txHTMLAtoms::title) && !mHaveTitle) {
mTitleElement = aElement;
mDontAddCurrent = (atom == txHTMLAtoms::script);
nsCOMPtr<nsIStyleSheetLinkingElement> ssle =
do_QueryInterface(aElement);
if (ssle) {
// XXX Trick nsCSSLoader into blocking/notifying us?
// We would need to implement nsIParser and
// pass ourselves as first parameter to
// InitStyleLinkElement. We would then be notified
// of stylesheet loads/load failures.
ssle->InitStyleLinkElement(nsnull, PR_FALSE);
ssle->SetEnableUpdates(PR_FALSE);
}
}
void txMozillaXMLOutput::endHTMLElement(nsIDOMElement* aElement,
PRBool aXHTML)
{
nsresult rv;
nsCOMPtr<nsIContent> content = do_QueryInterface(aElement);
NS_ASSERTION(content, "Can't QI to nsIContent");
nsCOMPtr<nsIAtom> atom;
content->GetTag(*getter_AddRefs(atom));
// add <tbody> to tables if there is none (not in xhtml)
if (atom == txHTMLAtoms::table && !aXHTML) {
// Check if we have any table section.
nsCOMPtr<nsIDOMHTMLTableSectionElement> section;
nsCOMPtr<nsIContent> childContent;
PRInt32 count, i = 0;
content->ChildCount(count);
while (!section && (i < count)) {
rv = content->ChildAt(i, *getter_AddRefs(childContent));
NS_ASSERTION(NS_SUCCEEDED(rv), "Something went wrong while getting a child");
section = do_QueryInterface(childContent);
++i;
}
if (!section && (count > 0)) {
// If no section, wrap table's children in a tbody.
nsCOMPtr<nsIDOMElement> wrapper;
rv = mDocument->CreateElementNS(NS_LITERAL_STRING(kXHTMLNameSpaceURI),
NS_LITERAL_STRING("tbody"),
getter_AddRefs(wrapper));
NS_ASSERTION(NS_SUCCEEDED(rv), "Can't create tbody element");
if (wrapper) {
nsCOMPtr<nsIDOMNode> resultNode;
wrapChildren(mCurrentNode, wrapper);
rv = mCurrentNode->AppendChild(wrapper, getter_AddRefs(resultNode));
NS_ASSERTION(NS_SUCCEEDED(rv), "Can't append tbody element");
}
}
}
// Load scripts
else if (atom == txHTMLAtoms::script) {
// Add this script element to the array of loading script elements.
nsCOMPtr<nsIDOMHTMLScriptElement> scriptElement =
do_QueryInterface(mCurrentNode);
NS_ASSERTION(scriptElement, "Need script element");
if (!mScriptElements)
NS_NewISupportsArray(getter_AddRefs(mScriptElements));
NS_ASSERTION(mScriptElements, "Can't create array");
if (mScriptElements)
mScriptElements->AppendElement(scriptElement);
}
// Set document title
else if (atom == txHTMLAtoms::title && !mHaveTitleElement) {
// The first title wins
mHaveTitleElement = PR_TRUE;
nsCOMPtr<nsIDOMNSDocument> domDoc = do_QueryInterface(mDocument);
nsCOMPtr<nsIDOMNode> textNode;
aElement->GetFirstChild(getter_AddRefs(textNode));
if (domDoc && textNode) {
nsAutoString text;
textNode->GetNodeValue(text);
text.CompressWhitespace();
domDoc->SetTitle(text);
}
}
else if (atom == txHTMLAtoms::base && !mHaveBaseElement) {
// The first base wins
mHaveBaseElement = PR_TRUE;
nsCOMPtr<nsIDocument> doc = do_QueryInterface(mDocument);
NS_ASSERTION(doc, "document doesn't implement nsIDocument");
nsAutoString value;
content->GetAttr(kNameSpaceID_None, txHTMLAtoms::target, value);
doc->SetBaseTarget(value);
content->GetAttr(kNameSpaceID_None, txHTMLAtoms::href, value);
nsCOMPtr<nsIURI> baseURI;
rv = NS_NewURI(getter_AddRefs(baseURI), value, nsnull);
if (NS_FAILED(rv))
return;
doc->SetBaseURL(baseURI); // The document checks if it is legal to set this base
}
else if (atom == txHTMLAtoms::meta) {
// handle HTTP-EQUIV data
nsAutoString httpEquiv;
content->GetAttr(kNameSpaceID_None, txHTMLAtoms::httpEquiv, httpEquiv);
if (httpEquiv.IsEmpty())
return;
nsAutoString value;
content->GetAttr(kNameSpaceID_None, txHTMLAtoms::content, value);
if (value.IsEmpty())
return;
ToLowerCase(httpEquiv);
nsCOMPtr<nsIAtom> header = dont_AddRef(NS_NewAtom(httpEquiv));
processHTTPEquiv(header, value);
}
// Handle all sorts of stylesheets
if (!mDisableStylesheetLoad) {
nsCOMPtr<nsIStyleSheetLinkingElement> ssle =
do_QueryInterface(aElement);
if (ssle) {
ssle->SetEnableUpdates(PR_TRUE);
rv = ssle->UpdateStyleSheet(PR_TRUE, nsnull, mStyleSheetCount);
if (NS_SUCCEEDED(rv) || (rv == NS_ERROR_HTMLPARSER_BLOCK))
mStyleSheetCount++;
}
}
}
void txMozillaXMLOutput::processHTTPEquiv(nsIAtom* aHeader, nsAReadableString& aValue)
{
// For now we only handle "refresh". There's a longer list in
// HTMLContentSink::ProcessHeaderData
if (aHeader == txHTMLAtoms::refresh)
mRefreshString.Assign(aValue);
}
void txMozillaXMLOutput::wrapChildren(nsIDOMNode* aCurrentNode,
nsIDOMElement* aWrapper)
{

15
mozilla/extensions/transformiix/source/xslt/txMozillaXMLOutput.h
View File

@@ -161,6 +161,8 @@ public:
private:
void closePrevious(PRInt8 aAction);
void startHTMLElement(nsIDOMElement* aElement);
void endHTMLElement(nsIDOMElement* aElement, PRBool aXHTML);
void processHTTPEquiv(nsIAtom* aHeader, nsAReadableString& aValue);
void wrapChildren(nsIDOMNode* aCurrentNode, nsIDOMElement* aWrapper);
nsCOMPtr<nsIDOMDocument> mDocument;
@@ -168,9 +170,11 @@ private:
nsCOMPtr<nsIDOMNode> mParentNode;
nsCOMPtr<nsIContent> mRootContent;
nsCOMPtr<nsIDOMNode> mScriptParent;
nsCOMPtr<nsIDOMElement> mTitleElement;
nsCOMPtr<nsIStyleSheetLinkingElement> mStyleElement;
nsCOMPtr<nsIDOMNode> mNonAddedParent;
nsCOMPtr<nsIDOMNode> mNonAddedNode;
PRInt32 mStyleSheetCount;
nsAutoString mRefreshString;
nsCOMPtr<nsINameSpaceManager> mNameSpaceManager;
@@ -180,8 +184,11 @@ private:
txOutputFormat mOutputFormat;
PRPackedBool mHaveTitle;
PRPackedBool mDisableStylesheetLoad;
PRPackedBool mDontAddCurrent;
PRPackedBool mHaveTitleElement;
PRPackedBool mHaveBaseElement;
enum txAction { eCloseElement = 1, eFlushText = 2 };
};