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

Bug 1866010 p1. Update NS_NewContentViewer to reflect nsIDocumentViewer's new name. r=emilio

Browse Source 
Differential Revision: https://phabricator.services.mozilla.com/D194357
This commit is contained in:
Jonathan Watt
2023-11-24 09:10:48 +00:00
parent 29843b03b0
commit 907be5a011
3 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
layout/base/nsDocumentViewer.cpp
View File

@@ -481,7 +481,7 @@ class nsDocumentShownDispatcher : public Runnable {
//------------------------------------------------------------------ //------------------------------------------------------------------
//------------------------------------------------------------------ //------------------------------------------------------------------
already_AddRefed<nsIDocumentViewer> NS_NewContentViewer() { already_AddRefed<nsIDocumentViewer> NS_NewDocumentViewer() {
RefPtr<nsDocumentViewer> viewer = new nsDocumentViewer(); RefPtr<nsDocumentViewer> viewer = new nsDocumentViewer();
return viewer.forget(); return viewer.forget();
} }

14
layout/build/nsContentDLF.cpp
View File

@@ -32,7 +32,7 @@
using mozilla::dom::Document; using mozilla::dom::Document;
already_AddRefed<nsIDocumentViewer> NS_NewContentViewer(); already_AddRefed<nsIDocumentViewer> NS_NewDocumentViewer();
static const char* const gHTMLTypes[] = {TEXT_HTML, VIEWSOURCE_CONTENT_TYPE, static const char* const gHTMLTypes[] = {TEXT_HTML, VIEWSOURCE_CONTENT_TYPE,
APPLICATION_XHTML_XML, APPLICATION_XHTML_XML,
@@ -203,11 +203,11 @@ nsContentDLF::CreateInstanceForDocument(nsISupports* aContainer,
nsIDocumentViewer** aContentViewer) { nsIDocumentViewer** aContentViewer) {
MOZ_ASSERT(aDocument); MOZ_ASSERT(aDocument);
nsCOMPtr<nsIDocumentViewer> contentViewer = NS_NewContentViewer(); nsCOMPtr<nsIDocumentViewer> viewer = NS_NewDocumentViewer();
// Bind the document to the Content Viewer // Bind the document to the Content Viewer
contentViewer->LoadStart(aDocument); viewer->LoadStart(aDocument);
contentViewer.forget(aContentViewer); viewer.forget(aContentViewer);
return NS_OK; return NS_OK;
} }
@@ -311,7 +311,7 @@ nsresult nsContentDLF::CreateDocument(
NS_ENSURE_TRUE(doc, NS_ERROR_FAILURE); NS_ENSURE_TRUE(doc, NS_ERROR_FAILURE);
// Create the content viewer XXX: could reuse content viewer here! // Create the content viewer XXX: could reuse content viewer here!
nsCOMPtr<nsIDocumentViewer> contentViewer = NS_NewContentViewer(); nsCOMPtr<nsIDocumentViewer> viewer = NS_NewDocumentViewer();
doc->SetContainer(static_cast<nsDocShell*>(aContainer)); doc->SetContainer(static_cast<nsDocShell*>(aContainer));
@@ -323,8 +323,8 @@ nsresult nsContentDLF::CreateDocument(
NS_ENSURE_SUCCESS(rv, rv); NS_ENSURE_SUCCESS(rv, rv);
// Bind the document to the Content Viewer // Bind the document to the Content Viewer
contentViewer->LoadStart(doc); viewer->LoadStart(doc);
contentViewer.forget(aContentViewer); viewer.forget(aContentViewer);
return NS_OK; return NS_OK;
} }

4
layout/build/nsLayoutModule.cpp
View File

@@ -121,7 +121,7 @@ void Shutdown() {
nsresult NS_CreateFrameTraversal(nsIFrameTraversal** aResult); nsresult NS_CreateFrameTraversal(nsIFrameTraversal** aResult);
already_AddRefed<nsIDocumentViewer> NS_NewContentViewer(); already_AddRefed<nsIDocumentViewer> NS_NewDocumentViewer();
nsresult NS_NewContentDocumentLoaderFactory(nsIDocumentLoaderFactory** aResult); nsresult NS_NewContentDocumentLoaderFactory(nsIDocumentLoaderFactory** aResult);
nsresult NS_NewContentPolicy(nsIContentPolicy** aResult); nsresult NS_NewContentPolicy(nsIContentPolicy** aResult);
@@ -156,7 +156,7 @@ nsresult NS_NewChildProcessMessageManager(nsISupports** aResult);
MAKE_GENERIC_CTOR(nsIFrameTraversal, NS_CreateFrameTraversal) MAKE_GENERIC_CTOR(nsIFrameTraversal, NS_CreateFrameTraversal)
MAKE_GENERIC_CTOR2(nsIDocumentViewer, NS_NewContentViewer) MAKE_GENERIC_CTOR2(nsIDocumentViewer, NS_NewDocumentViewer)
MAKE_CTOR(CreateXMLContentSerializer, nsIContentSerializer, MAKE_CTOR(CreateXMLContentSerializer, nsIContentSerializer,
NS_NewXMLContentSerializer) NS_NewXMLContentSerializer)