'[webkit-changes] [232375] trunk/Source'

[prev in list] [next in list] [prev in thread] [next in thread] 

List:       webkit-changes
Subject:    [webkit-changes] [232375] trunk/Source
From:       pvollan () apple ! com
Date:       2018-05-31 23:43:13
Message-ID: 20180531234313.CF1B110051CD () svn ! webkit ! org
[Download RAW message or body]

[Attachment #2 (text/html)]

<!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>[232375] trunk/Source</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/232375">232375</a></dd> \
<dt>Author</dt> <dd>pvollan@apple.com</dd> <dt>Date</dt> <dd>2018-05-31 16:43:13 \
-0700 (Thu, 31 May 2018)</dd> </dl>

<h3>Log Message</h3>
<pre>Add OpenGL display mask to WebPage creation parameters.
https://bugs.webkit.org/show_bug.cgi?id=186163
&lt;rdar://problem/40634504&gt;

Reviewed by Brent Fulgham.

To make sure the OpenGL display mask is always available, include it in the WebPage \
creation parameters. The OpenGL display mask is sent to the WebProcess when the \
platform display ID changes, but that is not early enough in all cases. If the OpenGL \
display mask is not set, only OpenGL software rendering is offered on some hardware \
configurations. Source/WebCore:

No new tests, since it is not trivial to test whether OpenGL rendering is hardware \
accelerated.

* platform/PlatformScreen.h:
* platform/mac/PlatformScreenMac.mm:
(WebCore::displayID):

Source/WebKit:

* Shared/WebPageCreationParameters.cpp:
(WebKit::WebPageCreationParameters::encode const):
(WebKit::WebPageCreationParameters::decode):
* Shared/WebPageCreationParameters.h:
* UIProcess/WebPageProxy.cpp:
(WebKit::WebPageProxy::creationParameters):
* WebProcess/WebPage/WebPage.cpp:
(WebKit::m_credentialsMessenger):</pre>

<h3>Modified Paths</h3>
<ul>
<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="#trunkSourceWebKitChangeLog">trunk/Source/WebKit/ChangeLog</a></li>
<li><a href="#trunkSourceWebKitSharedWebPageCreationParameterscpp">trunk/Source/WebKit/Shared/WebPageCreationParameters.cpp</a></li>
 <li><a href="#trunkSourceWebKitSharedWebPageCreationParametersh">trunk/Source/WebKit/Shared/WebPageCreationParameters.h</a></li>
 <li><a href="#trunkSourceWebKitUIProcessWebPageProxycpp">trunk/Source/WebKit/UIProcess/WebPageProxy.cpp</a></li>
 <li><a href="#trunkSourceWebKitWebProcessWebPageWebPagecpp">trunk/Source/WebKit/WebProcess/WebPage/WebPage.cpp</a></li>
 </ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (232374 => \
232375)</h4> <pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog	2018-05-31 22:02:39 UTC (rev \
                232374)
+++ trunk/Source/WebCore/ChangeLog	2018-05-31 23:43:13 UTC (rev 232375)
</span><span class="lines">@@ -1,3 +1,22 @@
</span><ins>+2018-05-31  Per Arne Vollan  &lt;pvollan@apple.com&gt;
+
+        Add OpenGL display mask to WebPage creation parameters.
+        https://bugs.webkit.org/show_bug.cgi?id=186163
+        &lt;rdar://problem/40634504&gt;
+
+        Reviewed by Brent Fulgham.
+
+        To make sure the OpenGL display mask is always available, include it in the \
WebPage creation parameters. +        The OpenGL display mask is sent to the \
WebProcess when the platform display ID changes, but that is not +        early \
enough in all cases. If the OpenGL display mask is not set, only OpenGL software \
rendering is offered +        on some hardware configurations.
+ 
+        No new tests, since it is not trivial to test whether OpenGL rendering is \
hardware accelerated. +
+        * platform/PlatformScreen.h:
+        * platform/mac/PlatformScreenMac.mm:
+        (WebCore::displayID):
+
</ins><span class="cx"> 2018-05-31  Megan Gardner  &lt;megan_gardner@apple.com&gt;
</span><span class="cx"> 
</span><span class="cx">         Add setting to allow override screen size to be \
disabled. </span></span></pre></div>
<a id="trunkSourceWebCoreplatformPlatformScreenh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/PlatformScreen.h \
(232374 => 232375)</h4> <pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/PlatformScreen.h	2018-05-31 \
                22:02:39 UTC (rev 232374)
+++ trunk/Source/WebCore/platform/PlatformScreen.h	2018-05-31 23:43:13 UTC (rev \
232375) </span><span class="lines">@@ -81,7 +81,9 @@
</span><span class="cx"> #if PLATFORM(MAC)
</span><span class="cx"> struct ScreenProperties;
</span><span class="cx"> 
</span><del>-NSScreen *screen(NSWindow *);
</del><ins>+WEBCORE_EXPORT PlatformDisplayID displayID(NSScreen *);
+
+WEBCORE_EXPORT NSScreen *screen(NSWindow *);
</ins><span class="cx"> NSScreen *screen(PlatformDisplayID);
</span><span class="cx"> 
</span><span class="cx"> FloatRect screenRectForDisplay(PlatformDisplayID);
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformmacPlatformScreenMacmm"></a>
<div class="modfile"><h4>Modified: \
trunk/Source/WebCore/platform/mac/PlatformScreenMac.mm (232374 => 232375)</h4> <pre \
class="diff"><span> <span class="info">--- \
trunk/Source/WebCore/platform/mac/PlatformScreenMac.mm	2018-05-31 22:02:39 UTC (rev \
                232374)
+++ trunk/Source/WebCore/platform/mac/PlatformScreenMac.mm	2018-05-31 23:43:13 UTC \
(rev 232375) </span><span class="lines">@@ -46,7 +46,7 @@
</span><span class="cx"> // These functions scale between screen and page coordinates \
because JavaScript/DOM operations </span><span class="cx"> // assume that the screen \
and the page share the same coordinate system. </span><span class="cx"> 
</span><del>-static PlatformDisplayID displayID(NSScreen *screen)
</del><ins>+PlatformDisplayID displayID(NSScreen *screen)
</ins><span class="cx"> {
</span><span class="cx">     \
ASSERT(hasProcessPrivilege(ProcessPrivilege::CanCommunicateWithWindowServer)); \
</span><span class="cx">     return [[[screen deviceDescription] \
objectForKey:@&quot;NSScreenNumber&quot;] intValue]; </span></span></pre></div>
<a id="trunkSourceWebKitChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/ChangeLog (232374 => \
232375)</h4> <pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/ChangeLog	2018-05-31 22:02:39 UTC (rev \
                232374)
+++ trunk/Source/WebKit/ChangeLog	2018-05-31 23:43:13 UTC (rev 232375)
</span><span class="lines">@@ -1,3 +1,25 @@
</span><ins>+2018-05-31  Per Arne Vollan  &lt;pvollan@apple.com&gt;
+
+        Add OpenGL display mask to WebPage creation parameters.
+        https://bugs.webkit.org/show_bug.cgi?id=186163
+        &lt;rdar://problem/40634504&gt;
+
+        Reviewed by Brent Fulgham.
+
+        To make sure the OpenGL display mask is always available, include it in the \
WebPage creation parameters. +        The OpenGL display mask is sent to the \
WebProcess when the platform display ID changes, but that is not +        early \
enough in all cases. If the OpenGL display mask is not set, only OpenGL software \
rendering is offered +        on some hardware configurations.
+
+        * Shared/WebPageCreationParameters.cpp:
+        (WebKit::WebPageCreationParameters::encode const):
+        (WebKit::WebPageCreationParameters::decode):
+        * Shared/WebPageCreationParameters.h:
+        * UIProcess/WebPageProxy.cpp:
+        (WebKit::WebPageProxy::creationParameters):
+        * WebProcess/WebPage/WebPage.cpp:
+        (WebKit::m_credentialsMessenger):
+
</ins><span class="cx"> 2018-05-31  Brent Fulgham  &lt;bfulgham@apple.com&gt;
</span><span class="cx"> 
</span><span class="cx">         Add a rule to allow reading files with prefix \
/private/var/db/CVMS/cvmsCodeSignObj </span></span></pre></div>
<a id="trunkSourceWebKitSharedWebPageCreationParameterscpp"></a>
<div class="modfile"><h4>Modified: \
trunk/Source/WebKit/Shared/WebPageCreationParameters.cpp (232374 => 232375)</h4> <pre \
class="diff"><span> <span class="info">--- \
trunk/Source/WebKit/Shared/WebPageCreationParameters.cpp	2018-05-31 22:02:39 UTC (rev \
                232374)
+++ trunk/Source/WebKit/Shared/WebPageCreationParameters.cpp	2018-05-31 23:43:13 UTC \
(rev 232375) </span><span class="lines">@@ -119,6 +119,9 @@
</span><span class="cx"> #if ENABLE(CONTENT_EXTENSIONS)
</span><span class="cx">     encoder &lt;&lt; contentRuleLists;
</span><span class="cx"> #endif
</span><ins>+#if PLATFORM(MAC) &amp;&amp; ENABLE(WEBPROCESS_WINDOWSERVER_BLOCKING)
+    encoder &lt;&lt; displayMask;
+#endif
</ins><span class="cx"> }
</span><span class="cx"> 
</span><span class="cx"> std::optional&lt;WebPageCreationParameters&gt; \
WebPageCreationParameters::decode(IPC::Decoder&amp; decoder) </span><span \
class="lines">@@ -343,6 +346,11 @@ </span><span class="cx">     \
parameters.contentRuleLists = WTFMove(*contentRuleLists); </span><span class="cx"> \
#endif </span><span class="cx"> 
</span><ins>+#if PLATFORM(MAC) &amp;&amp; ENABLE(WEBPROCESS_WINDOWSERVER_BLOCKING)
+    if (!decoder.decode(parameters.displayMask))
+        return std::nullopt;
+#endif
+
</ins><span class="cx">     return WTFMove(parameters);
</span><span class="cx"> }
</span><span class="cx"> 
</span></span></pre></div>
<a id="trunkSourceWebKitSharedWebPageCreationParametersh"></a>
<div class="modfile"><h4>Modified: \
trunk/Source/WebKit/Shared/WebPageCreationParameters.h (232374 => 232375)</h4> <pre \
class="diff"><span> <span class="info">--- \
trunk/Source/WebKit/Shared/WebPageCreationParameters.h	2018-05-31 22:02:39 UTC (rev \
                232374)
+++ trunk/Source/WebKit/Shared/WebPageCreationParameters.h	2018-05-31 23:43:13 UTC \
(rev 232375) </span><span class="lines">@@ -185,6 +185,10 @@
</span><span class="cx"> #if ENABLE(CONTENT_EXTENSIONS)
</span><span class="cx">     Vector&lt;std::pair&lt;String, \
WebCompiledContentRuleListData&gt;&gt; contentRuleLists; </span><span class="cx"> \
#endif </span><ins>+    
+#if PLATFORM(MAC) &amp;&amp; ENABLE(WEBPROCESS_WINDOWSERVER_BLOCKING)
+    CGOpenGLDisplayMask displayMask { 0 };
+#endif
</ins><span class="cx"> };
</span><span class="cx"> 
</span><span class="cx"> } // namespace WebKit
</span></span></pre></div>
<a id="trunkSourceWebKitUIProcessWebPageProxycpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/UIProcess/WebPageProxy.cpp \
(232374 => 232375)</h4> <pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/UIProcess/WebPageProxy.cpp	2018-05-31 \
                22:02:39 UTC (rev 232374)
+++ trunk/Source/WebKit/UIProcess/WebPageProxy.cpp	2018-05-31 23:43:13 UTC (rev \
232375) </span><span class="lines">@@ -6150,6 +6150,12 @@
</span><span class="cx">     parameters.applicationManifest = \
m_configuration-&gt;applicationManifest() ? \
std::optional&lt;WebCore::ApplicationManifest&gt;(m_configuration-&gt;applicationManifest()-&gt;applicationManifest()) \
: std::nullopt; </span><span class="cx"> #endif
</span><span class="cx"> 
</span><ins>+#if PLATFORM(MAC) &amp;&amp; ENABLE(WEBPROCESS_WINDOWSERVER_BLOCKING)
+    auto screen = WebCore::screen(m_pageClient.platformWindow());
+    auto displayID = WebCore::displayID(screen);
+    parameters.displayMask = CGDisplayIDToOpenGLDisplayMask(displayID);
+#endif
+
</ins><span class="cx">     \
m_process-&gt;addWebUserContentControllerProxy(m_userContentController, parameters); \
</span><span class="cx">  </span><span class="cx">     return parameters;
</span></span></pre></div>
<a id="trunkSourceWebKitWebProcessWebPageWebPagecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/WebProcess/WebPage/WebPage.cpp \
(232374 => 232375)</h4> <pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/WebProcess/WebPage/WebPage.cpp	2018-05-31 \
                22:02:39 UTC (rev 232374)
+++ trunk/Source/WebKit/WebProcess/WebPage/WebPage.cpp	2018-05-31 23:43:13 UTC (rev \
232375) </span><span class="lines">@@ -156,6 +156,7 @@
</span><span class="cx"> #include &lt;WebCore/FrameLoadRequest.h&gt;
</span><span class="cx"> #include &lt;WebCore/FrameLoaderTypes.h&gt;
</span><span class="cx"> #include &lt;WebCore/FrameView.h&gt;
</span><ins>+#include &lt;WebCore/GraphicsContext3D.h&gt;
</ins><span class="cx"> #include &lt;WebCore/HTMLAttachmentElement.h&gt;
</span><span class="cx"> #include &lt;WebCore/HTMLFormElement.h&gt;
</span><span class="cx"> #include &lt;WebCore/HTMLImageElement.h&gt;
</span><span class="lines">@@ -617,6 +618,10 @@
</span><span class="cx">     \
setViewportConfigurationViewLayoutSize(parameters.viewportConfigurationViewLayoutSize);
 </span><span class="cx">     \
setMaximumUnobscuredSize(parameters.maximumUnobscuredSize); </span><span class="cx"> \
#endif </span><ins>+    
+#if PLATFORM(MAC) &amp;&amp; ENABLE(WEBPROCESS_WINDOWSERVER_BLOCKING)
+    GraphicsContext3D::setOpenGLDisplayMask(parameters.displayMask);
+#endif
</ins><span class="cx"> }
</span><span class="cx"> 
</span><span class="cx"> #if ENABLE(WEB_RTC)
</span></span></pre>
</div>
</div>

</body>
</html>

_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes

[prev in list] [next in list] [prev in thread] [next in thread] 