mozilla
/
releases-comm-central
зеркало из https://github.com/mozilla/releases-comm-central.git
1
0
Форкнуть 0
Код Задачи Пакеты Проекты Релизы Вики Активность

Bug 1517627 - Port bug 1517241: Rename nsIDocument to mozilla::dom::Document. rs=bustage-fix

This commit is contained in:
Jorg K 2019-01-04 01:02:42 +01:00
Родитель 2ae64ee9b5
Коммит b468dbfd32
13 изменённых файлов: 37 добавлений и 38 удалений
Показать статистику Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

2
mailnews/base/src/MailNewsDLF.cpp
Просмотреть файл

@ -82,7 +82,7 @@ MailNewsDLF::CreateInstance(const char* aCommand,
NS_IMETHODIMP
MailNewsDLF::CreateInstanceForDocument(nsISupports* aContainer,
nsIDocument* aDocument,
mozilla::dom::Document* aDocument,
const char* aCommand,
nsIContentViewer** aDocViewer)
{

4
mailnews/base/src/nsMsgMailSession.cpp
Просмотреть файл

@ -14,7 +14,7 @@
#include "nsAppDirectoryServiceDefs.h"
#include "nsPIDOMWindow.h"
#include "nsIDocShell.h"
#include "nsIDocument.h"
#include "mozilla/dom/Document.h"
#include "nsIObserverService.h"
#include "nsIAppStartup.h"
#include "nsToolkitCompsCID.h"
@ -285,7 +285,7 @@ nsresult nsMsgMailSession::GetTopmostMsgWindow(nsIMsgWindow **aMsgWindow)
NS_ENSURE_SUCCESS(rv, rv);
NS_ENSURE_TRUE(topMostWindow, NS_ERROR_FAILURE);
nsIDocument* domDocument = topMostWindow->GetDoc();
mozilla::dom::Document* domDocument = topMostWindow->GetDoc();
NS_ENSURE_TRUE(domDocument, NS_ERROR_FAILURE);
Element* domElement = domDocument->GetDocumentElement();

2
mailnews/base/src/nsMsgStatusFeedback.cpp
Просмотреть файл

@ -8,7 +8,7 @@
#include "nsIWebProgress.h"
#include "nsIXULBrowserWindow.h"
#include "nsMsgStatusFeedback.h"
#include "nsIDocument.h"
#include "mozilla/dom/Document.h"
#include "nsIDocShell.h"
#include "nsIDocShellTreeItem.h"
#include "nsIChannel.h"

4
mailnews/compose/src/nsMsgCompUtils.cpp
Просмотреть файл

@ -34,7 +34,7 @@
#include "mozilla/Services.h"
#include "mozilla/Unused.h"
#include "nsIContentIterator.h"
#include "nsIDocument.h"
#include "mozilla/dom/Document.h"
#include "nsIMIMEInfo.h"
#include "nsIMsgHeaderParser.h"
#include "nsIMutableArray.h"
@ -1774,7 +1774,7 @@ void GetSerialiserFlags(const char* charset, bool* flowed, bool* delsp, bool* fo
}
already_AddRefed<nsIArray>
GetEmbeddedObjects(nsIDocument* aDocument)
GetEmbeddedObjects(mozilla::dom::Document* aDocument)
{
nsCOMPtr<nsIMutableArray> nodes = do_CreateInstance(NS_ARRAY_CONTRACTID);
if (NS_WARN_IF(!nodes)) {

2
mailnews/compose/src/nsMsgCompUtils.h
Просмотреть файл

@ -36,7 +36,7 @@ private:
virtual ~nsMsgCompUtils();
};
already_AddRefed<nsIArray> GetEmbeddedObjects(nsIDocument* aDocument);
already_AddRefed<nsIArray> GetEmbeddedObjects(mozilla::dom::Document* aDocument);
PR_BEGIN_EXTERN_C

10
mailnews/compose/src/nsMsgCompose.cpp
Просмотреть файл

@ -4,7 +4,7 @@
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
#include "nsMsgCompose.h"
#include "nsIDocument.h"
#include "mozilla/dom/Document.h"
#include "nsPIDOMWindow.h"
#include "mozIDOMWindow.h"
#include "nsISelectionController.h"
@ -302,7 +302,7 @@ nsresult nsMsgCompose::ResetUrisForEmbeddedObjects()
if (!m_editor)
return NS_ERROR_FAILURE;
nsCOMPtr<nsIDocument> document;
nsCOMPtr<Document> document;
m_editor->GetDocument(getter_AddRefs(document));
if (!document)
return NS_ERROR_FAILURE;
@ -446,7 +446,7 @@ nsresult nsMsgCompose::TagEmbeddedObjects(nsIEditor *aEditor)
if (!aEditor)
return NS_ERROR_FAILURE;
nsCOMPtr<nsIDocument> document;
nsCOMPtr<Document> document;
aEditor->GetDocument(getter_AddRefs(document));
if (!document)
return NS_ERROR_FAILURE;
@ -530,7 +530,7 @@ nsMsgCompose::InsertDivWrappedTextAtSelection(const nsAString &aText,
NS_ENSURE_SUCCESS_VOID(rv);
// We need the document
nsCOMPtr<nsIDocument> doc;
nsCOMPtr<Document> doc;
rv = m_editor->GetDocument(getter_AddRefs(doc));
NS_ENSURE_SUCCESS_VOID(rv);
@ -5626,7 +5626,7 @@ nsMsgCompose::BodyConvertible(int32_t *_retval)
NS_ENSURE_ARG_POINTER(_retval);
NS_ENSURE_STATE(m_editor);
nsCOMPtr<nsIDocument> rootDocument;
nsCOMPtr<Document> rootDocument;
nsresult rv = m_editor->GetDocument(getter_AddRefs(rootDocument));
if (NS_FAILED(rv))
return rv;

2
mailnews/compose/src/nsMsgComposeContentHandler.cpp
Просмотреть файл

@ -14,7 +14,7 @@
#include "nsCOMPtr.h"
#include "nsPIDOMWindow.h"
#include "mozIDOMWindow.h"
#include "nsIDocument.h"
#include "mozilla/dom/Document.h"
#include "nsIInterfaceRequestor.h"
#include "nsIInterfaceRequestorUtils.h"
#include "nsIMsgMailNewsUrl.h"

4
mailnews/compose/src/nsMsgComposeService.cpp
Просмотреть файл

@ -21,7 +21,7 @@
#include "nsIMsgWindow.h"
#include "nsIDocShell.h"
#include "nsPIDOMWindow.h"
#include "nsIDocument.h"
#include "mozilla/dom/Document.h"
#include "nsIXULWindow.h"
#include "nsIWindowMediator.h"
#include "nsIDocShellTreeItem.h"
@ -325,7 +325,7 @@ nsMsgComposeService::GetOrigWindowSelection(MSG_ComposeType type, nsIMsgWindow *
rv = docShell->GetContentViewer(getter_AddRefs(contentViewer));
NS_ENSURE_SUCCESS(rv, rv);
nsCOMPtr<nsIDocument> domDocument(contentViewer->GetDocument());
nsCOMPtr<mozilla::dom::Document> domDocument(contentViewer->GetDocument());
nsCOMPtr<nsIDocumentEncoder> docEncoder = do_createHTMLCopyEncoder();

4
mailnews/compose/src/nsMsgSend.cpp
Просмотреть файл

@ -29,7 +29,7 @@
#include "nsMsgPrompts.h"
#include "nsCExternalHandlerService.h"
#include "nsIMIMEService.h"
#include "nsIDocument.h"
#include "mozilla/dom/Document.h"
#include "nsMsgCompCID.h"
#include "nsIAbAddressCollector.h"
#include "nsAbBaseCID.h"
@ -1414,7 +1414,7 @@ nsMsgComposeAndSend::GetMultipartRelatedCount(bool forceToBeCalculated /*=false*
mMultipartRelatedAttachmentCount = 0;
if (mEditor)
{
nsCOMPtr<nsIDocument> document;
nsCOMPtr<mozilla::dom::Document> document;
mEditor->GetDocument(getter_AddRefs(document));
if (!document)
return 0;

24
mailnews/import/winlivemail/nsWMSettings.cpp
Просмотреть файл

@ -27,7 +27,7 @@
#include "nsIImapIncomingServer.h"
#include "nsINntpIncomingServer.h"
#include "stdlib.h"
#include "nsIDocument.h"
#include "mozilla/dom/Document.h"
#include "nsIFile.h"
#include "nsNetUtil.h"
#include "nsTArray.h"
@ -40,21 +40,21 @@ class WMSettings {
public:
static bool DoImport(nsIMsgAccount **ppAccount);
static bool DoIMAPServer(nsIMsgAccountManager *pMgr,
nsIDocument *xmlDoc,
mozilla::dom::Document *xmlDoc,
const nsString& serverName,
nsIMsgAccount **ppAccount);
static bool DoPOP3Server(nsIMsgAccountManager *pMgr,
nsIDocument *xmlDoc,
mozilla::dom::Document *xmlDoc,
const nsString& serverName,
nsIMsgAccount **ppAccount);
static bool DoNNTPServer(nsIMsgAccountManager *pMgr,
nsIDocument *xmlDoc,
mozilla::dom::Document *xmlDoc,
const nsString& serverName,
nsIMsgAccount **ppAccount);
static void SetIdentities(nsIMsgAccountManager *pMgr, nsIMsgAccount *pAcc,
nsIDocument *xmlDoc, nsAutoString &userName,
mozilla::dom::Document *xmlDoc, nsAutoString &userName,
int32_t authMethodIncoming, bool isNNTP);
static void SetSmtpServer(nsIDocument *xmlDoc, nsIMsgIdentity *id,
static void SetSmtpServer(mozilla::dom::Document *xmlDoc, nsIMsgIdentity *id,
nsAutoString& inUserName, int32_t authMethodIncoming);
};
@ -171,7 +171,7 @@ bool WMSettings::DoImport(nsIMsgAccount **ppAccount)
// Loop through *.oeaccounts files looking for POP3 & IMAP & NNTP accounts
// Ignore LDAP for now!
int accounts = 0;
nsCOMPtr<nsIDocument> xmlDoc;
nsCOMPtr<mozilla::dom::Document> xmlDoc;
for (int32_t i = fileArray.Count() - 1 ; i >= 0; i--){
nsWMUtils::MakeXMLdoc(getter_AddRefs(xmlDoc), fileArray[i]);
@ -213,7 +213,7 @@ bool WMSettings::DoImport(nsIMsgAccount **ppAccount)
}
bool WMSettings::DoIMAPServer(nsIMsgAccountManager *pMgr,
nsIDocument *xmlDoc,
mozilla::dom::Document *xmlDoc,
const nsString& serverName,
nsIMsgAccount **ppAccount)
{
@ -322,7 +322,7 @@ bool WMSettings::DoIMAPServer(nsIMsgAccountManager *pMgr,
}
bool WMSettings::DoPOP3Server(nsIMsgAccountManager *pMgr,
nsIDocument *xmlDoc,
mozilla::dom::Document *xmlDoc,
const nsString& serverName,
nsIMsgAccount **ppAccount)
{
@ -483,7 +483,7 @@ bool WMSettings::DoPOP3Server(nsIMsgAccountManager *pMgr,
}
bool WMSettings::DoNNTPServer(nsIMsgAccountManager *pMgr,
nsIDocument *xmlDoc,
mozilla::dom::Document *xmlDoc,
const nsString& serverName,
nsIMsgAccount **ppAccount)
{
@ -586,7 +586,7 @@ bool WMSettings::DoNNTPServer(nsIMsgAccountManager *pMgr,
}
void WMSettings::SetIdentities(nsIMsgAccountManager *pMgr, nsIMsgAccount *pAcc,
nsIDocument *xmlDoc, nsAutoString &inUserName,
mozilla::dom::Document *xmlDoc, nsAutoString &inUserName,
int32_t authMethodIncoming, bool isNNTP)
{
// Get the relevant information for an identity
@ -640,7 +640,7 @@ void WMSettings::SetIdentities(nsIMsgAccountManager *pMgr, nsIMsgAccount *pAcc,
SetSmtpServer(xmlDoc, id, inUserName, authMethodIncoming);
}
void WMSettings::SetSmtpServer(nsIDocument *xmlDoc, nsIMsgIdentity *id,
void WMSettings::SetSmtpServer(mozilla::dom::Document *xmlDoc, nsIMsgIdentity *id,
nsAutoString& inUserName, int32_t authMethodIncoming)
{
nsresult errorCode;

8
mailnews/import/winlivemail/nsWMUtils.cpp
Просмотреть файл

@ -7,8 +7,8 @@
#include "nsComponentManagerUtils.h"
#include "nsNetCID.h"
#include "nsString.h"
#include "mozilla/dom/Document.h"
#include "nsWMUtils.h"
#include "nsIDocument.h"
#include "nsINodeList.h"
#include "nsContentList.h"
#include "nsINode.h"
@ -127,7 +127,7 @@ nsWMUtils::GetOEAccountFilesInFolder(nsIFile *aFolder,
}
nsresult
nsWMUtils::MakeXMLdoc(nsIDocument **aXmlDoc,
nsWMUtils::MakeXMLdoc(mozilla::dom::Document **aXmlDoc,
nsIFile *aFile)
{
nsresult rv;
@ -143,7 +143,7 @@ nsWMUtils::MakeXMLdoc(nsIDocument **aXmlDoc,
}
int64_t filesize;
aFile->GetFileSize(&filesize);
nsCOMPtr<nsIDocument> xmldoc =
nsCOMPtr<mozilla::dom::Document> xmldoc =
parser->ParseFromStream(stream, EmptyString(), int32_t(filesize),
mozilla::dom::SupportedType::Application_xml, rv2);
xmldoc.forget(aXmlDoc);
@ -151,7 +151,7 @@ nsWMUtils::MakeXMLdoc(nsIDocument **aXmlDoc,
}
nsresult
nsWMUtils::GetValueForTag(nsIDocument *aXmlDoc,
nsWMUtils::GetValueForTag(mozilla::dom::Document *aXmlDoc,
const char *aTagName,
nsAString &aValue)
{

5
mailnews/import/winlivemail/nsWMUtils.h
Просмотреть файл

@ -7,7 +7,6 @@
#include <windows.h>
#include "nsIWindowsRegKey.h"
class nsIDocument;
class nsWMUtils {
public:
@ -16,8 +15,8 @@ public:
static nsresult GetOEAccountFiles(nsCOMArray<nsIFile> &aFileArray);
static nsresult GetOEAccountFilesInFolder(nsIFile *aFolder,
nsCOMArray<nsIFile> &aFileArray);
static nsresult MakeXMLdoc(nsIDocument **aXmlDoc, nsIFile *aFile);
static nsresult GetValueForTag(nsIDocument *aXmlDoc,
static nsresult MakeXMLdoc(mozilla::dom::Document **aXmlDoc, nsIFile *aFile);
static nsresult GetValueForTag(mozilla::dom::Document *aXmlDoc,
const char *aTagName,
nsAString &aValue);
};

4
mailnews/mime/src/mimeTextHTMLParsed.cpp
Просмотреть файл

@ -23,7 +23,7 @@
#include "prlog.h"
#include "msgCore.h"
#include "mozilla/dom/DOMParser.h"
#include "nsIDocument.h"
#include "mozilla/dom/Document.h"
#include "nsIDocumentEncoder.h"
#include "mozilla/ErrorResult.h"
#include "mimethtm.h"
@ -91,7 +91,7 @@ MimeInlineTextHTMLParsed_parse_eof(MimeObject *obj, bool abort_p)
mozilla::ErrorResult rv2;
RefPtr<mozilla::dom::DOMParser> parser =
mozilla::dom::DOMParser::CreateWithoutGlobal(rv2);
nsCOMPtr<nsIDocument> document = parser->ParseFromString(
nsCOMPtr<mozilla::dom::Document> document = parser->ParseFromString(
rawHTML, mozilla::dom::SupportedType::Text_html, rv2);
if (rv2.Failed())
return -1;