<!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>[42085] trunk/WebKitTools</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/42085">42085</a></dd>
<dt>Author</dt> <dd>darin@apple.com</dd>
<dt>Date</dt> <dd>2009-03-29 10:31:51 -0700 (Sun, 29 Mar 2009)</dd>
</dl>

<h3>Log Message</h3>
<pre>2009-03-29  Darin Adler  &lt;darin@apple.com&gt;

        * DumpRenderTree/qt/jsobjects.cpp: Rolled out changes to this file. Maybe this will fix
        Qt building of DumpRenderTree.</pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkWebKitToolsChangeLog">trunk/WebKitTools/ChangeLog</a></li>
<li><a href="#trunkWebKitToolsDumpRenderTreeqtjsobjectscpp">trunk/WebKitTools/DumpRenderTree/qt/jsobjects.cpp</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkWebKitToolsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/WebKitTools/ChangeLog (42084 => 42085)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/WebKitTools/ChangeLog        2009-03-29 17:15:41 UTC (rev 42084)
+++ trunk/WebKitTools/ChangeLog        2009-03-29 17:31:51 UTC (rev 42085)
</span><span class="lines">@@ -1,5 +1,10 @@
</span><span class="cx"> 2009-03-29  Darin Adler  &lt;darin@apple.com&gt;
</span><span class="cx"> 
</span><ins>+        * DumpRenderTree/qt/jsobjects.cpp: Rolled out changes to this file. Maybe this will fix
+        Qt building of DumpRenderTree.
+
+2009-03-29  Darin Adler  &lt;darin@apple.com&gt;
+
</ins><span class="cx">         Reviewed by Cameron Zwarich.
</span><span class="cx"> 
</span><span class="cx">         Bug 24922: change WorkQueue-based navigation tests to not depend on synchronous form submission
</span></span></pre></div>
<a id="trunkWebKitToolsDumpRenderTreeqtjsobjectscpp"></a>
<div class="modfile"><h4>Modified: trunk/WebKitTools/DumpRenderTree/qt/jsobjects.cpp (42084 => 42085)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/WebKitTools/DumpRenderTree/qt/jsobjects.cpp        2009-03-29 17:15:41 UTC (rev 42084)
+++ trunk/WebKitTools/DumpRenderTree/qt/jsobjects.cpp        2009-03-29 17:31:51 UTC (rev 42085)
</span><span class="lines">@@ -132,8 +132,16 @@
</span><span class="cx"> {
</span><span class="cx">     qDebug() &lt;&lt; &quot;&gt;&gt;&gt;processWork&quot;;
</span><span class="cx"> 
</span><del>-    // if we finish all the commands, we're ready to dump state
-    if (WorkQueue::shared()-&gt;processWork() &amp;&amp; !shouldWaitUntilDone()) {
</del><ins>+    // quit doing work once a load is in progress
+    while (WorkQueue::shared()-&gt;count() &gt; 0 &amp;&amp; !m_topLoadingFrame) {
+        WorkQueueItem* item = WorkQueue::shared()-&gt;dequeue();
+        Q_ASSERT(item);
+        item-&gt;invoke();
+        delete item;
+    }
+
+    // if we didn't start a new load, then we finished all the commands, so we're ready to dump state
+    if (!m_topLoadingFrame &amp;&amp; !shouldWaitUntilDone()) {
</ins><span class="cx">         emit done();
</span><span class="cx">         m_isLoading = false;
</span><span class="cx">     }
</span><span class="lines">@@ -193,6 +201,18 @@
</span><span class="cx">     qt_dump_resource_load_callbacks(true);
</span><span class="cx"> }
</span><span class="cx"> 
</span><ins>+void LayoutTestController::queueBackNavigation(int howFarBackward)
+{
+    //qDebug() &lt;&lt; &quot;&gt;&gt;&gt;queueBackNavigation&quot; &lt;&lt; howFarBackward;
+    WorkQueue::shared()-&gt;queue(new BackItem(howFarBackward, m_drt-&gt;webPage()));
+}
+
+void LayoutTestController::queueForwardNavigation(int howFarForward)
+{
+    //qDebug() &lt;&lt; &quot;&gt;&gt;&gt;queueForwardNavigation&quot; &lt;&lt; howFarForward;
+    WorkQueue::shared()-&gt;queue(new ForwardItem(howFarForward, m_drt-&gt;webPage()));
+}
+
</ins><span class="cx"> void LayoutTestController::queueLoad(const QString &amp;url, const QString &amp;target)
</span><span class="cx"> {
</span><span class="cx">     //qDebug() &lt;&lt; &quot;&gt;&gt;&gt;queueLoad&quot; &lt;&lt; url &lt;&lt; target;
</span><span class="lines">@@ -201,6 +221,18 @@
</span><span class="cx">     WorkQueue::shared()-&gt;queue(new LoadItem(absoluteUrl, target, m_drt-&gt;webPage()));
</span><span class="cx"> }
</span><span class="cx"> 
</span><ins>+void LayoutTestController::queueReload()
+{
+    //qDebug() &lt;&lt; &quot;&gt;&gt;&gt;queueReload&quot;;
+    WorkQueue::shared()-&gt;queue(new ReloadItem(m_drt-&gt;webPage()));
+}
+
+void LayoutTestController::queueScript(const QString &amp;url)
+{
+    //qDebug() &lt;&lt; &quot;&gt;&gt;&gt;queueScript&quot; &lt;&lt; url;
+    WorkQueue::shared()-&gt;queue(new ScriptItem(url, m_drt-&gt;webPage()));
+}
+
</ins><span class="cx"> void LayoutTestController::provisionalLoad()
</span><span class="cx"> {
</span><span class="cx">     QWebFrame *frame = qobject_cast&lt;QWebFrame*&gt;(sender());
</span></span></pre>
</div>
</div>

</body>
</html>