Title: [126846] trunk
- Revision
- 126846
- Author
- [email protected]
- Date
- 2012-08-27 23:33:34 -0700 (Mon, 27 Aug 2012)
Log Message
[GTK] Memory cache should be cleared in between test runs
https://bugs.webkit.org/show_bug.cgi?id=95105
Reviewed by Martin Robinson.
Source/WebKit/gtk:
Add a DumpRenderTreeSupportGtk helper method that clears the
memory cache when called.
* WebCoreSupport/DumpRenderTreeSupportGtk.cpp:
(DumpRenderTreeSupportGtk::clearMemoryCache):
* WebCoreSupport/DumpRenderTreeSupportGtk.h:
(DumpRenderTreeSupportGtk):
Tools:
Call the new DumpRenderTreeSupportGtk helper method after every test
to clear the memory cache.
* DumpRenderTree/gtk/DumpRenderTree.cpp:
(runTest):
Modified Paths
Diff
Modified: trunk/Source/WebKit/gtk/ChangeLog (126845 => 126846)
--- trunk/Source/WebKit/gtk/ChangeLog 2012-08-28 06:29:49 UTC (rev 126845)
+++ trunk/Source/WebKit/gtk/ChangeLog 2012-08-28 06:33:34 UTC (rev 126846)
@@ -1,3 +1,18 @@
+2012-08-27 Zan Dobersek <[email protected]>
+
+ [GTK] Memory cache should be cleared in between test runs
+ https://bugs.webkit.org/show_bug.cgi?id=95105
+
+ Reviewed by Martin Robinson.
+
+ Add a DumpRenderTreeSupportGtk helper method that clears the
+ memory cache when called.
+
+ * WebCoreSupport/DumpRenderTreeSupportGtk.cpp:
+ (DumpRenderTreeSupportGtk::clearMemoryCache):
+ * WebCoreSupport/DumpRenderTreeSupportGtk.h:
+ (DumpRenderTreeSupportGtk):
+
2012-08-27 Sheriff Bot <[email protected]>
Unreviewed, rolling out r126836.
Modified: trunk/Source/WebKit/gtk/WebCoreSupport/DumpRenderTreeSupportGtk.cpp (126845 => 126846)
--- trunk/Source/WebKit/gtk/WebCoreSupport/DumpRenderTreeSupportGtk.cpp 2012-08-28 06:29:49 UTC (rev 126845)
+++ trunk/Source/WebKit/gtk/WebCoreSupport/DumpRenderTreeSupportGtk.cpp 2012-08-28 06:33:34 UTC (rev 126846)
@@ -50,6 +50,7 @@
#include "JSLock.h"
#include "JSNodeList.h"
#include "JSValue.h"
+#include "MemoryCache.h"
#include "MutationObserver.h"
#include "NodeList.h"
#include "PageGroup.h"
@@ -867,3 +868,8 @@
if (coreFrame && coreFrame->view())
coreFrame->view()->resetTrackedRepaints();
}
+
+void DumpRenderTreeSupportGtk::clearMemoryCache()
+{
+ memoryCache()->evictResources();
+}
Modified: trunk/Source/WebKit/gtk/WebCoreSupport/DumpRenderTreeSupportGtk.h (126845 => 126846)
--- trunk/Source/WebKit/gtk/WebCoreSupport/DumpRenderTreeSupportGtk.h 2012-08-28 06:29:49 UTC (rev 126845)
+++ trunk/Source/WebKit/gtk/WebCoreSupport/DumpRenderTreeSupportGtk.h 2012-08-28 06:33:34 UTC (rev 126846)
@@ -130,6 +130,8 @@
static GSList* trackedRepaintRects(WebKitWebFrame*);
static void resetTrackedRepaints(WebKitWebFrame*);
+ static void clearMemoryCache();
+
private:
static bool s_drtRun;
static bool s_linksIncludedInTabChain;
Modified: trunk/Tools/ChangeLog (126845 => 126846)
--- trunk/Tools/ChangeLog 2012-08-28 06:29:49 UTC (rev 126845)
+++ trunk/Tools/ChangeLog 2012-08-28 06:33:34 UTC (rev 126846)
@@ -1,3 +1,16 @@
+2012-08-27 Zan Dobersek <[email protected]>
+
+ [GTK] Memory cache should be cleared in between test runs
+ https://bugs.webkit.org/show_bug.cgi?id=95105
+
+ Reviewed by Martin Robinson.
+
+ Call the new DumpRenderTreeSupportGtk helper method after every test
+ to clear the memory cache.
+
+ * DumpRenderTree/gtk/DumpRenderTree.cpp:
+ (runTest):
+
2012-08-27 Sheriff Bot <[email protected]>
Unreviewed, rolling out r126836.
Modified: trunk/Tools/DumpRenderTree/gtk/DumpRenderTree.cpp (126845 => 126846)
--- trunk/Tools/DumpRenderTree/gtk/DumpRenderTree.cpp 2012-08-28 06:29:49 UTC (rev 126845)
+++ trunk/Tools/DumpRenderTree/gtk/DumpRenderTree.cpp 2012-08-28 06:33:34 UTC (rev 126846)
@@ -769,6 +769,7 @@
}
WebCoreTestSupport::resetInternalsObject(webkit_web_frame_get_global_context(mainFrame));
+ DumpRenderTreeSupportGtk::clearMemoryCache();
// A blank load seems to be necessary to reset state after certain tests.
webkit_web_view_open(webView, "about:blank");
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo/webkit-changes
