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

Merge for backout of changeset 1622d8dab8c3

Browse Source
This commit is contained in:
Shawn Wilsher 2010-02-18 10:13:49 -08:00
commit 8744e16689
2 changed files with 0 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
content/base/public/nsContentUtils.h
View File

@ -123,10 +123,6 @@ typedef int (*PR_CALLBACK PrefChangedFunc)(const char *, void *);
#define have_PrefChangedFunc_typedef
#endif
namespace mozilla {
class IHistory;
}
extern const char kLoadAsData[];
enum EventNameType {
@ -470,11 +466,6 @@ public:
return sImgLoader;
}
static mozilla::IHistory* GetHistory()
{
return sHistory;
}
#ifdef MOZ_XTF
static nsIXTFService* GetXTFService();
#endif
@ -1558,8 +1549,6 @@ private:
static imgILoader* sImgLoader;
static imgICache* sImgCache;
static mozilla::IHistory* sHistory;
static nsIConsoleService* sConsoleService;
static nsDataHashtable<nsISupportsHashKey, EventNameMapping>* sEventTable;

7
content/base/src/nsContentUtils.cpp
View File

@ -98,8 +98,6 @@
#include "imgIRequest.h"
#include "imgIContainer.h"
#include "imgILoader.h"
#include "mozilla/IHistory.h"
#include "nsDocShellCID.h"
#include "nsIImageLoadingContent.h"
#include "nsIInterfaceRequestor.h"
#include "nsIInterfaceRequestorUtils.h"
@ -203,7 +201,6 @@ nsIXTFService *nsContentUtils::sXTFService = nsnull;
nsIPrefBranch2 *nsContentUtils::sPrefBranch = nsnull;
imgILoader *nsContentUtils::sImgLoader;
imgICache *nsContentUtils::sImgCache;
mozilla::IHistory *nsContentUtils::sHistory;
nsIConsoleService *nsContentUtils::sConsoleService;
nsDataHashtable<nsISupportsHashKey, EventNameMapping>* nsContentUtils::sEventTable = nsnull;
nsIStringBundleService *nsContentUtils::sStringBundleService;
@ -377,9 +374,6 @@ nsContentUtils::Init()
sImgCache = nsnull;
}
rv = CallGetService(NS_IHISTORY_CONTRACTID, &sHistory);
NS_ENSURE_SUCCESS(rv, rv);
sPtrsToPtrsToRelease = new nsTArray<nsISupports**>();
if (!sPtrsToPtrsToRelease) {
return NS_ERROR_OUT_OF_MEMORY;
@ -960,7 +954,6 @@ nsContentUtils::Shutdown()
#endif
NS_IF_RELEASE(sImgLoader);
NS_IF_RELEASE(sImgCache);
NS_IF_RELEASE(sHistory);
NS_IF_RELEASE(sPrefBranch);
#ifdef IBMBIDI
NS_IF_RELEASE(sBidiKeyboard);