<!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>[145804] trunk/Tools</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/145804">145804</a></dd>
<dt>Author</dt> <dd>zeno.albisser@digia.com</dd>
<dt>Date</dt> <dd>2013-03-14 04:46:06 -0700 (Thu, 14 Mar 2013)</dd>
</dl>

<h3>Log Message</h3>
<pre>[Qt] Removing no-ops and simple setters/getters from TestRunnerQt
https://bugs.webkit.org/show_bug.cgi?id=112340

Reviewed by Simon Hausmann.

* DumpRenderTree/qt/DumpRenderTreeQt.cpp:
(DumpRenderTree::dump):
    Replace shouldDumpBackForwardList() with TestController:dumpBackForwardList().
(DumpRenderTree::dumpApplicationCacheQuota):
* DumpRenderTree/qt/TestRunnerQt.cpp:
(TestRunnerQt::reset):
* DumpRenderTree/qt/TestRunnerQt.h:
(TestRunnerQt):</pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkToolsChangeLog">trunk/Tools/ChangeLog</a></li>
<li><a href="#trunkToolsDumpRenderTreeqtDumpRenderTreeQtcpp">trunk/Tools/DumpRenderTree/qt/DumpRenderTreeQt.cpp</a></li>
<li><a href="#trunkToolsDumpRenderTreeqtTestRunnerQtcpp">trunk/Tools/DumpRenderTree/qt/TestRunnerQt.cpp</a></li>
<li><a href="#trunkToolsDumpRenderTreeqtTestRunnerQth">trunk/Tools/DumpRenderTree/qt/TestRunnerQt.h</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkToolsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Tools/ChangeLog (145803 => 145804)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/ChangeLog        2013-03-14 11:26:39 UTC (rev 145803)
+++ trunk/Tools/ChangeLog        2013-03-14 11:46:06 UTC (rev 145804)
</span><span class="lines">@@ -1,5 +1,21 @@
</span><span class="cx"> 2013-03-14  Zeno Albisser  &lt;zeno@webkit.org&gt;
</span><span class="cx"> 
</span><ins>+        [Qt] Removing no-ops and simple setters/getters from TestRunnerQt
+        https://bugs.webkit.org/show_bug.cgi?id=112340
+
+        Reviewed by Simon Hausmann.
+
+        * DumpRenderTree/qt/DumpRenderTreeQt.cpp:
+        (DumpRenderTree::dump):
+            Replace shouldDumpBackForwardList() with TestController:dumpBackForwardList().
+        (DumpRenderTree::dumpApplicationCacheQuota):
+        * DumpRenderTree/qt/TestRunnerQt.cpp:
+        (TestRunnerQt::reset):
+        * DumpRenderTree/qt/TestRunnerQt.h:
+        (TestRunnerQt):
+
+2013-03-14  Zeno Albisser  &lt;zeno@webkit.org&gt;
+
</ins><span class="cx">         [Qt] Port DRT to use TestRunner::dumpAsText()
</span><span class="cx">         https://bugs.webkit.org/show_bug.cgi?id=112260
</span><span class="cx"> 
</span></span></pre></div>
<a id="trunkToolsDumpRenderTreeqtDumpRenderTreeQtcpp"></a>
<div class="modfile"><h4>Modified: trunk/Tools/DumpRenderTree/qt/DumpRenderTreeQt.cpp (145803 => 145804)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/DumpRenderTree/qt/DumpRenderTreeQt.cpp        2013-03-14 11:26:39 UTC (rev 145803)
+++ trunk/Tools/DumpRenderTree/qt/DumpRenderTreeQt.cpp        2013-03-14 11:46:06 UTC (rev 145804)
</span><span class="lines">@@ -984,7 +984,7 @@
</span><span class="cx">         fprintf(stdout, &quot;Content-Type: %s\n&quot;, resultContentType.toUtf8().constData());
</span><span class="cx">         fprintf(stdout, &quot;%s&quot;, resultString.toUtf8().constData());
</span><span class="cx"> 
</span><del>-        if (m_controller-&gt;shouldDumpBackForwardList()) {
</del><ins>+        if (m_jscController-&gt;dumpBackForwardList()) {
</ins><span class="cx">             fprintf(stdout, &quot;%s&quot;, dumpBackForwardList(webPage()).toUtf8().constData());
</span><span class="cx">             foreach (QObject* widget, windows) {
</span><span class="cx">                 QWebPage* page = qobject_cast&lt;QWebPage*&gt;(widget-&gt;findChild&lt;QWebPage*&gt;());
</span><span class="lines">@@ -1125,7 +1125,7 @@
</span><span class="cx">                );
</span><span class="cx">     }
</span><span class="cx"> 
</span><del>-    if (m_controller-&gt;shouldDisallowIncreaseForApplicationCacheQuota())
</del><ins>+    if (m_jscController-&gt;disallowIncreaseForApplicationCacheQuota())
</ins><span class="cx">         return;
</span><span class="cx"> 
</span><span class="cx">     origin-&gt;setApplicationCacheQuota(defaultOriginQuota);
</span></span></pre></div>
<a id="trunkToolsDumpRenderTreeqtTestRunnerQtcpp"></a>
<div class="modfile"><h4>Modified: trunk/Tools/DumpRenderTree/qt/TestRunnerQt.cpp (145803 => 145804)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/DumpRenderTree/qt/TestRunnerQt.cpp        2013-03-14 11:26:39 UTC (rev 145803)
+++ trunk/Tools/DumpRenderTree/qt/TestRunnerQt.cpp        2013-03-14 11:46:06 UTC (rev 145804)
</span><span class="lines">@@ -58,12 +58,10 @@
</span><span class="cx">     m_hasDumped = false;
</span><span class="cx">     m_loadFinished = false;
</span><span class="cx">     m_audioDump = false;
</span><del>-    m_dumpBackForwardList = false;
</del><span class="cx">     m_dumpChildrenAsText = false;
</span><span class="cx">     m_dumpChildFrameScrollPositions = false;
</span><span class="cx">     m_canOpenWindows = false;
</span><span class="cx">     m_waitForDone = false;
</span><del>-    m_disallowIncreaseForApplicationCacheQuota = false;
</del><span class="cx">     m_dumpTitleChanges = false;
</span><span class="cx">     m_dumpDatabaseCallbacks = false;
</span><span class="cx">     m_dumpApplicationCacheDelegateCallbacks = false;
</span></span></pre></div>
<a id="trunkToolsDumpRenderTreeqtTestRunnerQth"></a>
<div class="modfile"><h4>Modified: trunk/Tools/DumpRenderTree/qt/TestRunnerQt.h (145803 => 145804)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/DumpRenderTree/qt/TestRunnerQt.h        2013-03-14 11:26:39 UTC (rev 145803)
+++ trunk/Tools/DumpRenderTree/qt/TestRunnerQt.h        2013-03-14 11:46:06 UTC (rev 145804)
</span><span class="lines">@@ -58,9 +58,7 @@
</span><span class="cx"> public:
</span><span class="cx">     TestRunnerQt(DumpRenderTree*);
</span><span class="cx"> 
</span><del>-    bool shouldDisallowIncreaseForApplicationCacheQuota() const { return m_disallowIncreaseForApplicationCacheQuota; }
</del><span class="cx">     bool shouldDumpAsAudio() const { return m_audioDump; }
</span><del>-    bool shouldDumpBackForwardList() const { return m_dumpBackForwardList; }
</del><span class="cx">     bool shouldDumpChildrenAsText() const { return m_dumpChildrenAsText; }
</span><span class="cx">     bool shouldDumpChildFrameScrollPositions() const { return m_dumpChildFrameScrollPositions; }
</span><span class="cx">     bool shouldDumpDatabaseCallbacks() const { return m_dumpDatabaseCallbacks; }
</span><span class="lines">@@ -96,7 +94,6 @@
</span><span class="cx"> 
</span><span class="cx"> public Q_SLOTS:
</span><span class="cx">     void maybeDump(bool ok);
</span><del>-    void disallowIncreaseForApplicationCacheQuota() { m_disallowIncreaseForApplicationCacheQuota = true; }
</del><span class="cx">     void dumpChildFramesAsText() { m_dumpChildrenAsText = true; }
</span><span class="cx">     void dumpChildFrameScrollPositions() { m_dumpChildFrameScrollPositions = true; }
</span><span class="cx">     void dumpDatabaseCallbacks() { m_dumpDatabaseCallbacks = true; }
</span><span class="lines">@@ -109,7 +106,6 @@
</span><span class="cx">     int webHistoryItemCount();
</span><span class="cx">     void keepWebHistory();
</span><span class="cx">     void notifyDone();
</span><del>-    void dumpBackForwardList() { m_dumpBackForwardList = true; }
</del><span class="cx">     bool globalFlag() const { return m_globalFlag; }
</span><span class="cx">     void setGlobalFlag(bool flag) { m_globalFlag = flag; }
</span><span class="cx">     void handleErrorPages() { m_handleErrorPages = true; }
</span><span class="lines">@@ -132,7 +128,6 @@
</span><span class="cx">     void queueLoadingScript(const QString&amp; script);
</span><span class="cx">     void queueNonLoadingScript(const QString&amp; script);
</span><span class="cx">     void provisionalLoad();
</span><del>-    void setCloseRemainingWindowsWhenComplete(bool = false) { }
</del><span class="cx">     int windowCount();
</span><span class="cx">     void ignoreLegacyWebNotificationPermissionRequests();
</span><span class="cx">     void simulateLegacyWebNotificationClick(const QString&amp; title);
</span><span class="lines">@@ -202,13 +197,6 @@
</span><span class="cx">     void setUserStyleSheetEnabled(bool);
</span><span class="cx">     void setDomainRelaxationForbiddenForURLScheme(bool forbidden, const QString&amp; scheme);
</span><span class="cx">     bool callShouldCloseOnWebView();
</span><del>-    // For now, this is a no-op. This may change depending on outcome of
-    // https://bugs.webkit.org/show_bug.cgi?id=33333
-    void setCallCloseOnWebViews() { }
-    // This is a no-op - it allows us to pass
-    // plugins/get-url-that-the-resource-load-delegate-will-disallow.html
-    // which is a Mac-specific test.
-    void addDisallowedURL(const QString&amp;) { }
</del><span class="cx"> 
</span><span class="cx">     void setMockDeviceOrientation(bool canProvideAlpha, double alpha, bool canProvideBeta, double beta, bool canProvideGamma, double gamma);
</span><span class="cx"> 
</span><span class="lines">@@ -228,9 +216,6 @@
</span><span class="cx"> 
</span><span class="cx">     void setAutomaticLinkDetectionEnabled(bool);
</span><span class="cx"> 
</span><del>-    // Empty stub method to keep parity with object model exposed by global TestRunner.
-    void abortModal() { }
-
</del><span class="cx">     void addURLToRedirect(const QString&amp; origin, const QString&amp; destination);
</span><span class="cx"> 
</span><span class="cx">     /*
</span><span class="lines">@@ -270,7 +255,6 @@
</span><span class="cx">     bool m_hasDumped;
</span><span class="cx">     bool m_audioDump;
</span><span class="cx">     bool m_disallowIncreaseForApplicationCacheQuota;
</span><del>-    bool m_dumpBackForwardList;
</del><span class="cx">     bool m_dumpChildrenAsText;
</span><span class="cx">     bool m_dumpChildFrameScrollPositions;
</span><span class="cx">     bool m_canOpenWindows;
</span></span></pre>
</div>
</div>

</body>
</html>