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

Bug 647273 - Remove nsIContentUtils and nsIContentUtils2. r=sicking

Browse Source
This commit is contained in:
Justin Lebar
2011-04-14 13:58:36 -07:00
parent 1a4d4178c8
commit 78759bc206
14 changed files with 47 additions and 192 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
docshell/base/nsDocShell.cpp
View File

@@ -49,7 +49,6 @@
#include "nsIBrowserDOMWindow.h"
#include "nsIComponentManager.h"
#include "nsIContent.h"
#include "nsIContentUtils.h"
#include "mozilla/dom/Element.h"
#include "nsIDocument.h"
#include "nsIDOMDocument.h"
@@ -6491,11 +6490,9 @@ nsDocShell::CreateAboutBlankContentViewer(nsIPrincipal* aPrincipal,
// too, of course.
mFiredUnloadEvent = PR_FALSE;
nsCOMPtr<nsIContentUtils> cutils = do_GetService("@mozilla.org/content/contentutils;1");
if (!cutils)
return NS_ERROR_FAILURE;
nsCOMPtr<nsIDocumentLoaderFactory> docFactory =
nsContentUtils::FindInternalContentViewer("text/html");
nsCOMPtr<nsIDocumentLoaderFactory> docFactory = cutils->FindInternalContentViewer("text/html");
if (docFactory) {
// generate (about:blank) document to load
docFactory->CreateBlankDocument(mLoadGroup, aPrincipal,
@@ -7520,13 +7517,8 @@ nsDocShell::NewContentViewerObj(const char *aContentType,
{
nsCOMPtr<nsIChannel> aOpenedChannel = do_QueryInterface(request);
nsCOMPtr<nsIContentUtils> cutils = do_GetService("@mozilla.org/content/contentutils;1");
if (!cutils) {
return NS_ERROR_FAILURE;
}
nsCOMPtr<nsIDocumentLoaderFactory> docLoaderFactory =
cutils->FindInternalContentViewer(aContentType);
nsContentUtils::FindInternalContentViewer(aContentType);
if (!docLoaderFactory) {
return NS_ERROR_FAILURE;
}