Title: [120001] trunk/Tools
- Revision
- 120001
- Author
- [email protected]
- Date
- 2012-06-11 13:16:27 -0700 (Mon, 11 Jun 2012)
Log Message
[EFL] [DRT] Reset CacheModel before running each test
https://bugs.webkit.org/show_bug.cgi?id=87534
Patch by Sudarsana Nagineni <[email protected]> on 2012-06-11
Reviewed by Gustavo Noronha Silva.
Reset cache model to default before running each test to fix some
flaky tests on EFL build bots. Also fix case value in setCacheModel.
* DumpRenderTree/efl/DumpRenderTreeChrome.cpp:
(DumpRenderTreeChrome::resetDefaultsToConsistentValues):
* DumpRenderTree/efl/LayoutTestControllerEfl.cpp:
(LayoutTestController::setCacheModel):
Modified Paths
Diff
Modified: trunk/Tools/ChangeLog (120000 => 120001)
--- trunk/Tools/ChangeLog 2012-06-11 20:15:47 UTC (rev 120000)
+++ trunk/Tools/ChangeLog 2012-06-11 20:16:27 UTC (rev 120001)
@@ -1,5 +1,20 @@
2012-06-11 Sudarsana Nagineni <[email protected]>
+ [EFL] [DRT] Reset CacheModel before running each test
+ https://bugs.webkit.org/show_bug.cgi?id=87534
+
+ Reviewed by Gustavo Noronha Silva.
+
+ Reset cache model to default before running each test to fix some
+ flaky tests on EFL build bots. Also fix case value in setCacheModel.
+
+ * DumpRenderTree/efl/DumpRenderTreeChrome.cpp:
+ (DumpRenderTreeChrome::resetDefaultsToConsistentValues):
+ * DumpRenderTree/efl/LayoutTestControllerEfl.cpp:
+ (LayoutTestController::setCacheModel):
+
+2012-06-11 Sudarsana Nagineni <[email protected]>
+
[GTK] Memory leaks in DRT EventSender.cpp
https://bugs.webkit.org/show_bug.cgi?id=88774
Modified: trunk/Tools/DumpRenderTree/efl/DumpRenderTreeChrome.cpp (120000 => 120001)
--- trunk/Tools/DumpRenderTree/efl/DumpRenderTreeChrome.cpp 2012-06-11 20:15:47 UTC (rev 120000)
+++ trunk/Tools/DumpRenderTree/efl/DumpRenderTreeChrome.cpp 2012-06-11 20:16:27 UTC (rev 120001)
@@ -272,7 +272,12 @@
DumpRenderTreeSupportEfl::setDefersLoading(mainView(), false);
DumpRenderTreeSupportEfl::setLoadsSiteIconsIgnoringImageLoadingSetting(mainView(), false);
DumpRenderTreeSupportEfl::setSerializeHTTPLoads(false);
+
+ // Reset capacities for the memory cache for dead objects.
+ static const unsigned cacheTotalCapacity = 8192 * 1024;
+ ewk_settings_object_cache_capacity_set(0, cacheTotalCapacity, cacheTotalCapacity);
DumpRenderTreeSupportEfl::setDeadDecodedDataDeletionInterval(0);
+ ewk_settings_page_cache_capacity_set(3);
if (m_currentIntentRequest) {
ewk_intent_request_unref(m_currentIntentRequest);
Modified: trunk/Tools/DumpRenderTree/efl/LayoutTestControllerEfl.cpp (120000 => 120001)
--- trunk/Tools/DumpRenderTree/efl/LayoutTestControllerEfl.cpp 2012-06-11 20:15:47 UTC (rev 120000)
+++ trunk/Tools/DumpRenderTree/efl/LayoutTestControllerEfl.cpp 2012-06-11 20:16:27 UTC (rev 120001)
@@ -55,6 +55,13 @@
#include <stdio.h>
#include <wtf/text/WTFString.h>
+// Same as Mac cache model enum in Source/WebKit/mac/WebView/WebPreferences.h.
+enum {
+ WebCacheModelDocumentViewer = 0,
+ WebCacheModelDocumentBrowser = 1,
+ WebCacheModelPrimaryWebBrowser = 2
+};
+
LayoutTestController::~LayoutTestController()
{
}
@@ -548,21 +555,21 @@
// These constants are derived from the Mac cache model enum in Source/WebKit/mac/WebView/WebPreferences.h.
switch (cacheModel) {
- case 0: // WebCacheModelDocumentViewer
+ case WebCacheModelDocumentViewer:
pageCacheCapacity = 0;
cacheTotalCapacity = 0;
cacheMinDeadCapacity = 0;
cacheMaxDeadCapacity = 0;
deadDecodedDataDeletionInterval = 0;
break;
- case 1: // WebCacheModelDocumentBrowser
+ case WebCacheModelDocumentBrowser:
pageCacheCapacity = 2;
cacheTotalCapacity = 16 * 1024 * 1024;
cacheMinDeadCapacity = cacheTotalCapacity / 8;
cacheMaxDeadCapacity = cacheTotalCapacity / 4;
deadDecodedDataDeletionInterval = 0;
break;
- case 3: // WebCacheModelPrimaryWebBrowser
+ case WebCacheModelPrimaryWebBrowser:
pageCacheCapacity = 3;
cacheTotalCapacity = 32 * 1024 * 1024;
cacheMinDeadCapacity = cacheTotalCapacity / 4;
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
