<!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>[178139] 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/178139">178139</a></dd>
<dt>Author</dt> <dd>bfulgham@apple.com</dd>
<dt>Date</dt> <dd>2015-01-08 15:34:31 -0800 (Thu, 08 Jan 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Tools:
[Win] DumpRenderTree is always using 800x600 size, even if tests need other size.
https://bugs.webkit.org/show_bug.cgi?id=140256
Reviewed by Anders Carlsson.
* DumpRenderTree/win/DumpRenderTree.cpp:
(resetWebPreferencesToConsistentValues): Drive-by fix of a buffer overrun found while
running with heap validation checks.
(sizeWebViewForCurrentTest): Check both path separators ('/' and '\\') when checking for
the "svg\\W3C-SVG-1.1" test directory.
(removeFontFallbackIfPresent): Use nullptr instead of 0.
* DumpRenderTree/win/TestRunnerWin.cpp:
(TestRunner::clearPersistentUserStyleSheet): Ditto.
LayoutTests:
[Win] DumpRenderTree always using 800x600 size even if test needs other size
https://bugs.webkit.org/show_bug.cgi?id=140256
Reviewed by Anders Carlsson.
* platform/win/TestExpectations: Take out the skips now that this works properly.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsChangeLog">trunk/LayoutTests/ChangeLog</a></li>
<li><a href="#trunkLayoutTestsplatformwinTestExpectations">trunk/LayoutTests/platform/win/TestExpectations</a></li>
<li><a href="#trunkToolsChangeLog">trunk/Tools/ChangeLog</a></li>
<li><a href="#trunkToolsDumpRenderTreewinDumpRenderTreecpp">trunk/Tools/DumpRenderTree/win/DumpRenderTree.cpp</a></li>
<li><a href="#trunkToolsDumpRenderTreewinTestRunnerWincpp">trunk/Tools/DumpRenderTree/win/TestRunnerWin.cpp</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (178138 => 178139)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog 2015-01-08 23:28:26 UTC (rev 178138)
+++ trunk/LayoutTests/ChangeLog 2015-01-08 23:34:31 UTC (rev 178139)
</span><span class="lines">@@ -1,3 +1,12 @@
</span><ins>+2015-01-08 Brent Fulgham <bfulgham@apple.com>
+
+ [Win] DumpRenderTree always using 800x600 size even if test needs other size
+ https://bugs.webkit.org/show_bug.cgi?id=140256
+
+ Reviewed by Anders Carlsson.
+
+ * platform/win/TestExpectations: Take out the skips now that this works properly.
+
</ins><span class="cx"> 2015-01-08 Joseph Pecoraro <pecoraro@apple.com>
</span><span class="cx">
</span><span class="cx"> Web Inspector: Pause Reason Improvements (Breakpoint, Debugger Statement, Pause on Next Statement)
</span></span></pre></div>
<a id="trunkLayoutTestsplatformwinTestExpectations"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/platform/win/TestExpectations (178138 => 178139)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/platform/win/TestExpectations 2015-01-08 23:28:26 UTC (rev 178138)
+++ trunk/LayoutTests/platform/win/TestExpectations 2015-01-08 23:34:31 UTC (rev 178139)
</span><span class="lines">@@ -3181,39 +3181,6 @@
</span><span class="cx"> webkit.org/b/140254 imported/mozilla/svg/blend-overlay.svg [ ImageOnlyFailure ]
</span><span class="cx"> webkit.org/b/140254 imported/mozilla/svg/blend-screen.svg [ ImageOnlyFailure ]
</span><span class="cx">
</span><del>-# Several SVG tests fail due to improper screen size in DRT
-webkit.org/b/140256 svg/W3C-SVG-1.1-SE/color-prop-05-t.svg [ Failure ]
-webkit.org/b/140256 svg/W3C-SVG-1.1-SE/coords-dom-01-f.svg [ Failure ]
-webkit.org/b/140256 svg/W3C-SVG-1.1-SE/coords-dom-02-f.svg [ Failure ]
-webkit.org/b/140256 svg/W3C-SVG-1.1-SE/coords-dom-03-f.svg [ Failure ]
-webkit.org/b/140256 svg/W3C-SVG-1.1-SE/coords-dom-04-f.svg [ Failure ]
-webkit.org/b/140256 svg/W3C-SVG-1.1-SE/coords-units-03-b.svg [ Failure ]
-webkit.org/b/140256 svg/W3C-SVG-1.1-SE/filters-felem-01-b.svg [ Failure ]
-webkit.org/b/140256 svg/W3C-SVG-1.1-SE/filters-image-03-f.svg [ Failure ]
-webkit.org/b/140256 svg/W3C-SVG-1.1-SE/filters-image-05-f.svg [ Failure ]
-webkit.org/b/140256 svg/W3C-SVG-1.1-SE/interact-pointer-03-t.svg [ Failure ]
-webkit.org/b/140256 svg/W3C-SVG-1.1-SE/painting-marker-05-f.svg [ Failure ]
-webkit.org/b/140256 svg/W3C-SVG-1.1-SE/painting-marker-06-f.svg [ Failure ]
-webkit.org/b/140256 svg/W3C-SVG-1.1-SE/painting-marker-07-f.svg [ Failure ]
-webkit.org/b/140256 svg/W3C-SVG-1.1-SE/paths-dom-02-f.svg [ Failure ]
-webkit.org/b/140256 svg/W3C-SVG-1.1-SE/pservers-grad-17-b.svg [ Failure ]
-webkit.org/b/140256 svg/W3C-SVG-1.1-SE/pservers-grad-20-b.svg [ Failure ]
-webkit.org/b/140256 svg/W3C-SVG-1.1-SE/pservers-pattern-03-f.svg [ Failure ]
-webkit.org/b/140256 svg/W3C-SVG-1.1-SE/pservers-pattern-04-f.svg [ Failure ]
-webkit.org/b/140256 svg/W3C-SVG-1.1-SE/struct-dom-11-f.svg [ Failure ]
-webkit.org/b/140256 svg/W3C-SVG-1.1-SE/struct-use-11-f.svg [ Failure ]
-webkit.org/b/140256 svg/W3C-SVG-1.1-SE/struct-use-14-f.svg [ Failure ]
-webkit.org/b/140256 svg/W3C-SVG-1.1-SE/styling-css-04-f.svg [ Failure ]
-webkit.org/b/140256 svg/W3C-SVG-1.1-SE/styling-pres-02-f.svg [ Failure ]
-webkit.org/b/140256 svg/W3C-SVG-1.1-SE/svgdom-over-01-f.svg [ Failure ]
-webkit.org/b/140256 svg/W3C-SVG-1.1-SE/text-tref-03-b.svg [ Failure ]
-webkit.org/b/140256 svg/W3C-SVG-1.1-SE/text-tspan-02-b.svg [ Failure ]
-webkit.org/b/140256 svg/W3C-SVG-1.1-SE/types-dom-02-f.svg [ Failure ]
-webkit.org/b/140256 svg/W3C-SVG-1.1-SE/types-dom-03-b.svg [ Failure ]
-webkit.org/b/140256 svg/W3C-SVG-1.1-SE/types-dom-04-b.svg [ Failure ]
-webkit.org/b/140256 svg/W3C-SVG-1.1-SE/types-dom-05-b.svg [ Failure ]
-webkit.org/b/140256 svg/W3C-SVG-1.1-SE/types-dom-06-f.svg [ Failure ]
-webkit.org/b/140256 svg/W3C-SVG-1.1-SE/types-dom-07-f.svg [ Failure ]
</del><span class="cx"> webkit.org/b/140256 svg/W3C-SVG-1.1/animate-elem-64-t.svg [ Failure ]
</span><span class="cx"> webkit.org/b/140256 svg/W3C-SVG-1.1/animate-elem-65-t.svg [ Failure ]
</span><span class="cx">
</span></span></pre></div>
<a id="trunkToolsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Tools/ChangeLog (178138 => 178139)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/ChangeLog 2015-01-08 23:28:26 UTC (rev 178138)
+++ trunk/Tools/ChangeLog 2015-01-08 23:34:31 UTC (rev 178139)
</span><span class="lines">@@ -1,3 +1,19 @@
</span><ins>+2015-01-08 Brent Fulgham <bfulgham@apple.com>
+
+ [Win] DumpRenderTree is always using 800x600 size, even if tests need other size.
+ https://bugs.webkit.org/show_bug.cgi?id=140256
+
+ Reviewed by Anders Carlsson.
+
+ * DumpRenderTree/win/DumpRenderTree.cpp:
+ (resetWebPreferencesToConsistentValues): Drive-by fix of a buffer overrun found while
+ running with heap validation checks.
+ (sizeWebViewForCurrentTest): Check both path separators ('/' and '\\') when checking for
+ the "svg\\W3C-SVG-1.1" test directory.
+ (removeFontFallbackIfPresent): Use nullptr instead of 0.
+ * DumpRenderTree/win/TestRunnerWin.cpp:
+ (TestRunner::clearPersistentUserStyleSheet): Ditto.
+
</ins><span class="cx"> 2015-01-08 Alexey Proskuryakov <ap@apple.com>
</span><span class="cx">
</span><span class="cx"> Follow-up to: When WebProcess is slow to respond to IPC, that's mistakenly reported as crash
</span></span></pre></div>
<a id="trunkToolsDumpRenderTreewinDumpRenderTreecpp"></a>
<div class="modfile"><h4>Modified: trunk/Tools/DumpRenderTree/win/DumpRenderTree.cpp (178138 => 178139)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/DumpRenderTree/win/DumpRenderTree.cpp 2015-01-08 23:28:26 UTC (rev 178138)
+++ trunk/Tools/DumpRenderTree/win/DumpRenderTree.cpp 2015-01-08 23:34:31 UTC (rev 178139)
</span><span class="lines">@@ -823,9 +823,10 @@
</span><span class="cx"> prefsPrivate->setFrameFlatteningEnabled(FALSE);
</span><span class="cx"> // Set spatial navigation enabled: NO
</span><span class="cx"> if (persistentUserStyleSheetLocation) {
</span><del>- Vector<wchar_t> urlCharacters(CFStringGetLength(persistentUserStyleSheetLocation.get()));
- CFStringGetCharacters(persistentUserStyleSheetLocation.get(), CFRangeMake(0, CFStringGetLength(persistentUserStyleSheetLocation.get())), (UniChar *)urlCharacters.data());
- _bstr_t url(urlCharacters.data());
</del><ins>+ size_t stringLength = CFStringGetLength(persistentUserStyleSheetLocation.get());
+ Vector<UniChar> urlCharacters(stringLength + 1, 0);
+ CFStringGetCharacters(persistentUserStyleSheetLocation.get(), CFRangeMake(0, stringLength), urlCharacters.data());
+ _bstr_t url(reinterpret_cast<wchar_t*>(urlCharacters.data()));
</ins><span class="cx"> preferences->setUserStyleSheetLocation(url);
</span><span class="cx"> preferences->setUserStyleSheetEnabled(TRUE);
</span><span class="cx"> } else
</span><span class="lines">@@ -926,7 +927,8 @@
</span><span class="cx">
</span><span class="cx"> static void sizeWebViewForCurrentTest()
</span><span class="cx"> {
</span><del>- bool isSVGW3CTest = (::gTestRunner->testURL().find("svg\\W3C-SVG-1.1") != string::npos);
</del><ins>+ bool isSVGW3CTest = (::gTestRunner->testURL().find("svg\\W3C-SVG-1.1") != string::npos)
+ || (::gTestRunner->testURL().find("svg/W3C-SVG-1.1") != string::npos);
</ins><span class="cx"> unsigned width = isSVGW3CTest ? TestRunner::w3cSVGViewWidth : TestRunner::viewWidth;
</span><span class="cx"> unsigned height = isSVGW3CTest ? TestRunner::w3cSVGViewHeight : TestRunner::viewHeight;
</span><span class="cx">
</span><span class="lines">@@ -999,7 +1001,7 @@
</span><span class="cx"> if (!::PathFileExistsW(fontFallback.charactersWithNullTermination().data()))
</span><span class="cx"> return;
</span><span class="cx">
</span><del>- ::setPersistentUserStyleSheetLocation(0);
</del><ins>+ ::setPersistentUserStyleSheetLocation(nullptr);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx">
</span></span></pre></div>
<a id="trunkToolsDumpRenderTreewinTestRunnerWincpp"></a>
<div class="modfile"><h4>Modified: trunk/Tools/DumpRenderTree/win/TestRunnerWin.cpp (178138 => 178139)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/DumpRenderTree/win/TestRunnerWin.cpp 2015-01-08 23:28:26 UTC (rev 178138)
+++ trunk/Tools/DumpRenderTree/win/TestRunnerWin.cpp 2015-01-08 23:34:31 UTC (rev 178139)
</span><span class="lines">@@ -860,7 +860,7 @@
</span><span class="cx">
</span><span class="cx"> void TestRunner::clearPersistentUserStyleSheet()
</span><span class="cx"> {
</span><del>- ::setPersistentUserStyleSheetLocation(0);
</del><ins>+ ::setPersistentUserStyleSheetLocation(nullptr);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void TestRunner::setWindowIsKey(bool flag)
</span></span></pre>
</div>
</div>
</body>
</html>