Attachment #40868 for bug #30209

View Details Raw Unified Return to Bug 30209

| Differences between



2009-10-08  Holger Hans Peter Freyther  <zecke@selfish.org>

        Reviewed by NOBODY (OOPS!).

        Cache: m_liveDecodedResource could become unsorted

        In CachedResource::setDecodedSize it was possible to
        add the CachedResource into the Cache::m_liveDecodedResource
        with out updating m_lastDecodedAccessTime.

        The code in Cache::pruneLiveResources assumes that
        the tail is the oldest in terms of m_lastDecodedAccessTime
        but this was not the case.

        Update the m_lastDecodedAccessTime to currentTime() before
        placing the CachedResource as head of the Cache::m_liveDecodedResource

        Need a short description and bug URL (OOPS!)

        * loader/CachedResource.cpp:
        (WebCore::CachedResource::setDecodedSize):

2009-10-07  Geoffrey Garen  <ggaren@apple.com>

        Reviewed by Oliver Hunt.



        cache()->insertInLRUList(this);
        
        // Insert into or remove from the live decoded list if necessary.
        if (m_decodedSize && !m_inLiveDecodedResourcesList && hasClients()) {
            m_lastDecodedAccessTime = currentTime();
            cache()->insertInLiveDecodedResourcesList(this);
        } else if (!m_decodedSize && m_inLiveDecodedResourcesList)
            cache()->removeFromLiveDecodedResourcesList(this);

        // Update the cache's size totals.
- 

Return to Bug 30209

Lines 242-250 void CachedResource::setDecodedSize(unsigned size) a/WebCore/loader/CachedResource.cpp_sec1
- a/WebCore/loader/CachedResource.cpp -3 / +3 lines
242	cache()->insertInLRUList(this);	242	cache()->insertInLRUList(this);
243		243
244	// Insert into or remove from the live decoded list if necessary.	244	// Insert into or remove from the live decoded list if necessary.
245	if (m_decodedSize && !m_inLiveDecodedResourcesList && hasClients())	245	if (m_decodedSize && !m_inLiveDecodedResourcesList && hasClients()) {
		246	m_lastDecodedAccessTime = currentTime();
246	cache()->insertInLiveDecodedResourcesList(this);	247	cache()->insertInLiveDecodedResourcesList(this);
247	else if (!m_decodedSize && m_inLiveDecodedResourcesList)	248	} else if (!m_decodedSize && m_inLiveDecodedResourcesList)
248	cache()->removeFromLiveDecodedResourcesList(this);	249	cache()->removeFromLiveDecodedResourcesList(this);
249		250
250	// Update the cache's size totals.	251	// Update the cache's size totals.
251	-

Lines 1-3 a/WebCore/ChangeLog_sec1
- a/WebCore/ChangeLog +22 lines
		1	2009-10-08 Holger Hans Peter Freyther <zecke@selfish.org>
		2
		3	Reviewed by NOBODY (OOPS!).
		4
		5	Cache: m_liveDecodedResource could become unsorted
		6
		7	In CachedResource::setDecodedSize it was possible to
		8	add the CachedResource into the Cache::m_liveDecodedResource
		9	with out updating m_lastDecodedAccessTime.
		10
		11	The code in Cache::pruneLiveResources assumes that
		12	the tail is the oldest in terms of m_lastDecodedAccessTime
		13	but this was not the case.
		14
		15	Update the m_lastDecodedAccessTime to currentTime() before
		16	placing the CachedResource as head of the Cache::m_liveDecodedResource
		17
		18	Need a short description and bug URL (OOPS!)
		19
		20	* loader/CachedResource.cpp:
		21	(WebCore::CachedResource::setDecodedSize):
		22
1	2009-10-07 Geoffrey Garen <ggaren@apple.com>	23	2009-10-07 Geoffrey Garen <ggaren@apple.com>
2		24
3	Reviewed by Oliver Hunt.	25	Reviewed by Oliver Hunt.