Title: [158357] trunk/Source/WebCore
- Revision
- 158357
- Author
- [email protected]
- Date
- 2013-10-31 07:07:48 -0700 (Thu, 31 Oct 2013)
Log Message
Removing m_maxDeadCapacity condition in fast path in MemoryCache::prune().
https://bugs.webkit.org/show_bug.cgi?id=115631
Patch by Marcin Bychawski <[email protected]> on 2013-10-31
Reviewed by Brent Fulgham.
If the m_maxDeadSize and m_deadSize are both 0, the method unnecessairly tries to prune resources.
No new tests, covered by existing ones.
* loader/cache/MemoryCache.cpp:
(WebCore::MemoryCache::prune):
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (158356 => 158357)
--- trunk/Source/WebCore/ChangeLog 2013-10-31 12:02:51 UTC (rev 158356)
+++ trunk/Source/WebCore/ChangeLog 2013-10-31 14:07:48 UTC (rev 158357)
@@ -1,3 +1,17 @@
+2013-10-31 Marcin Bychawski <[email protected]>
+
+ Removing m_maxDeadCapacity condition in fast path in MemoryCache::prune().
+ https://bugs.webkit.org/show_bug.cgi?id=115631
+
+ Reviewed by Brent Fulgham.
+
+ If the m_maxDeadSize and m_deadSize are both 0, the method unnecessairly tries to prune resources.
+
+ No new tests, covered by existing ones.
+
+ * loader/cache/MemoryCache.cpp:
+ (WebCore::MemoryCache::prune):
+
2013-10-31 Joseph Pecoraro <[email protected]>
Web Inspector: Remove stale optional native memory instrumentation protocol params
Modified: trunk/Source/WebCore/loader/cache/MemoryCache.cpp (158356 => 158357)
--- trunk/Source/WebCore/loader/cache/MemoryCache.cpp 2013-10-31 12:02:51 UTC (rev 158356)
+++ trunk/Source/WebCore/loader/cache/MemoryCache.cpp 2013-10-31 14:07:48 UTC (rev 158357)
@@ -862,7 +862,7 @@
void MemoryCache::prune()
{
- if (m_liveSize + m_deadSize <= m_capacity && m_maxDeadCapacity && m_deadSize <= m_maxDeadCapacity) // Fast path.
+ if (m_liveSize + m_deadSize <= m_capacity && m_deadSize <= m_maxDeadCapacity) // Fast path.
return;
pruneDeadResources(); // Prune dead first, in case it was "borrowing" capacity from live.
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
