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

Bug 650494 - Remove nsIXULPrototypeCache; r=khuey,smaug

Browse Source
This commit is contained in:
Marco Castelluccio 2011-08-26 20:50:23 +01:00
parent c880f1da26
commit 59b2b657f4
10 changed files with 29 additions and 176 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
chrome/src/nsChromeProtocolHandler.cpp
View File

@ -69,14 +69,6 @@
#include "nsString.h"
#include "prlog.h"
#ifdef MOZ_XUL
#include "nsIXULPrototypeCache.h"
#endif
//----------------------------------------------------------------------
static NS_DEFINE_CID(kXULPrototypeCacheCID, NS_XULPROTOTYPECACHE_CID);
////////////////////////////////////////////////////////////////////////////////
NS_IMPL_THREADSAFE_ISUPPORTS2(nsChromeProtocolHandler,

4
content/base/public/nsContentCID.h
View File

@ -186,10 +186,6 @@
#define NS_XULDOCUMENT_CID \
{ 0x541afcb2, 0xa9a3, 0x11d2, { 0x8e, 0xc5, 0x0, 0x80, 0x5f, 0x29, 0xf3, 0x70 } }
// {3A0A0FC1-8349-11d3-BE47-00104BDE6048}
#define NS_XULPROTOTYPECACHE_CID \
{ 0x3a0a0fc1, 0x8349, 0x11d3, { 0xbe, 0x47, 0x0, 0x10, 0x4b, 0xde, 0x60, 0x48 } }
// {a6cf9126-15b3-11d2-932e-00805f8add32}
#define NS_RANGEUTILS_CID \
{ 0xa6cf9126, 0x15b3, 0x11d2, {0x93, 0x2e, 0x00, 0x80, 0x5f, 0x8a, 0xdd, 0x32 } }

1
content/xul/document/public/Makefile.in
View File

@ -57,7 +57,6 @@ XPIDLSRCS += \
EXPORTS = \
nsIXULDocument.h \
nsIXULPrototypeCache.h \
$(NULL)
endif

91
content/xul/document/public/nsIXULPrototypeCache.h
View File

@ -1,91 +0,0 @@
/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/* ***** BEGIN LICENSE BLOCK *****
* Version: MPL 1.1/GPL 2.0/LGPL 2.1
*
* The contents of this file are subject to the Mozilla Public License Version
* 1.1 (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
* http://www.mozilla.org/MPL/
*
* Software distributed under the License is distributed on an "AS IS" basis,
* WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
* for the specific language governing rights and limitations under the
* License.
*
* The Original Code is Mozilla Communicator client code.
*
* The Initial Developer of the Original Code is
* Netscape Communications Corporation.
* Portions created by the Initial Developer are Copyright (C) 1998
* the Initial Developer. All Rights Reserved.
*
* Contributor(s):
* Ben Goodger <ben@netscape.com>
*
* Alternatively, the contents of this file may be used under the terms of
* either of the GNU General Public License Version 2 or later (the "GPL"),
* or the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
* in which case the provisions of the GPL or the LGPL are applicable instead
* of those above. If you wish to allow use of your version of this file only
* under the terms of either the GPL or the LGPL, and not to allow others to
* use your version of this file under the terms of the MPL, indicate your
* decision by deleting the provisions above and replace them with the notice
* and other provisions required by the GPL or the LGPL. If you do not delete
* the provisions above, a recipient may use your version of this file under
* the terms of any one of the MPL, the GPL or the LGPL.
*
* ***** END LICENSE BLOCK ***** */
#ifndef nsIXULPrototypeCache_h__
#define nsIXULPrototypeCache_h__
#include "nsISupports.h"
class nsIURI;
// {3A0A0FC1-8349-11d3-BE47-00104BDE6048}
#define NS_XULPROTOTYPECACHE_CID \
{ 0x3a0a0fc1, 0x8349, 0x11d3, { 0xbe, 0x47, 0x0, 0x10, 0x4b, 0xde, 0x60, 0x48 } }
// {f8bee3d7-4be8-46ae-92c2-60c25d5cd647}
#define NS_IXULPROTOTYPECACHE_IID \
{ 0xf8bee3d7, 0x4be8, 0x46ae, \
{ 0x92, 0xc2, 0x60, 0xc2, 0x5d, 0x5c, 0xd6, 0x47 } }
/**
* This interface lets code from outside gklayout access the prototype cache.
*/
class nsIXULPrototypeCache : public nsISupports
{
public:
NS_DECLARE_STATIC_IID_ACCESSOR(NS_IXULPROTOTYPECACHE_IID)
/**
* Whether the XUL document at the specified URI is in the cache.
*/
virtual PRBool IsCached(nsIURI* aURI) = 0;
/**
* Stop the caching process abruptly, removing the cache file.
*/
virtual void AbortCaching() = 0;
};
NS_DEFINE_STATIC_IID_ACCESSOR(nsIXULPrototypeCache, NS_IXULPROTOTYPECACHE_IID)
nsresult
NS_NewXULPrototypeCache(nsISupports* aOuter, REFNSIID aIID, void** aResult);
const char XUL_FASTLOAD_FILE_BASENAME[] = "XUL";
// Increase the subtractor when changing version, say when changing the
// (opaque to XPCOM FastLoad code) format of XUL-specific XDR serializations.
// See also JSXDR_BYTECODE_VERSION in jsxdrapi.h, which tracks incompatible JS
// bytecode version changes.
#define XUL_FASTLOAD_FILE_VERSION (0xfeedbeef - 25)
#define XUL_SERIALIZATION_BUFFER_SIZE (64 * 1024)
#define XUL_DESERIALIZATION_BUFFER_SIZE (8 * 1024)
#endif // nsIXULPrototypeCache_h__

1
content/xul/document/src/nsXULDocument.h
View File

@ -60,7 +60,6 @@
class nsIRDFResource;
class nsIRDFService;
class nsIXULPrototypeCache;
class nsPIWindowRoot;
#if 0 // XXXbe save me, scc (need NSCAP_FORWARD_DECL(nsXULPrototypeScript))
class nsIObjectInputStream;

82
content/xul/document/src/nsXULPrototypeCache.cpp
View File

@ -69,8 +69,6 @@
using namespace mozilla;
using namespace mozilla::scache;
static NS_DEFINE_CID(kXULPrototypeCacheCID, NS_XULPROTOTYPECACHE_CID);
static PRBool gDisableXULCache = PR_FALSE; // enabled by default
static const char kDisableXULCachePref[] = "nglayout.debug.disable_xul_cache";
static const char kXULCacheInfoKey[] = "nsXULPrototypeCache.startupCache";
@ -109,65 +107,37 @@ nsXULPrototypeCache::~nsXULPrototypeCache()
}
NS_IMPL_THREADSAFE_ISUPPORTS2(nsXULPrototypeCache,
nsIXULPrototypeCache,
nsIObserver)
nsresult
NS_NewXULPrototypeCache(nsISupports* aOuter, REFNSIID aIID, void** aResult)
{
NS_PRECONDITION(! aOuter, "no aggregation");
if (aOuter)
return NS_ERROR_NO_AGGREGATION;
nsRefPtr<nsXULPrototypeCache> result = new nsXULPrototypeCache();
if (! result)
return NS_ERROR_OUT_OF_MEMORY;
if (!(result->mPrototypeTable.Init() &&
result->mStyleSheetTable.Init() &&
result->mScriptTable.Init() &&
result->mXBLDocTable.Init())) {
return NS_ERROR_OUT_OF_MEMORY;
}
if (!(result->mCacheURITable.Init() &&
result->mInputStreamTable.Init() &&
result->mOutputStreamTable.Init())) {
return NS_ERROR_OUT_OF_MEMORY;
}
// XXX Ignore return values.
gDisableXULCache =
Preferences::GetBool(kDisableXULCachePref, gDisableXULCache);
Preferences::RegisterCallback(DisableXULCacheChangedCallback,
kDisableXULCachePref);
nsresult rv = result->QueryInterface(aIID, aResult);
nsCOMPtr<nsIObserverService> obsSvc =
mozilla::services::GetObserverService();
if (obsSvc && NS_SUCCEEDED(rv)) {
nsXULPrototypeCache *p = result;
obsSvc->AddObserver(p, "chrome-flush-skin-caches", PR_FALSE);
obsSvc->AddObserver(p, "chrome-flush-caches", PR_FALSE);
obsSvc->AddObserver(p, "startupcache-invalidate", PR_FALSE);
}
return rv;
}
NS_IMPL_THREADSAFE_ISUPPORTS1(nsXULPrototypeCache, nsIObserver)
/* static */ nsXULPrototypeCache*
nsXULPrototypeCache::GetInstance()
{
// Theoretically this can return nsnull and callers should handle that.
if (!sInstance) {
nsIXULPrototypeCache* cache;
NS_ADDREF(sInstance = new nsXULPrototypeCache());
CallGetService(kXULPrototypeCacheCID, &cache);
sInstance->mPrototypeTable.Init();
sInstance->mStyleSheetTable.Init();
sInstance->mScriptTable.Init();
sInstance->mXBLDocTable.Init();
sInstance = static_cast<nsXULPrototypeCache*>(cache);
sInstance->mCacheURITable.Init();
sInstance->mInputStreamTable.Init();
sInstance->mOutputStreamTable.Init();
gDisableXULCache =
Preferences::GetBool(kDisableXULCachePref, gDisableXULCache);
Preferences::RegisterCallback(DisableXULCacheChangedCallback,
kDisableXULCachePref);
nsCOMPtr<nsIObserverService> obsSvc =
mozilla::services::GetObserverService();
if (obsSvc) {
nsXULPrototypeCache *p = sInstance;
obsSvc->AddObserver(p, "chrome-flush-skin-caches", PR_FALSE);
obsSvc->AddObserver(p, "chrome-flush-caches", PR_FALSE);
obsSvc->AddObserver(p, "startupcache-invalidate", PR_FALSE);
}
}
return sInstance;
}
@ -587,9 +557,7 @@ CachePrefChangedCallback(const char* aPref, void* aClosure)
gDisableXULDiskCache);
if (wasEnabled && gDisableXULDiskCache) {
static NS_DEFINE_CID(kXULPrototypeCacheCID, NS_XULPROTOTYPECACHE_CID);
nsCOMPtr<nsIXULPrototypeCache> cache =
do_GetService(kXULPrototypeCacheCID);
nsXULPrototypeCache* cache = nsXULPrototypeCache::GetInstance();
if (cache)
cache->AbortCaching();

9
content/xul/document/src/nsXULPrototypeCache.h
View File

@ -46,7 +46,6 @@
#include "nsCOMPtr.h"
#include "nsIObserver.h"
#include "nsXBLDocumentInfo.h"
#include "nsIXULPrototypeCache.h"
#include "nsDataHashtable.h"
#include "nsInterfaceHashtable.h"
#include "nsRefPtrHashtable.h"
@ -74,19 +73,17 @@ struct CacheScriptEntry
* 1. In-memory hashtables
* 2. The on-disk cache file.
*/
class nsXULPrototypeCache : public nsIXULPrototypeCache,
nsIObserver
class nsXULPrototypeCache : public nsIObserver
{
public:
// nsISupports
NS_DECL_ISUPPORTS
NS_DECL_NSIOBSERVER
// nsIXULPrototypeCache
virtual PRBool IsCached(nsIURI* aURI) {
PRBool IsCached(nsIURI* aURI) {
return GetPrototype(aURI) != nsnull;
}
virtual void AbortCaching();
void AbortCaching();
/**

1
content/xul/templates/src/nsXULContentUtils.cpp
View File

@ -71,7 +71,6 @@
#include "nsIServiceManager.h"
#include "nsIURL.h"
#include "nsXULContentUtils.h"
#include "nsIXULPrototypeCache.h"
#include "nsLayoutCID.h"
#include "nsNetUtil.h"
#include "nsRDFCID.h"

7
layout/build/nsLayoutModule.cpp
View File

@ -260,7 +260,6 @@ static NS_DEFINE_CID(kWindowCommandTableCID, NS_WINDOWCOMMANDTABLE_CID);
#ifdef MOZ_XUL
#include "nsIXULDocument.h"
#include "nsIXULPrototypeCache.h"
#include "nsIXULSortService.h"
nsresult
@ -539,7 +538,6 @@ MAKE_CTOR(CreateXULSortService, nsIXULSortService, NS_NewXUL
// NS_NewXULTreeBuilder
MAKE_CTOR(CreateXULDocument, nsIXULDocument, NS_NewXULDocument)
// NS_NewXULControllers
// NS_NewXULPrototypeCache
MAKE_CTOR(CreateXULPopupManager, nsISupports, NS_NewXULPopupManager)
#endif
#ifdef MOZ_XTF
@ -764,7 +762,7 @@ NS_DEFINE_NAMED_CID(NS_HTMLOPTIONELEMENT_CID);
NS_DEFINE_NAMED_CID(NS_HTMLAUDIOELEMENT_CID);
#endif
NS_DEFINE_NAMED_CID(NS_CANVASRENDERINGCONTEXT2D_CID);
NS_DEFINE_NAMED_CID(NS_CANVASRENDERINGCONTEXT2DTHEBES_CID);
NS_DEFINE_NAMED_CID(NS_CANVASRENDERINGCONTEXT2DTHEBES_CID);
NS_DEFINE_NAMED_CID(NS_CANVASRENDERINGCONTEXT2DAZURE_CID);
NS_DEFINE_NAMED_CID(NS_CANVASRENDERINGCONTEXTWEBGL_CID);
NS_DEFINE_NAMED_CID(NS_TEXT_ENCODER_CID);
@ -785,7 +783,6 @@ NS_DEFINE_NAMED_CID(NS_XULTEMPLATEBUILDER_CID);
NS_DEFINE_NAMED_CID(NS_XULTREEBUILDER_CID);
NS_DEFINE_NAMED_CID(NS_XULPOPUPMANAGER_CID);
NS_DEFINE_NAMED_CID(NS_XULDOCUMENT_CID);
NS_DEFINE_NAMED_CID(NS_XULPROTOTYPECACHE_CID);
#endif
#ifdef MOZ_XTF
NS_DEFINE_NAMED_CID(NS_XTFSERVICE_CID);
@ -920,7 +917,6 @@ static const mozilla::Module::CIDEntry kLayoutCIDs[] = {
{ &kNS_XULTREEBUILDER_CID, false, NULL, NS_NewXULTreeBuilder },
{ &kNS_XULPOPUPMANAGER_CID, false, NULL, CreateXULPopupManager },
{ &kNS_XULDOCUMENT_CID, false, NULL, CreateXULDocument },
{ &kNS_XULPROTOTYPECACHE_CID, false, NULL, NS_NewXULPrototypeCache },
#endif
#ifdef MOZ_XTF
{ &kNS_XTFSERVICE_CID, false, NULL, CreateXTFService },
@ -1056,7 +1052,6 @@ static const mozilla::Module::ContractIDEntry kLayoutContracts[] = {
{ "@mozilla.org/xul/xul-tree-builder;1", &kNS_XULTREEBUILDER_CID },
{ "@mozilla.org/xul/xul-popup-manager;1", &kNS_XULPOPUPMANAGER_CID },
{ "@mozilla.org/xul/xul-document;1", &kNS_XULDOCUMENT_CID },
{ "@mozilla.org/xul/xul-prototype-cache;1", &kNS_XULPROTOTYPECACHE_CID },
#endif
#ifdef MOZ_XTF
{ NS_XTFSERVICE_CONTRACTID, &kNS_XTFSERVICE_CID },

1
toolkit/mozapps/extensions/XPIProvider.jsm
View File

@ -967,7 +967,6 @@ function flushJarCache(aJarFile) {
function flushStartupCache() {
// Init this, so it will get the notification.
Cc["@mozilla.org/xul/xul-prototype-cache;1"].getService(Ci.nsISupports);
Services.obs.notifyObservers(null, "startupcache-invalidate", null);
}