<!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>[210628] 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/210628">210628</a></dd>
<dt>Author</dt> <dd>pvollan@apple.com</dd>
<dt>Date</dt> <dd>2017-01-12 01:22:45 -0800 (Thu, 12 Jan 2017)</dd>
</dl>
<h3>Log Message</h3>
<pre>Followup fix after <a href="http://trac.webkit.org/projects/webkit/changeset/210503">r210503</a>.
https://bugs.webkit.org/show_bug.cgi?id=166887
Reviewed by Alex Christensen.
After <http://trac.webkit.org/changeset/210503>, test results are written to a
duplicated file handle on Windows. This patch fixes the remaining call sites.
* DumpRenderTree/PixelDumpSupport.cpp:
* DumpRenderTree/TestRunner.cpp:
(TestRunner::waitToDumpWatchdogTimerFired):
* DumpRenderTree/TestRunner.h:
* DumpRenderTree/win/AccessibilityControllerWin.cpp:
* DumpRenderTree/win/DumpRenderTree.cpp:
* DumpRenderTree/win/DumpRenderTreeWin.h:
* DumpRenderTree/win/TestRunnerWin.cpp:
(TestRunner::setSpellCheckerLoggingEnabled):</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkToolsChangeLog">trunk/Tools/ChangeLog</a></li>
<li><a href="#trunkToolsDumpRenderTreePixelDumpSupportcpp">trunk/Tools/DumpRenderTree/PixelDumpSupport.cpp</a></li>
<li><a href="#trunkToolsDumpRenderTreeTestRunnercpp">trunk/Tools/DumpRenderTree/TestRunner.cpp</a></li>
<li><a href="#trunkToolsDumpRenderTreeTestRunnerh">trunk/Tools/DumpRenderTree/TestRunner.h</a></li>
<li><a href="#trunkToolsDumpRenderTreewinAccessibilityControllerWincpp">trunk/Tools/DumpRenderTree/win/AccessibilityControllerWin.cpp</a></li>
<li><a href="#trunkToolsDumpRenderTreewinDumpRenderTreecpp">trunk/Tools/DumpRenderTree/win/DumpRenderTree.cpp</a></li>
<li><a href="#trunkToolsDumpRenderTreewinDumpRenderTreeWinh">trunk/Tools/DumpRenderTree/win/DumpRenderTreeWin.h</a></li>
<li><a href="#trunkToolsDumpRenderTreewinTestRunnerWincpp">trunk/Tools/DumpRenderTree/win/TestRunnerWin.cpp</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkToolsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Tools/ChangeLog (210627 => 210628)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/ChangeLog 2017-01-12 09:01:40 UTC (rev 210627)
+++ trunk/Tools/ChangeLog 2017-01-12 09:22:45 UTC (rev 210628)
</span><span class="lines">@@ -1,3 +1,23 @@
</span><ins>+2017-01-12 Per Arne Vollan <pvollan@apple.com>
+
+ Followup fix after r210503.
+ https://bugs.webkit.org/show_bug.cgi?id=166887
+
+ Reviewed by Alex Christensen.
+
+ After <http://trac.webkit.org/changeset/210503>, test results are written to a
+ duplicated file handle on Windows. This patch fixes the remaining call sites.
+
+ * DumpRenderTree/PixelDumpSupport.cpp:
+ * DumpRenderTree/TestRunner.cpp:
+ (TestRunner::waitToDumpWatchdogTimerFired):
+ * DumpRenderTree/TestRunner.h:
+ * DumpRenderTree/win/AccessibilityControllerWin.cpp:
+ * DumpRenderTree/win/DumpRenderTree.cpp:
+ * DumpRenderTree/win/DumpRenderTreeWin.h:
+ * DumpRenderTree/win/TestRunnerWin.cpp:
+ (TestRunner::setSpellCheckerLoggingEnabled):
+
</ins><span class="cx"> 2017-01-11 Megan Gardner <megan_gardner@apple.com>
</span><span class="cx">
</span><span class="cx"> Add committer status for Megan
</span></span></pre></div>
<a id="trunkToolsDumpRenderTreePixelDumpSupportcpp"></a>
<div class="modfile"><h4>Modified: trunk/Tools/DumpRenderTree/PixelDumpSupport.cpp (210627 => 210628)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/DumpRenderTree/PixelDumpSupport.cpp 2017-01-12 09:01:40 UTC (rev 210627)
+++ trunk/Tools/DumpRenderTree/PixelDumpSupport.cpp 2017-01-12 09:22:45 UTC (rev 210628)
</span><span class="lines">@@ -43,10 +43,6 @@
</span><span class="cx"> #include "PixelDumpSupportCairo.h"
</span><span class="cx"> #endif
</span><span class="cx">
</span><del>-#if !PLATFORM(WIN)
-#define testResult stdout
-#endif
-
</del><span class="cx"> void dumpWebViewAsPixelsAndCompareWithExpected(const std::string& expectedHash)
</span><span class="cx"> {
</span><span class="cx"> RefPtr<BitmapContext> context;
</span></span></pre></div>
<a id="trunkToolsDumpRenderTreeTestRunnercpp"></a>
<div class="modfile"><h4>Modified: trunk/Tools/DumpRenderTree/TestRunner.cpp (210627 => 210628)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/DumpRenderTree/TestRunner.cpp 2017-01-12 09:01:40 UTC (rev 210627)
+++ trunk/Tools/DumpRenderTree/TestRunner.cpp 2017-01-12 09:22:45 UTC (rev 210628)
</span><span class="lines">@@ -60,6 +60,8 @@
</span><span class="cx"> #include <Carbon/Carbon.h>
</span><span class="cx"> #endif
</span><span class="cx">
</span><ins>+FILE* testResult = stdout;
+
</ins><span class="cx"> const unsigned TestRunner::viewWidth = 800;
</span><span class="cx"> const unsigned TestRunner::viewHeight = 600;
</span><span class="cx">
</span><span class="lines">@@ -2284,12 +2286,12 @@
</span><span class="cx"> void TestRunner::waitToDumpWatchdogTimerFired()
</span><span class="cx"> {
</span><span class="cx"> const char* message = "FAIL: Timed out waiting for notifyDone to be called\n";
</span><del>- fprintf(stdout, "%s", message);
</del><ins>+ fprintf(testResult, "%s", message);
</ins><span class="cx">
</span><span class="cx"> auto accumulatedLogs = getAndResetAccumulatedLogs();
</span><span class="cx"> if (!accumulatedLogs.isEmpty()) {
</span><span class="cx"> const char* message = "Logs accumulated during test run:\n";
</span><del>- fprintf(stdout, "%s%s\n", message, accumulatedLogs.utf8().data());
</del><ins>+ fprintf(testResult, "%s%s\n", message, accumulatedLogs.utf8().data());
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> notifyDone();
</span></span></pre></div>
<a id="trunkToolsDumpRenderTreeTestRunnerh"></a>
<div class="modfile"><h4>Modified: trunk/Tools/DumpRenderTree/TestRunner.h (210627 => 210628)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/DumpRenderTree/TestRunner.h 2017-01-12 09:01:40 UTC (rev 210627)
+++ trunk/Tools/DumpRenderTree/TestRunner.h 2017-01-12 09:22:45 UTC (rev 210628)
</span><span class="lines">@@ -36,6 +36,8 @@
</span><span class="cx"> #include <vector>
</span><span class="cx"> #include <wtf/RefCounted.h>
</span><span class="cx">
</span><ins>+extern FILE* testResult;
+
</ins><span class="cx"> class TestRunner : public WTR::UIScriptContextDelegate, public RefCounted<TestRunner> {
</span><span class="cx"> WTF_MAKE_NONCOPYABLE(TestRunner);
</span><span class="cx"> public:
</span></span></pre></div>
<a id="trunkToolsDumpRenderTreewinAccessibilityControllerWincpp"></a>
<div class="modfile"><h4>Modified: trunk/Tools/DumpRenderTree/win/AccessibilityControllerWin.cpp (210627 => 210628)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/DumpRenderTree/win/AccessibilityControllerWin.cpp 2017-01-12 09:01:40 UTC (rev 210627)
+++ trunk/Tools/DumpRenderTree/win/AccessibilityControllerWin.cpp 2017-01-12 09:22:45 UTC (rev 210628)
</span><span class="lines">@@ -29,6 +29,7 @@
</span><span class="cx"> #include "AccessibilityUIElement.h"
</span><span class="cx"> #include "DumpRenderTree.h"
</span><span class="cx"> #include "FrameLoadDelegate.h"
</span><ins>+#include "TestRunner.h"
</ins><span class="cx"> #include <JavaScriptCore/JSRetainPtr.h>
</span><span class="cx"> #include <JavaScriptCore/JSStringRef.h>
</span><span class="cx"> #include <JavaScriptCore/JSStringRefBSTR.h>
</span></span></pre></div>
<a id="trunkToolsDumpRenderTreewinDumpRenderTreecpp"></a>
<div class="modfile"><h4>Modified: trunk/Tools/DumpRenderTree/win/DumpRenderTree.cpp (210627 => 210628)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/DumpRenderTree/win/DumpRenderTree.cpp 2017-01-12 09:01:40 UTC (rev 210627)
+++ trunk/Tools/DumpRenderTree/win/DumpRenderTree.cpp 2017-01-12 09:22:45 UTC (rev 210628)
</span><span class="lines">@@ -123,8 +123,6 @@
</span><span class="cx">
</span><span class="cx"> UINT_PTR waitToDumpWatchdog = 0;
</span><span class="cx">
</span><del>-FILE* testResult = nullptr;
-
</del><span class="cx"> void setPersistentUserStyleSheetLocation(CFStringRef url)
</span><span class="cx"> {
</span><span class="cx"> persistentUserStyleSheetLocation = url;
</span></span></pre></div>
<a id="trunkToolsDumpRenderTreewinDumpRenderTreeWinh"></a>
<div class="modfile"><h4>Modified: trunk/Tools/DumpRenderTree/win/DumpRenderTreeWin.h (210627 => 210628)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/DumpRenderTree/win/DumpRenderTreeWin.h 2017-01-12 09:01:40 UTC (rev 210627)
+++ trunk/Tools/DumpRenderTree/win/DumpRenderTreeWin.h 2017-01-12 09:22:45 UTC (rev 210628)
</span><span class="lines">@@ -43,8 +43,6 @@
</span><span class="cx">
</span><span class="cx"> extern HWND webViewWindow;
</span><span class="cx">
</span><del>-extern FILE* testResult;
-
</del><span class="cx"> #include <WebCore/COMPtr.h>
</span><span class="cx"> #include <string>
</span><span class="cx"> #include <wtf/HashMap.h>
</span></span></pre></div>
<a id="trunkToolsDumpRenderTreewinTestRunnerWincpp"></a>
<div class="modfile"><h4>Modified: trunk/Tools/DumpRenderTree/win/TestRunnerWin.cpp (210627 => 210628)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/DumpRenderTree/win/TestRunnerWin.cpp 2017-01-12 09:01:40 UTC (rev 210627)
+++ trunk/Tools/DumpRenderTree/win/TestRunnerWin.cpp 2017-01-12 09:22:45 UTC (rev 210628)
</span><span class="lines">@@ -1394,5 +1394,5 @@
</span><span class="cx">
</span><span class="cx"> void TestRunner::setSpellCheckerLoggingEnabled(bool enabled)
</span><span class="cx"> {
</span><del>- printf("ERROR: TestRunner::setSpellCheckerLoggingEnabled() not implemented\n");
</del><ins>+ fprintf(testResult, "ERROR: TestRunner::setSpellCheckerLoggingEnabled() not implemented\n");
</ins><span class="cx"> }
</span></span></pre>
</div>
</div>
</body>
</html>