<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[46319] trunk</title>
</head>
<body>

<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt;  }
#msg dl a { font-weight: bold}
#msg dl a:link    { color:#fc3; }
#msg dl a:active  { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff  {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://trac.webkit.org/projects/webkit/changeset/46319">46319</a></dd>
<dt>Author</dt> <dd>jmalonzo@webkit.org</dd>
<dt>Date</dt> <dd>2009-07-23 23:50:31 -0700 (Thu, 23 Jul 2009)</dd>
</dl>

<h3>Log Message</h3>
<pre>2009-07-23  Jan Michael Alonzo  &lt;jmalonzo@webkit.org&gt;

        Reviewed by Eric Seidel.

        [Gtk] Add implementation of GCController for DRT
        https://bugs.webkit.org/show_bug.cgi?id=27636

        * DumpRenderTree/gtk/DumpRenderTree.cpp:
        (webViewWindowObjectCleared):
        (main):
        * DumpRenderTree/gtk/GCControllerGtk.cpp:
        (GCController::collect):
        (GCController::collectOnAlternateThread):

        Enable tests that are now passing.

        * platform/gtk/Skipped:

        Add SPI for GCController to use.

        * webkit/webkitprivate.h:
        * webkit/webkitwebframe.cpp:
        (webkit_gc_collect_javascript_objects):
        (webkit_gc_collect_javascript_objects_on_alternate_thread):
        (webkit_gc_count_javascript_objects):</pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsChangeLog">trunk/LayoutTests/ChangeLog</a></li>
<li><a href="#trunkLayoutTestsplatformgtkSkipped">trunk/LayoutTests/platform/gtk/Skipped</a></li>
<li><a href="#trunkWebKitgtkChangeLog">trunk/WebKit/gtk/ChangeLog</a></li>
<li><a href="#trunkWebKitgtkwebkitwebkitprivateh">trunk/WebKit/gtk/webkit/webkitprivate.h</a></li>
<li><a href="#trunkWebKitgtkwebkitwebkitwebframecpp">trunk/WebKit/gtk/webkit/webkitwebframe.cpp</a></li>
<li><a href="#trunkWebKitToolsChangeLog">trunk/WebKitTools/ChangeLog</a></li>
<li><a href="#trunkWebKitToolsDumpRenderTreegtkDumpRenderTreecpp">trunk/WebKitTools/DumpRenderTree/gtk/DumpRenderTree.cpp</a></li>
<li><a href="#trunkWebKitToolsDumpRenderTreegtkGCControllerGtkcpp">trunk/WebKitTools/DumpRenderTree/gtk/GCControllerGtk.cpp</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (46318 => 46319)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog        2009-07-24 06:37:59 UTC (rev 46318)
+++ trunk/LayoutTests/ChangeLog        2009-07-24 06:50:31 UTC (rev 46319)
</span><span class="lines">@@ -1,3 +1,14 @@
</span><ins>+2009-07-23  Jan Michael Alonzo  &lt;jmalonzo@webkit.org&gt;
+
+        Reviewed by Eric Seidel.
+
+        [Gtk] Add implementation of GCController for DRT
+        https://bugs.webkit.org/show_bug.cgi?id=27636
+
+        Enable tests that are now passing.
+
+        * platform/gtk/Skipped:
+
</ins><span class="cx"> 2009-07-23  Eric Seidel  &lt;eric@webkit.org&gt;
</span><span class="cx"> 
</span><span class="cx">         Reviewed by Darin Adler.
</span></span></pre></div>
<a id="trunkLayoutTestsplatformgtkSkipped"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/platform/gtk/Skipped (46318 => 46319)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/platform/gtk/Skipped        2009-07-24 06:37:59 UTC (rev 46318)
+++ trunk/LayoutTests/platform/gtk/Skipped        2009-07-24 06:50:31 UTC (rev 46319)
</span><span class="lines">@@ -1633,7 +1633,6 @@
</span><span class="cx"> fast/dom/tabindex-clamp.html
</span><span class="cx"> fast/dom/HTMLDocument/hasFocus.html
</span><span class="cx"> fast/dom/SelectorAPI/resig-SelectorsAPI-test.xhtml
</span><del>-fast/dom/StyleSheet/ownerNode-lifetime-2.html
</del><span class="cx"> fast/dom/Window/new-window-opener.html
</span><span class="cx"> fast/dom/Window/webkitConvertPoint.html
</span><span class="cx"> fast/dom/Window/window-onFocus.html
</span><span class="lines">@@ -1794,7 +1793,6 @@
</span><span class="cx"> fast/frames/hover-timer-crash.html
</span><span class="cx"> fast/frames/iframe-window-focus.html
</span><span class="cx"> fast/frames/location-put-after-removal.html
</span><del>-fast/frames/removal-before-attach-crash.html
</del><span class="cx"> fast/history/back-forward-is-asynchronous.html
</span><span class="cx"> fast/history/history_reload.html
</span><span class="cx"> fast/history/window-open.html
</span></span></pre></div>
<a id="trunkWebKitgtkChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/WebKit/gtk/ChangeLog (46318 => 46319)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/WebKit/gtk/ChangeLog        2009-07-24 06:37:59 UTC (rev 46318)
+++ trunk/WebKit/gtk/ChangeLog        2009-07-24 06:50:31 UTC (rev 46319)
</span><span class="lines">@@ -1,3 +1,18 @@
</span><ins>+2009-07-23  Jan Michael Alonzo  &lt;jmalonzo@webkit.org&gt;
+
+        Reviewed by Eric Seidel.
+
+        [Gtk] Add implementation of GCController for DRT
+        https://bugs.webkit.org/show_bug.cgi?id=27636
+
+        Add SPI for GCController to use.
+
+        * webkit/webkitprivate.h:
+        * webkit/webkitwebframe.cpp:
+        (webkit_gc_collect_javascript_objects):
+        (webkit_gc_collect_javascript_objects_on_alternate_thread):
+        (webkit_gc_count_javascript_objects):
+
</ins><span class="cx"> 2009-07-22  Xan Lopez  &lt;xlopez@igalia.com&gt;
</span><span class="cx"> 
</span><span class="cx">         Reviewed by Mark Rowe.
</span></span></pre></div>
<a id="trunkWebKitgtkwebkitwebkitprivateh"></a>
<div class="modfile"><h4>Modified: trunk/WebKit/gtk/webkit/webkitprivate.h (46318 => 46319)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/WebKit/gtk/webkit/webkitprivate.h        2009-07-24 06:37:59 UTC (rev 46318)
+++ trunk/WebKit/gtk/webkit/webkitprivate.h        2009-07-24 06:50:31 UTC (rev 46319)
</span><span class="lines">@@ -234,6 +234,15 @@
</span><span class="cx"> 
</span><span class="cx">     GHashTable*
</span><span class="cx">     webkit_history_items(void);
</span><ins>+
+    WEBKIT_API void
+    webkit_gc_collect_javascript_objects();
+
+    WEBKIT_API void
+    webkit_gc_collect_javascript_objects_on_alternate_thread(gboolean waitUntilDone);
+
+    WEBKIT_API gsize
+    webkit_gc_count_javascript_objects();
</ins><span class="cx"> }
</span><span class="cx"> 
</span><span class="cx"> #endif
</span></span></pre></div>
<a id="trunkWebKitgtkwebkitwebkitwebframecpp"></a>
<div class="modfile"><h4>Modified: trunk/WebKit/gtk/webkit/webkitwebframe.cpp (46318 => 46319)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/WebKit/gtk/webkit/webkitwebframe.cpp        2009-07-24 06:37:59 UTC (rev 46318)
+++ trunk/WebKit/gtk/webkit/webkitwebframe.cpp        2009-07-24 06:50:31 UTC (rev 46319)
</span><span class="lines">@@ -40,9 +40,11 @@
</span><span class="cx"> #include &quot;FrameTree.h&quot;
</span><span class="cx"> #include &quot;FrameView.h&quot;
</span><span class="cx"> #include &lt;glib/gi18n-lib.h&gt;
</span><ins>+#include &quot;GCController.h&quot;
</ins><span class="cx"> #include &quot;GraphicsContext.h&quot;
</span><span class="cx"> #include &quot;HTMLFrameOwnerElement.h&quot;
</span><span class="cx"> #include &quot;JSDOMWindow.h&quot;
</span><ins>+#include &quot;JSLock.h&quot;
</ins><span class="cx"> #include &quot;PrintContext.h&quot;
</span><span class="cx"> #include &quot;RenderView.h&quot;
</span><span class="cx"> #include &quot;RenderTreeAsText.h&quot;
</span><span class="lines">@@ -835,3 +837,21 @@
</span><span class="cx"> 
</span><span class="cx">     core(frame)-&gt;tree()-&gt;clearName();
</span><span class="cx"> }
</span><ins>+
+void webkit_gc_collect_javascript_objects()
+{
+    gcController().garbageCollectNow();
+}
+
+void webkit_gc_collect_javascript_objects_on_alternate_thread(gboolean waitUntilDone)
+{
+    gcController().garbageCollectOnAlternateThreadForDebugging(waitUntilDone);
+}
+
+gsize webkit_gc_count_javascript_objects()
+{
+    JSC::JSLock lock(false);
+    return JSDOMWindow::commonJSGlobalData()-&gt;heap.objectCount();
+
+}
+
</ins></span></pre></div>
<a id="trunkWebKitToolsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/WebKitTools/ChangeLog (46318 => 46319)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/WebKitTools/ChangeLog        2009-07-24 06:37:59 UTC (rev 46318)
+++ trunk/WebKitTools/ChangeLog        2009-07-24 06:50:31 UTC (rev 46319)
</span><span class="lines">@@ -1,3 +1,18 @@
</span><ins>+2009-07-23  Jan Michael Alonzo  &lt;jmalonzo@webkit.org&gt;
+
+        Reviewed by Eric Seidel.
+
+        [Gtk] Add implementation of GCController for DRT
+        https://bugs.webkit.org/show_bug.cgi?id=27636
+
+        * DumpRenderTree/gtk/DumpRenderTree.cpp:
+        (webViewWindowObjectCleared):
+        (main):
+        * DumpRenderTree/gtk/GCControllerGtk.cpp:
+        (GCController::collect):
+        (GCController::collectOnAlternateThread):
+        (GCController::getJSObjectCount):
+
</ins><span class="cx"> 2009-07-23  Mark Rowe  &lt;mrowe@apple.com&gt;
</span><span class="cx"> 
</span><span class="cx">         Update build.webkit.org config for new machine.
</span></span></pre></div>
<a id="trunkWebKitToolsDumpRenderTreegtkDumpRenderTreecpp"></a>
<div class="modfile"><h4>Modified: trunk/WebKitTools/DumpRenderTree/gtk/DumpRenderTree.cpp (46318 => 46319)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/WebKitTools/DumpRenderTree/gtk/DumpRenderTree.cpp        2009-07-24 06:37:59 UTC (rev 46318)
+++ trunk/WebKitTools/DumpRenderTree/gtk/DumpRenderTree.cpp        2009-07-24 06:50:31 UTC (rev 46319)
</span><span class="lines">@@ -31,6 +31,7 @@
</span><span class="cx"> #include &quot;config.h&quot;
</span><span class="cx"> #include &quot;DumpRenderTree.h&quot;
</span><span class="cx"> 
</span><ins>+#include &quot;GCController.h&quot;
</ins><span class="cx"> #include &quot;LayoutTestController.h&quot;
</span><span class="cx"> #include &quot;WorkQueue.h&quot;
</span><span class="cx"> #include &quot;WorkQueueItem.h&quot;
</span><span class="lines">@@ -68,6 +69,7 @@
</span><span class="cx"> static int dumpTree = 1;
</span><span class="cx"> 
</span><span class="cx"> LayoutTestController* gLayoutTestController = 0;
</span><ins>+static GCController* gcController = 0;
</ins><span class="cx"> static WebKitWebView* webView;
</span><span class="cx"> static GtkWidget* container;
</span><span class="cx"> WebKitWebFrame* mainFrame = 0;
</span><span class="lines">@@ -480,6 +482,9 @@
</span><span class="cx"> 
</span><span class="cx">     gLayoutTestController-&gt;makeWindowObject(context, windowObject, &amp;exception);
</span><span class="cx">     assert(!exception);
</span><ins>+
+    gcController-&gt;makeWindowObject(context, windowObject, &amp;exception);
+    ASSERT(!exception);
</ins><span class="cx"> }
</span><span class="cx"> 
</span><span class="cx"> static gboolean webViewConsoleMessage(WebKitWebView* view, const gchar* message, unsigned int line, const gchar* sourceId, gpointer data)
</span><span class="lines">@@ -659,6 +664,8 @@
</span><span class="cx"> 
</span><span class="cx">     setDefaultsToConsistentStateValuesForTesting();
</span><span class="cx"> 
</span><ins>+    gcController = new GCController();
+
</ins><span class="cx">     if (argc == optind+1 &amp;&amp; strcmp(argv[optind], &quot;-&quot;) == 0) {
</span><span class="cx">         char filenameBuffer[2048];
</span><span class="cx">         printSeparators = true;
</span><span class="lines">@@ -678,6 +685,9 @@
</span><span class="cx">             runTest(argv[i]);
</span><span class="cx">     }
</span><span class="cx"> 
</span><ins>+    delete gcController;
+    gcController = 0;
+
</ins><span class="cx">     g_object_unref(webView);
</span><span class="cx"> 
</span><span class="cx">     return 0;
</span></span></pre></div>
<a id="trunkWebKitToolsDumpRenderTreegtkGCControllerGtkcpp"></a>
<div class="modfile"><h4>Modified: trunk/WebKitTools/DumpRenderTree/gtk/GCControllerGtk.cpp (46318 => 46319)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/WebKitTools/DumpRenderTree/gtk/GCControllerGtk.cpp        2009-07-24 06:37:59 UTC (rev 46318)
+++ trunk/WebKitTools/DumpRenderTree/gtk/GCControllerGtk.cpp        2009-07-24 06:50:31 UTC (rev 46319)
</span><span class="lines">@@ -29,15 +29,26 @@
</span><span class="cx"> #include &quot;config.h&quot;
</span><span class="cx"> #include &quot;GCController.h&quot;
</span><span class="cx"> 
</span><ins>+#include &lt;glib.h&gt;
+#include &lt;webkit/webkit.h&gt;
+
+extern &quot;C&quot; {
+extern void webkit_gc_collect_javascript_objects();
+extern void webkit_gc_collect_javascript_objects_on_alternate_thread(gboolean waitUntilDone);
+extern gsize webkit_gc_count_javascript_objects();
+}
+
</ins><span class="cx"> void GCController::collect() const
</span><span class="cx"> {
</span><ins>+    webkit_gc_collect_javascript_objects();
</ins><span class="cx"> }
</span><span class="cx"> 
</span><span class="cx"> void GCController::collectOnAlternateThread(bool waitUntilDone) const
</span><span class="cx"> {
</span><ins>+    webkit_gc_collect_javascript_objects_on_alternate_thread(waitUntilDone);
</ins><span class="cx"> }
</span><span class="cx"> 
</span><span class="cx"> size_t GCController::getJSObjectCount() const
</span><span class="cx"> {
</span><del>-    return 0;
</del><ins>+    return webkit_gc_count_javascript_objects();
</ins><span class="cx"> }
</span></span></pre>
</div>
</div>

</body>
</html>