author | Gian-Carlo Pascutto <gpascutto@mozilla.com> |
Mon, 14 Oct 2013 16:50:49 +0200 | |
changeset 164508 | a699560fa7d375d49c0ae6c8c37e778e125fdcbc |
parent 164507 | fb35d633b2299442e1d0e1b20edd8e999dc90e99 |
child 164509 | 03dfed6090091fcc2777b5744a02b979d80c669b |
push id | 3066 |
push user | akeybl@mozilla.com |
push date | Mon, 09 Dec 2013 19:58:46 +0000 |
treeherder | mozilla-beta@a31a0dce83aa [default view] [failures only] |
perfherder | [talos] [build metrics] [platform microbench] (compared to previous push) |
reviewers | honzab |
bugs | 925705 |
milestone | 27.0a1 |
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
|
netwerk/cache2/CacheEntry.cpp | file | annotate | diff | comparison | revisions | |
netwerk/cache2/CacheEntry.h | file | annotate | diff | comparison | revisions |
--- a/netwerk/cache2/CacheEntry.cpp +++ b/netwerk/cache2/CacheEntry.cpp @@ -95,17 +95,17 @@ CacheEntry::CacheEntry(const nsACString& CacheEntry::~CacheEntry() { ProxyReleaseMainThread(mURI); LOG(("CacheEntry::~CacheEntry [this=%p]", this)); MOZ_COUNT_DTOR(CacheEntry); } -#ifdef MOZ_LOGGING +#ifdef PR_LOG char const * CacheEntry::StateString(uint32_t aState) { switch (aState) { case NOTLOADED: return "NOTLOADED"; case LOADING: return "LOADING"; case EMPTY: return "EMPTY"; case WRITING: return "WRITING";
--- a/netwerk/cache2/CacheEntry.h +++ b/netwerk/cache2/CacheEntry.h @@ -237,17 +237,17 @@ private: // true: after load and an existing file, or after output stream has been opened. // note - when opening an input stream, and this flag is false, output stream // is open along ; this makes input streams on new entries behave correctly // when EOF is reached (WOULD_BLOCK is returned). // false: after load and a new file, or dropped to back to false when a writer // fails to open an output stream. bool mHasData : 1; -#ifdef MOZ_LOGGING +#ifdef PR_LOG static char const * StateString(uint32_t aState); #endif enum EState { // transiting to: NOTLOADED = 0, // -> LOADING | EMPTY LOADING = 1, // -> EMPTY | READY EMPTY = 2, // -> WRITING WRITING = 3, // -> EMPTY | READY