author | Taras Glek <tglek@mozilla.com> |
Fri, 07 Jan 2011 13:32:21 -0800 | |
changeset 60225 | 7558dc118df513a41cbed1da33027eea0d09a87f |
parent 60224 | 8d005c3a66857951a71e2fd84e9cb8eb71c88cc4 |
child 60226 | aa2cb417ef96503b312652e7e8d262ebe8219c39 |
push id | 17887 |
push user | tglek@mozilla.com |
push date | Fri, 07 Jan 2011 21:32:46 +0000 |
treeherder | mozilla-central@7558dc118df5 [default view] [failures only] |
perfherder | [talos] [build metrics] [platform microbench] (compared to previous push) |
reviewers | burning, mfinkle |
bugs | 562406 |
milestone | 2.0b9pre |
first release with | nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
|
last release without | nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
|
--- a/startupcache/StartupCache.cpp +++ b/startupcache/StartupCache.cpp @@ -234,25 +234,27 @@ StartupCache::GetBuffer(const char* id, nsZipItemPtr<char> zipItem(mArchive, id, true); if (zipItem) { *outbuf = zipItem.Forget(); *length = zipItem.Length(); return NS_OK; } } +#ifdef MOZ_OMNIJAR if (mozilla::OmnijarReader()) { // no need to checksum omnijarred entries nsZipItemPtr<char> zipItem(mozilla::OmnijarReader(), id); if (zipItem) { *outbuf = zipItem.Forget(); *length = zipItem.Length(); return NS_OK; } } +#endif return NS_ERROR_NOT_AVAILABLE; } // Makes a copy of the buffer, client retains ownership of inbuf. nsresult StartupCache::PutBuffer(const char* id, const char* inbuf, PRUint32 len) { if (StartupCache::gShutdownInitiated) {