<!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>[164141] 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/164141">164141</a></dd>
<dt>Author</dt> <dd>bfulgham@apple.com</dd>
<dt>Date</dt> <dd>2014-02-14 16:04:55 -0800 (Fri, 14 Feb 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>[Win] Make tests more consistent with Mac platform
https://bugs.webkit.org/show_bug.cgi?id=128848
Reviewed by Simon Fraser.
Source/WebKit/win:
* Interfaces/IWebPreferencesPrivate.idl: Add access to the
mock scrollbar and screen font substitution features.
* WebPreferenceKeysPrivate.h: Ditto
* WebPreferences.cpp: Ditto
(WebPreferences::mockScrollbarsEnabled):
(WebPreferences::setMockScrollbarsEnabled):
(WebPreferences::screenFontSubstitutionEnabled):
(WebPreferences::setScreenFontSubstitutionEnabled):
* WebPreferences.h: Ditto
* WebView.cpp:
(WebView::notifyPreferencesChanged): Ditto
Tools:
* DumpRenderTree/win/DumpRenderTree.cpp:
(resetDefaultsToConsistentValues): Turn CSS regions on,
turn mock scrollbars on, and allow screen font
substitution.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsplatformwinTestExpectations">trunk/LayoutTests/platform/win/TestExpectations</a></li>
<li><a href="#trunkSourceWebKitwinChangeLog">trunk/Source/WebKit/win/ChangeLog</a></li>
<li><a href="#trunkSourceWebKitwinInterfacesIWebPreferencesPrivateidl">trunk/Source/WebKit/win/Interfaces/IWebPreferencesPrivate.idl</a></li>
<li><a href="#trunkSourceWebKitwinWebPreferenceKeysPrivateh">trunk/Source/WebKit/win/WebPreferenceKeysPrivate.h</a></li>
<li><a href="#trunkSourceWebKitwinWebPreferencescpp">trunk/Source/WebKit/win/WebPreferences.cpp</a></li>
<li><a href="#trunkSourceWebKitwinWebPreferencesh">trunk/Source/WebKit/win/WebPreferences.h</a></li>
<li><a href="#trunkSourceWebKitwinWebViewcpp">trunk/Source/WebKit/win/WebView.cpp</a></li>
<li><a href="#trunkToolsChangeLog">trunk/Tools/ChangeLog</a></li>
<li><a href="#trunkToolsDumpRenderTreewinDumpRenderTreecpp">trunk/Tools/DumpRenderTree/win/DumpRenderTree.cpp</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsplatformwinTestExpectations"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/platform/win/TestExpectations (164140 => 164141)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/platform/win/TestExpectations 2014-02-15 00:01:38 UTC (rev 164140)
+++ trunk/LayoutTests/platform/win/TestExpectations 2014-02-15 00:04:55 UTC (rev 164141)
</span><span class="lines">@@ -1489,7 +1489,7 @@
</span><span class="cx"> http/tests/security/isolatedWorld/cross-origin-xhr.html
</span><span class="cx">
</span><span class="cx"> # CSS Regions support not yet enabled. http://webkit.org/b/57312
</span><del>-fast/regions
</del><ins>+#fast/regions
</ins><span class="cx">
</span><span class="cx"> # CSS Exclusions support not yet enabled. http://webkit.org/b/57311
</span><span class="cx"> fast/exclusions
</span><span class="lines">@@ -1883,11 +1883,11 @@
</span><span class="cx"> fast/dom/MutationObserver/inline-event-listener.html
</span><span class="cx"> fast/profiler/dead-time.html
</span><span class="cx"> fast/profiler/stop-profiling-after-setTimeout.html
</span><del>-fast/regions/repaint/japanese-rl-selection-repaint-in-regions.html
-fast/regions/repaint/line-flow-with-floats-in-regions.html
-fast/regions/repaint/overflow-flipped-writing-mode-block-in-regions.html
-fast/regions/repaint/region-painting-invalidation.html
-fast/regions/repaint/region-painting-via-layout.html
</del><ins>+#fast/regions/repaint/japanese-rl-selection-repaint-in-regions.html
+#fast/regions/repaint/line-flow-with-floats-in-regions.html
+#fast/regions/repaint/overflow-flipped-writing-mode-block-in-regions.html
+#fast/regions/repaint/region-painting-invalidation.html
+#fast/regions/repaint/region-painting-via-layout.html
</ins><span class="cx"> fast/repaint/canvas-putImageData.html
</span><span class="cx"> fast/repaint/fixed-in-page-scale.html
</span><span class="cx"> fast/repaint/fixed-right-bottom-in-page-scale.html
</span></span></pre></div>
<a id="trunkSourceWebKitwinChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/win/ChangeLog (164140 => 164141)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/win/ChangeLog 2014-02-15 00:01:38 UTC (rev 164140)
+++ trunk/Source/WebKit/win/ChangeLog 2014-02-15 00:04:55 UTC (rev 164141)
</span><span class="lines">@@ -1,3 +1,22 @@
</span><ins>+2014-02-14 Brent Fulgham <bfulgham@apple.com>
+
+ [Win] Make tests more consistent with Mac platform
+ https://bugs.webkit.org/show_bug.cgi?id=128848
+
+ Reviewed by Simon Fraser.
+
+ * Interfaces/IWebPreferencesPrivate.idl: Add access to the
+ mock scrollbar and screen font substitution features.
+ * WebPreferenceKeysPrivate.h: Ditto
+ * WebPreferences.cpp: Ditto
+ (WebPreferences::mockScrollbarsEnabled):
+ (WebPreferences::setMockScrollbarsEnabled):
+ (WebPreferences::screenFontSubstitutionEnabled):
+ (WebPreferences::setScreenFontSubstitutionEnabled):
+ * WebPreferences.h: Ditto
+ * WebView.cpp:
+ (WebView::notifyPreferencesChanged): Ditto
+
</ins><span class="cx"> 2014-02-11 Zalan Bujtas <zalan@apple.com>
</span><span class="cx">
</span><span class="cx"> Subpixel rendering: Make GraphicsLayerClient::paintContents's clip rect subpixel based.
</span></span></pre></div>
<a id="trunkSourceWebKitwinInterfacesIWebPreferencesPrivateidl"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/win/Interfaces/IWebPreferencesPrivate.idl (164140 => 164141)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/win/Interfaces/IWebPreferencesPrivate.idl 2014-02-15 00:01:38 UTC (rev 164140)
+++ trunk/Source/WebKit/win/Interfaces/IWebPreferencesPrivate.idl 2014-02-15 00:04:55 UTC (rev 164141)
</span><span class="lines">@@ -142,4 +142,10 @@
</span><span class="cx">
</span><span class="cx"> HRESULT setRequestAnimationFrameEnabled([in] BOOL);
</span><span class="cx"> HRESULT requestAnimationFrameEnabled([out, retval] BOOL*);
</span><ins>+
+ HRESULT mockScrollbarsEnabled([out, retval] BOOL* enabled);
+ HRESULT setMockScrollbarsEnabled([in] BOOL enabled);
+
+ HRESULT screenFontSubstitutionEnabled([out, retval] BOOL* enabled);
+ HRESULT setScreenFontSubstitutionEnabled([in] BOOL enabled);
</ins><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebKitwinWebPreferenceKeysPrivateh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/win/WebPreferenceKeysPrivate.h (164140 => 164141)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/win/WebPreferenceKeysPrivate.h 2014-02-15 00:01:38 UTC (rev 164140)
+++ trunk/Source/WebKit/win/WebPreferenceKeysPrivate.h 2014-02-15 00:04:55 UTC (rev 164141)
</span><span class="lines">@@ -163,3 +163,6 @@
</span><span class="cx">
</span><span class="cx"> #define WebKitRequestAnimationFrameEnabledPreferenceKey "WebKitRequestAnimationFrameEnabled"
</span><span class="cx">
</span><ins>+#define WebKitMockScrollbarsEnabledPreferenceKey "WebKitMockScrollbarsEnabled"
+
+#define WebKitScreenFontSubstitutionEnabledPreferenceKey "WebKitScreenFontSubstitutionEnabledPreferenceKey"
</ins></span></pre></div>
<a id="trunkSourceWebKitwinWebPreferencescpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/win/WebPreferences.cpp (164140 => 164141)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/win/WebPreferences.cpp 2014-02-15 00:01:38 UTC (rev 164140)
+++ trunk/Source/WebKit/win/WebPreferences.cpp 2014-02-15 00:04:55 UTC (rev 164141)
</span><span class="lines">@@ -1254,6 +1254,30 @@
</span><span class="cx"> return E_FAIL;
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+HRESULT WebPreferences::mockScrollbarsEnabled(BOOL* enabled)
+{
+ *enabled = boolValueForKey(WebKitMockScrollbarsEnabledPreferenceKey);
+ return S_OK;
+}
+
+HRESULT WebPreferences::setMockScrollbarsEnabled(BOOL enabled)
+{
+ setBoolValue(WebKitMockScrollbarsEnabledPreferenceKey, enabled);
+ return S_OK;
+}
+
+HRESULT WebPreferences::screenFontSubstitutionEnabled(BOOL* enabled)
+{
+ *enabled = boolValueForKey(WebKitScreenFontSubstitutionEnabledPreferenceKey);
+ return S_OK;
+}
+
+HRESULT WebPreferences::setScreenFontSubstitutionEnabled(BOOL enabled)
+{
+ setBoolValue(WebKitScreenFontSubstitutionEnabledPreferenceKey, enabled);
+ return S_OK;
+}
+
</ins><span class="cx"> HRESULT STDMETHODCALLTYPE WebPreferences::hyperlinkAuditingEnabled(
</span><span class="cx"> /* [in] */ BOOL* enabled)
</span><span class="cx"> {
</span></span></pre></div>
<a id="trunkSourceWebKitwinWebPreferencesh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/win/WebPreferences.h (164140 => 164141)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/win/WebPreferences.h 2014-02-15 00:01:38 UTC (rev 164140)
+++ trunk/Source/WebKit/win/WebPreferences.h 2014-02-15 00:04:55 UTC (rev 164141)
</span><span class="lines">@@ -477,6 +477,12 @@
</span><span class="cx"> virtual HRESULT STDMETHODCALLTYPE requestAnimationFrameEnabled(BOOL*);
</span><span class="cx"> virtual HRESULT STDMETHODCALLTYPE setRequestAnimationFrameEnabled(BOOL);
</span><span class="cx">
</span><ins>+ virtual HRESULT STDMETHODCALLTYPE mockScrollbarsEnabled(BOOL*);
+ virtual HRESULT STDMETHODCALLTYPE setMockScrollbarsEnabled(BOOL);
+
+ virtual HRESULT STDMETHODCALLTYPE screenFontSubstitutionEnabled(BOOL*);
+ virtual HRESULT STDMETHODCALLTYPE setScreenFontSubstitutionEnabled(BOOL);
+
</ins><span class="cx"> // WebPreferences
</span><span class="cx">
</span><span class="cx"> // This method accesses a different preference key than developerExtrasEnabled.
</span></span></pre></div>
<a id="trunkSourceWebKitwinWebViewcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/win/WebView.cpp (164140 => 164141)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/win/WebView.cpp 2014-02-15 00:01:38 UTC (rev 164140)
+++ trunk/Source/WebKit/win/WebView.cpp 2014-02-15 00:04:55 UTC (rev 164141)
</span><span class="lines">@@ -5047,6 +5047,16 @@
</span><span class="cx"> return hr;
</span><span class="cx"> settings.setRequestAnimationFrameEnabled(enabled);
</span><span class="cx">
</span><ins>+ hr = prefsPrivate->mockScrollbarsEnabled(&enabled);
+ if (FAILED(hr))
+ return hr;
+ settings.setMockScrollbarsEnabled(enabled);
+
+ hr = prefsPrivate->screenFontSubstitutionEnabled(&enabled);
+ if (FAILED(hr))
+ return hr;
+ settings.setScreenFontSubstitutionEnabled(enabled);
+
</ins><span class="cx"> return S_OK;
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkToolsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Tools/ChangeLog (164140 => 164141)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/ChangeLog 2014-02-15 00:01:38 UTC (rev 164140)
+++ trunk/Tools/ChangeLog 2014-02-15 00:04:55 UTC (rev 164141)
</span><span class="lines">@@ -1,3 +1,15 @@
</span><ins>+2014-02-14 Brent Fulgham <bfulgham@apple.com>
+
+ [Win] Make tests more consistent with Mac platform
+ https://bugs.webkit.org/show_bug.cgi?id=128848
+
+ Reviewed by Simon Fraser.
+
+ * DumpRenderTree/win/DumpRenderTree.cpp:
+ (resetDefaultsToConsistentValues): Turn CSS regions on,
+ turn mock scrollbars on, and allow screen font
+ substitution.
+
</ins><span class="cx"> 2014-02-14 Mark Hahnenberg <mhahnenberg@apple.com>
</span><span class="cx">
</span><span class="cx"> Save ARGV in a local to avoid repeated lookups
</span></span></pre></div>
<a id="trunkToolsDumpRenderTreewinDumpRenderTreecpp"></a>
<div class="modfile"><h4>Modified: trunk/Tools/DumpRenderTree/win/DumpRenderTree.cpp (164140 => 164141)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/DumpRenderTree/win/DumpRenderTree.cpp 2014-02-15 00:01:38 UTC (rev 164140)
+++ trunk/Tools/DumpRenderTree/win/DumpRenderTree.cpp 2014-02-15 00:04:55 UTC (rev 164141)
</span><span class="lines">@@ -873,6 +873,7 @@
</span><span class="cx"> preferences->setCacheModel(WebCacheModelDocumentBrowser);
</span><span class="cx"> preferences->setLoadsImagesAutomatically(TRUE);
</span><span class="cx"> preferences->setTextAreasAreResizable(TRUE);
</span><ins>+ preferences->setCSSRegionsEnabled(TRUE);
</ins><span class="cx">
</span><span class="cx"> if (persistentUserStyleSheetLocation) {
</span><span class="cx"> Vector<wchar_t> urlCharacters(CFStringGetLength(persistentUserStyleSheetLocation.get()));
</span><span class="lines">@@ -901,6 +902,8 @@
</span><span class="cx"> #if USE(CG)
</span><span class="cx"> prefsPrivate->setAcceleratedCompositingEnabled(TRUE);
</span><span class="cx"> #endif
</span><ins>+ prefsPrivate->setMockScrollbarsEnabled(TRUE);
+ prefsPrivate->setScreenFontSubstitutionEnabled(TRUE);
</ins><span class="cx"> }
</span><span class="cx"> setAlwaysAcceptCookies(false);
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>