Title: [148951] trunk/Source/WebKit/qt
- Revision
- 148951
- Author
- [email protected]
- Date
- 2013-04-23 01:33:23 -0700 (Tue, 23 Apr 2013)
Log Message
[Qt][WK1] MemoryCache is not cleaned by default
https://bugs.webkit.org/show_bug.cgi?id=111443
Reviewed by Jocelyn Turcotte.
Enable deletion of dead resources in the memory cache as long as the MemoryCache is enabled.
This can be disabled or tuned using the dynamic property "_q_deadDecodedDataDeletionInterval".
The default is set to match that of most other ports and WK2 with cache in WebBrowsing mode.
* Api/qwebsettings.cpp:
(QWebSettings::setObjectCacheCapacities):
* WebCoreSupport/InitWebCoreQt.cpp:
(WebCore::initializeWebCoreQt):
Modified Paths
Diff
Modified: trunk/Source/WebKit/qt/Api/qwebsettings.cpp (148950 => 148951)
--- trunk/Source/WebKit/qt/Api/qwebsettings.cpp 2013-04-23 08:31:25 UTC (rev 148950)
+++ trunk/Source/WebKit/qt/Api/qwebsettings.cpp 2013-04-23 08:33:23 UTC (rev 148951)
@@ -916,6 +916,7 @@
WebCore::memoryCache()->setCapacities(qMax(0, cacheMinDeadCapacity),
qMax(0, cacheMaxDead),
qMax(0, totalCapacity));
+ WebCore::memoryCache()->setDeadDecodedDataDeletionInterval(disableCache ? 0 : 60);
}
/*!
Modified: trunk/Source/WebKit/qt/ChangeLog (148950 => 148951)
--- trunk/Source/WebKit/qt/ChangeLog 2013-04-23 08:31:25 UTC (rev 148950)
+++ trunk/Source/WebKit/qt/ChangeLog 2013-04-23 08:33:23 UTC (rev 148951)
@@ -1,3 +1,20 @@
+2013-04-23 Allan Sandfeld Jensen <[email protected]>
+
+ [Qt][WK1] MemoryCache is not cleaned by default
+ https://bugs.webkit.org/show_bug.cgi?id=111443
+
+ Reviewed by Jocelyn Turcotte.
+
+ Enable deletion of dead resources in the memory cache as long as the MemoryCache is enabled.
+
+ This can be disabled or tuned using the dynamic property "_q_deadDecodedDataDeletionInterval".
+ The default is set to match that of most other ports and WK2 with cache in WebBrowsing mode.
+
+ * Api/qwebsettings.cpp:
+ (QWebSettings::setObjectCacheCapacities):
+ * WebCoreSupport/InitWebCoreQt.cpp:
+ (WebCore::initializeWebCoreQt):
+
2013-04-17 Geoffrey Garen <[email protected]>
Renamed JSGlobalData to VM
Modified: trunk/Source/WebKit/qt/WebCoreSupport/InitWebCoreQt.cpp (148950 => 148951)
--- trunk/Source/WebKit/qt/WebCoreSupport/InitWebCoreQt.cpp 2013-04-23 08:31:25 UTC (rev 148950)
+++ trunk/Source/WebKit/qt/WebCoreSupport/InitWebCoreQt.cpp 2013-04-23 08:33:23 UTC (rev 148951)
@@ -35,6 +35,7 @@
#include "Font.h"
#include "Image.h"
#include "InitializeLogging.h"
+#include "MemoryCache.h"
#include "NotImplemented.h"
#include "Page.h"
#include "PlatformStrategiesQt.h"
@@ -109,6 +110,8 @@
#if USE(QTKIT)
InitWebCoreSystemInterface();
#endif
+ if (!WebCore::memoryCache()->disabled())
+ WebCore::memoryCache()->setDeadDecodedDataDeletionInterval(60);
initialized = true;
}
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
