Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-10-16 06:45:42 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 1387427 - Use nsINode/nsIDocument more. r=smaug.

Browse Source 
--HG--
extra : rebase_source : 6895ccb6e2605f50978479ca3b630d64634cc19b
extra : histedit_source : 66f1fb9f2179c12ee3cb7f7b9410455ea20593be
This commit is contained in:
Peter Van der Beken 2017-10-30 12:43:00 +01:00
parent 8be94b2873
commit cdf2be05f9
6 changed files with 12 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
dom/xslt/xslt/txMozillaStylesheetCompiler.cpp
View File

@ -630,8 +630,7 @@ txSyncCompileObserver::loadURI(const nsAString& aUri,
// make sense.
nsCOMPtr<nsINode> source;
if (mProcessor) {
source =
do_QueryInterface(mProcessor->GetSourceContentModel());
source = mProcessor->GetSourceContentModel();
}
nsAutoSyncOperation sync(source ? source->OwnerDoc() : nullptr);
nsCOMPtr<nsIDOMDocument> document;

8
dom/xslt/xslt/txMozillaTextOutput.cpp
View File

@ -121,7 +121,7 @@ txMozillaTextOutput::startDocument()
}
nsresult
txMozillaTextOutput::createResultDocument(nsIDOMDocument* aSourceDocument,
txMozillaTextOutput::createResultDocument(nsIDocument* aSourceDocument,
bool aLoadedAsData)
{
/*
@ -148,17 +148,15 @@ txMozillaTextOutput::createResultDocument(nsIDOMDocument* aSourceDocument,
MOZ_ASSERT(mDocument->GetReadyStateEnum() ==
nsIDocument::READYSTATE_UNINITIALIZED, "Bad readyState");
mDocument->SetReadyStateInternal(nsIDocument::READYSTATE_LOADING);
nsCOMPtr<nsIDocument> source = do_QueryInterface(aSourceDocument);
NS_ENSURE_STATE(source);
bool hasHadScriptObject = false;
nsIScriptGlobalObject* sgo =
source->GetScriptHandlingObject(hasHadScriptObject);
aSourceDocument->GetScriptHandlingObject(hasHadScriptObject);
NS_ENSURE_STATE(sgo || !hasHadScriptObject);
NS_ASSERTION(mDocument, "Need document");
// Reset and set up document
URIUtils::ResetWithSource(mDocument, source);
URIUtils::ResetWithSource(mDocument, aSourceDocument);
// Only do this after resetting the document to ensure we have the
// correct principal.
mDocument->SetScriptHandlingObject(sgo);

3
dom/xslt/xslt/txMozillaTextOutput.h
View File

@ -11,7 +11,6 @@
#include "nsWeakPtr.h"
#include "txOutputFormat.h"
class nsIDOMDocument;
class nsIDOMDocumentFragment;
class nsITransformObserver;
class nsIDocument;
@ -27,7 +26,7 @@ public:
TX_DECL_TXAXMLEVENTHANDLER
TX_DECL_TXAOUTPUTXMLEVENTHANDLER
nsresult createResultDocument(nsIDOMDocument* aSourceDocument,
nsresult createResultDocument(nsIDocument* aSourceDocument,
bool aLoadedAsData);
private:

8
dom/xslt/xslt/txMozillaXMLOutput.cpp
View File

@ -777,7 +777,7 @@ void txMozillaXMLOutput::processHTTPEquiv(nsAtom* aHeader, const nsString& aValu
nsresult
txMozillaXMLOutput::createResultDocument(const nsAString& aName, int32_t aNsID,
nsIDOMDocument* aSourceDocument,
nsIDocument* aSourceDocument,
bool aLoadedAsData)
{
nsresult rv;
@ -800,18 +800,16 @@ txMozillaXMLOutput::createResultDocument(const nsAString& aName, int32_t aNsID,
nsIDocument::READYSTATE_UNINITIALIZED, "Bad readyState");
mDocument->SetReadyStateInternal(nsIDocument::READYSTATE_LOADING);
mDocument->SetMayStartLayout(false);
nsCOMPtr<nsIDocument> source = do_QueryInterface(aSourceDocument);
NS_ENSURE_STATE(source);
bool hasHadScriptObject = false;
nsIScriptGlobalObject* sgo =
source->GetScriptHandlingObject(hasHadScriptObject);
aSourceDocument->GetScriptHandlingObject(hasHadScriptObject);
NS_ENSURE_STATE(sgo || !hasHadScriptObject);
mCurrentNode = mDocument;
mNodeInfoManager = mDocument->NodeInfoManager();
// Reset and set up the document
URIUtils::ResetWithSource(mDocument, source);
URIUtils::ResetWithSource(mDocument, aSourceDocument);
// Make sure we set the script handling object after resetting with the
// source, so that we have the right principal.

2
dom/xslt/xslt/txMozillaXMLOutput.h
View File

@ -73,7 +73,7 @@ public:
nsresult closePrevious(bool aFlushText);
nsresult createResultDocument(const nsAString& aName, int32_t aNsID,
nsIDOMDocument* aSourceDocument,
nsIDocument* aSourceDocument,
bool aLoadedAsData);
private:

8
dom/xslt/xslt/txMozillaXSLTProcessor.cpp
View File

@ -50,7 +50,7 @@ class txToDocHandlerFactory : public txAOutputHandlerFactory
{
public:
txToDocHandlerFactory(txExecutionState* aEs,
nsIDOMDocument* aSourceDocument,
nsIDocument* aSourceDocument,
nsITransformObserver* aObserver,
bool aDocumentIsData)
: mEs(aEs), mSourceDocument(aSourceDocument), mObserver(aObserver),
@ -62,7 +62,7 @@ public:
private:
txExecutionState* mEs;
nsCOMPtr<nsIDOMDocument> mSourceDocument;
nsCOMPtr<nsIDocument> mSourceDocument;
nsCOMPtr<nsITransformObserver> mObserver;
bool mDocumentIsData;
};
@ -664,14 +664,12 @@ txMozillaXSLTProcessor::TransformToDoc(nsIDOMDocument **aResult,
return NS_ERROR_OUT_OF_MEMORY;
}
nsCOMPtr<nsIDOMDocument> sourceDOMDocument = do_QueryInterface(mSource->OwnerDoc());
txExecutionState es(mStylesheet, IsLoadDisabled());
// XXX Need to add error observers
// If aResult is non-null, we're a data document
txToDocHandlerFactory handlerFactory(&es, sourceDOMDocument, mObserver,
txToDocHandlerFactory handlerFactory(&es, mSource->OwnerDoc(), mObserver,
aCreateDataDocument);
es.mOutputHandlerFactory = &handlerFactory;