<!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>[235619] 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/235619">235619</a></dd>
<dt>Author</dt> <dd>pvollan@apple.com</dd>
<dt>Date</dt> <dd>2018-09-04 11:03:10 -0700 (Tue, 04 Sep 2018)</dd>
</dl>

<h3>Log Message</h3>
<pre>Add test for fix in https://bugs.webkit.org/show_bug.cgi?id=187922
https://bugs.webkit.org/show_bug.cgi?id=187925

Reviewed by Simon Fraser.

This will test that the function primaryScreenDisplayID() returns a valid display ID.

Source/WebCore:

Test: fast/misc/valid-primary-screen-displayID.html

* platform/PlatformScreen.h:
* platform/mac/PlatformScreenMac.mm:
(WebCore::primaryScreenDisplayID):
* testing/Internals.cpp:
(WebCore::Internals::primaryScreenDisplayID):
* testing/Internals.h:
* testing/Internals.idl:

LayoutTests:

* TestExpectations:
* fast/misc/valid-primary-screen-displayID-expected.txt: Added.
* fast/misc/valid-primary-screen-displayID.html: Added.
* platform/mac-wk2/TestExpectations:</pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsChangeLog">trunk/LayoutTests/ChangeLog</a></li>
<li><a href="#trunkLayoutTestsTestExpectations">trunk/LayoutTests/TestExpectations</a></li>
<li><a href="#trunkLayoutTestsplatformmacwk2TestExpectations">trunk/LayoutTests/platform/mac-wk2/TestExpectations</a></li>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreplatformPlatformScreenh">trunk/Source/WebCore/platform/PlatformScreen.h</a></li>
<li><a href="#trunkSourceWebCoreplatformmacPlatformScreenMacmm">trunk/Source/WebCore/platform/mac/PlatformScreenMac.mm</a></li>
<li><a href="#trunkSourceWebCoretestingInternalscpp">trunk/Source/WebCore/testing/Internals.cpp</a></li>
<li><a href="#trunkSourceWebCoretestingInternalsh">trunk/Source/WebCore/testing/Internals.h</a></li>
<li><a href="#trunkSourceWebCoretestingInternalsidl">trunk/Source/WebCore/testing/Internals.idl</a></li>
</ul>

<h3>Added Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsfastmiscvalidprimaryscreendisplayIDexpectedtxt">trunk/LayoutTests/fast/misc/valid-primary-screen-displayID-expected.txt</a></li>
<li><a href="#trunkLayoutTestsfastmiscvalidprimaryscreendisplayIDhtml">trunk/LayoutTests/fast/misc/valid-primary-screen-displayID.html</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (235618 => 235619)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog      2018-09-04 17:28:28 UTC (rev 235618)
+++ trunk/LayoutTests/ChangeLog 2018-09-04 18:03:10 UTC (rev 235619)
</span><span class="lines">@@ -1,3 +1,17 @@
</span><ins>+2018-09-04  Per Arne Vollan  <pvollan@apple.com>
+
+        Add test for fix in https://bugs.webkit.org/show_bug.cgi?id=187922
+        https://bugs.webkit.org/show_bug.cgi?id=187925
+
+        Reviewed by Simon Fraser.
+
+        This will test that the function primaryScreenDisplayID() returns a valid display ID.
+
+        * TestExpectations:
+        * fast/misc/valid-primary-screen-displayID-expected.txt: Added.
+        * fast/misc/valid-primary-screen-displayID.html: Added.
+        * platform/mac-wk2/TestExpectations:
+
</ins><span class="cx"> 2018-09-04  Daniel Bates  <dabates@apple.com>
</span><span class="cx"> 
</span><span class="cx">         Remove redundant inline text boxes for empty combined text
</span></span></pre></div>
<a id="trunkLayoutTestsTestExpectations"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/TestExpectations (235618 => 235619)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/TestExpectations       2018-09-04 17:28:28 UTC (rev 235618)
+++ trunk/LayoutTests/TestExpectations  2018-09-04 18:03:10 UTC (rev 235619)
</span><span class="lines">@@ -399,6 +399,11 @@
</span><span class="cx"> # testRunner.terminateNetworkProcess() only works in WebKit2
</span><span class="cx"> fast/files/blob-network-process-crash.html [ Skip ]
</span><span class="cx"> 
</span><ins>+# This test is currently only relevant on mac-wk2
+fast/canvas/webgl/context-update-on-display-configuration.html [ Skip ]
+
+fast/misc/valid-primary-screen-displayID.html [ Skip ]
+
</ins><span class="cx"> #//////////////////////////////////////////////////////////////////////////////////////////
</span><span class="cx"> # End platform-specific tests.
</span><span class="cx"> #//////////////////////////////////////////////////////////////////////////////////////////
</span><span class="lines">@@ -2235,6 +2240,3 @@
</span><span class="cx"> webkit.org/b/187269 [ Debug ] imported/w3c/web-platform-tests/FileAPI/reading-data-section/filereader_abort.html [ Skip ]
</span><span class="cx"> 
</span><span class="cx"> webkit.org/b/185308 legacy-animation-engine/animations/combo-transform-translate+scale.html [ Pass Failure ]
</span><del>-
-# This test is currently only relevant on mac-wk2
-fast/canvas/webgl/context-update-on-display-configuration.html [ Skip ]
</del></span></pre></div>
<a id="trunkLayoutTestsfastmiscvalidprimaryscreendisplayIDexpectedtxt"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/fast/misc/valid-primary-screen-displayID-expected.txt (0 => 235619)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/misc/valid-primary-screen-displayID-expected.txt                          (rev 0)
+++ trunk/LayoutTests/fast/misc/valid-primary-screen-displayID-expected.txt     2018-09-04 18:03:10 UTC (rev 235619)
</span><span class="lines">@@ -0,0 +1,2 @@
</span><ins>+PASS: Valid primary screen display ID.
+
</ins></span></pre></div>
<a id="trunkLayoutTestsfastmiscvalidprimaryscreendisplayIDhtml"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/fast/misc/valid-primary-screen-displayID.html (0 => 235619)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/misc/valid-primary-screen-displayID.html                          (rev 0)
+++ trunk/LayoutTests/fast/misc/valid-primary-screen-displayID.html     2018-09-04 18:03:10 UTC (rev 235619)
</span><span class="lines">@@ -0,0 +1,25 @@
</span><ins>+<!DOCTYPE html>
+<html>
+<head>
+<title>This tests that the display ID of the primary screen is valid.</title>
+<script>
+function log(msg)
+{
+    document.getElementById('console').appendChild(document.createTextNode(msg + "\n"));
+}
+
+function onload()
+{
+    if (window.testRunner)
+        testRunner.dumpAsText();
+    if (window.internals.primaryScreenDisplayID())
+        log("PASS: Valid primary screen display ID.");
+    else
+        log("FAIL: Invalid primary screen display ID.");
+}
+</script>
+</head>
+<body onLoad="onload()">
+<pre id="console"></pre>
+</body>
+</html>
</ins></span></pre></div>
<a id="trunkLayoutTestsplatformmacwk2TestExpectations"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/platform/mac-wk2/TestExpectations (235618 => 235619)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/platform/mac-wk2/TestExpectations      2018-09-04 17:28:28 UTC (rev 235618)
+++ trunk/LayoutTests/platform/mac-wk2/TestExpectations 2018-09-04 18:03:10 UTC (rev 235619)
</span><span class="lines">@@ -53,6 +53,10 @@
</span><span class="cx"> 
</span><span class="cx"> webkit.org/b/187183 http/tests/security/pasteboard-file-url.html [ Pass ]
</span><span class="cx"> 
</span><ins>+[ Mojave+ ] fast/canvas/webgl/context-update-on-display-configuration.html [ Pass ]
+
+fast/misc/valid-primary-screen-displayID.html [ Pass ]
+
</ins><span class="cx"> #//////////////////////////////////////////////////////////////////////////////////////////
</span><span class="cx"> # End platform-specific directories.
</span><span class="cx"> #//////////////////////////////////////////////////////////////////////////////////////////
</span><span class="lines">@@ -833,8 +837,6 @@
</span><span class="cx"> 
</span><span class="cx"> webkit.org/b/186425 [ Debug ] inspector/console/webcore-logging.html [ Pass Failure ]
</span><span class="cx"> 
</span><del>-[ Mojave+ ] fast/canvas/webgl/context-update-on-display-configuration.html [ Pass ]
-
</del><span class="cx"> # skip manual payment-request tests
</span><span class="cx"> imported/w3c/web-platform-tests/payment-request/MerchantValidationEvent/complete-method-manual.https.html [ Skip ]
</span><span class="cx"> imported/w3c/web-platform-tests/payment-request/PaymentRequestUpdateEvent/updateWith-call-immediate-manual.https.html [ Skip ]
</span></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (235618 => 235619)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog   2018-09-04 17:28:28 UTC (rev 235618)
+++ trunk/Source/WebCore/ChangeLog      2018-09-04 18:03:10 UTC (rev 235619)
</span><span class="lines">@@ -1,3 +1,22 @@
</span><ins>+2018-09-04  Per Arne Vollan  <pvollan@apple.com>
+
+        Add test for fix in https://bugs.webkit.org/show_bug.cgi?id=187922
+        https://bugs.webkit.org/show_bug.cgi?id=187925
+
+        Reviewed by Simon Fraser.
+
+        This will test that the function primaryScreenDisplayID() returns a valid display ID.
+
+        Test: fast/misc/valid-primary-screen-displayID.html
+
+        * platform/PlatformScreen.h:
+        * platform/mac/PlatformScreenMac.mm:
+        (WebCore::primaryScreenDisplayID):
+        * testing/Internals.cpp:
+        (WebCore::Internals::primaryScreenDisplayID):
+        * testing/Internals.h:
+        * testing/Internals.idl:
+
</ins><span class="cx"> 2018-09-04  Daniel Bates  <dabates@apple.com>
</span><span class="cx"> 
</span><span class="cx">         Add helper function to create a potential CORS request
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformPlatformScreenh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/PlatformScreen.h (235618 => 235619)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/PlatformScreen.h   2018-09-04 17:28:28 UTC (rev 235618)
+++ trunk/Source/WebCore/platform/PlatformScreen.h      2018-09-04 18:03:10 UTC (rev 235619)
</span><span class="lines">@@ -99,6 +99,8 @@
</span><span class="cx"> WEBCORE_EXPORT ScreenProperties collectScreenProperties();
</span><span class="cx"> WEBCORE_EXPORT void setScreenProperties(const ScreenProperties&);
</span><span class="cx"> 
</span><ins>+WEBCORE_EXPORT PlatformDisplayID primaryScreenDisplayID();
+
</ins><span class="cx"> uint32_t primaryOpenGLDisplayMask();
</span><span class="cx"> uint32_t displayMaskForDisplay(PlatformDisplayID);
</span><span class="cx"> 
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformmacPlatformScreenMacmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/mac/PlatformScreenMac.mm (235618 => 235619)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/mac/PlatformScreenMac.mm   2018-09-04 17:28:28 UTC (rev 235618)
+++ trunk/Source/WebCore/platform/mac/PlatformScreenMac.mm      2018-09-04 18:03:10 UTC (rev 235619)
</span><span class="lines">@@ -102,7 +102,7 @@
</span><span class="cx">     return screenProperties;
</span><span class="cx"> }
</span><span class="cx"> 
</span><del>-static PlatformDisplayID& primaryScreenDisplayID()
</del><ins>+PlatformDisplayID primaryScreenDisplayID()
</ins><span class="cx"> {
</span><span class="cx">     return screenProperties().primaryDisplayID;
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebCoretestingInternalscpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/testing/Internals.cpp (235618 => 235619)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/testing/Internals.cpp       2018-09-04 17:28:28 UTC (rev 235618)
+++ trunk/Source/WebCore/testing/Internals.cpp  2018-09-04 18:03:10 UTC (rev 235619)
</span><span class="lines">@@ -120,6 +120,7 @@
</span><span class="cx"> #include "PageOverlay.h"
</span><span class="cx"> #include "PathUtilities.h"
</span><span class="cx"> #include "PlatformMediaSessionManager.h"
</span><ins>+#include "PlatformScreen.h"
</ins><span class="cx"> #include "PlatformStrategies.h"
</span><span class="cx"> #include "PluginData.h"
</span><span class="cx"> #include "PrintContext.h"
</span><span class="lines">@@ -4720,4 +4721,13 @@
</span><span class="cx">     ResourceLoadObserver::shared().notifyObserver();
</span><span class="cx"> }
</span><span class="cx"> 
</span><ins>+unsigned long Internals::primaryScreenDisplayID()
+{
+#if PLATFORM(MAC)
+    return WebCore::primaryScreenDisplayID();
+#else
+    return 0;
+#endif
+}
+
</ins><span class="cx"> } // namespace WebCore
</span></span></pre></div>
<a id="trunkSourceWebCoretestingInternalsh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/testing/Internals.h (235618 => 235619)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/testing/Internals.h 2018-09-04 17:28:28 UTC (rev 235618)
+++ trunk/Source/WebCore/testing/Internals.h    2018-09-04 18:03:10 UTC (rev 235619)
</span><span class="lines">@@ -735,6 +735,8 @@
</span><span class="cx"> 
</span><span class="cx">     void notifyResourceLoadObserver();
</span><span class="cx"> 
</span><ins>+    unsigned long primaryScreenDisplayID();
+        
</ins><span class="cx"> private:
</span><span class="cx">     explicit Internals(Document&);
</span><span class="cx">     Document* contextDocument() const;
</span></span></pre></div>
<a id="trunkSourceWebCoretestingInternalsidl"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/testing/Internals.idl (235618 => 235619)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/testing/Internals.idl       2018-09-04 17:28:28 UTC (rev 235618)
+++ trunk/Source/WebCore/testing/Internals.idl  2018-09-04 18:03:10 UTC (rev 235619)
</span><span class="lines">@@ -669,4 +669,6 @@
</span><span class="cx">     unsigned long pluginCount();
</span><span class="cx"> 
</span><span class="cx">     void notifyResourceLoadObserver();
</span><ins>+
+    unsigned long primaryScreenDisplayID();
</ins><span class="cx"> };
</span></span></pre>
</div>
</div>

</body>
</html>