<!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>[210356] branches/safari-603-branch</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/210356">210356</a></dd>
<dt>Author</dt> <dd>matthew_hanson@apple.com</dd>
<dt>Date</dt> <dd>2017-01-05 09:09:54 -0800 (Thu, 05 Jan 2017)</dd>
</dl>
<h3>Log Message</h3>
<pre>Merge <a href="http://trac.webkit.org/projects/webkit/changeset/210273">r210273</a>. rdar://problem/29834093</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#branchessafari603branchSourceWebCoreChangeLog">branches/safari-603-branch/Source/WebCore/ChangeLog</a></li>
<li><a href="#branchessafari603branchSourceWebCorehtmlcanvasWebGLRenderingContextBasecpp">branches/safari-603-branch/Source/WebCore/html/canvas/WebGLRenderingContextBase.cpp</a></li>
<li><a href="#branchessafari603branchSourceWebCorepageSettingsin">branches/safari-603-branch/Source/WebCore/page/Settings.in</a></li>
<li><a href="#branchessafari603branchSourceWebKitmacChangeLog">branches/safari-603-branch/Source/WebKit/mac/ChangeLog</a></li>
<li><a href="#branchessafari603branchSourceWebKitmacWebViewWebPreferenceKeysPrivateh">branches/safari-603-branch/Source/WebKit/mac/WebView/WebPreferenceKeysPrivate.h</a></li>
<li><a href="#branchessafari603branchSourceWebKitmacWebViewWebPreferencesmm">branches/safari-603-branch/Source/WebKit/mac/WebView/WebPreferences.mm</a></li>
<li><a href="#branchessafari603branchSourceWebKitmacWebViewWebPreferencesPrivateh">branches/safari-603-branch/Source/WebKit/mac/WebView/WebPreferencesPrivate.h</a></li>
<li><a href="#branchessafari603branchSourceWebKitmacWebViewWebViewmm">branches/safari-603-branch/Source/WebKit/mac/WebView/WebView.mm</a></li>
<li><a href="#branchessafari603branchToolsChangeLog">branches/safari-603-branch/Tools/ChangeLog</a></li>
<li><a href="#branchessafari603branchToolsMiniBrowsermacInfoplist">branches/safari-603-branch/Tools/MiniBrowser/mac/Info.plist</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="branchessafari603branchSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: branches/safari-603-branch/Source/WebCore/ChangeLog (210355 => 210356)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-603-branch/Source/WebCore/ChangeLog 2017-01-05 17:09:49 UTC (rev 210355)
+++ branches/safari-603-branch/Source/WebCore/ChangeLog 2017-01-05 17:09:54 UTC (rev 210356)
</span><span class="lines">@@ -1,5 +1,30 @@
</span><span class="cx"> 2017-01-05 Matthew Hanson <matthew_hanson@apple.com>
</span><span class="cx">
</span><ins>+ Merge r210273. rdar://problem/29834093
+
+ 2017-01-04 Tim Horton <timothy_horton@apple.com>
+
+ Provide a setting for clients to always prefer low-power WebGL
+ https://bugs.webkit.org/show_bug.cgi?id=166675
+ <rdar://problem/29834093>
+
+ Reviewed by Dan Bernstein.
+
+ No new tests; as noted in r204664, we don't know how to reliably test
+ automatic graphics switching. One could use the manual test introduced
+ in that commit; after this commit, with the setting switched on, on a
+ dual-GPU machine that is actively using integrated graphics, that test
+ should return the same result for both contexts.
+
+ * page/Settings.in:
+ Add a setting to prefer low-power WebGL.
+
+ * html/canvas/WebGLRenderingContextBase.cpp:
+ (WebCore::WebGLRenderingContextBase::create):
+ If said setting is enabled, set preferLowPowerToHighPerformance.
+
+2017-01-05 Matthew Hanson <matthew_hanson@apple.com>
+
</ins><span class="cx"> Merge r210266. rdar://problem/29447824
</span><span class="cx">
</span><span class="cx"> 2017-01-03 Tim Horton <timothy_horton@apple.com>
</span></span></pre></div>
<a id="branchessafari603branchSourceWebCorehtmlcanvasWebGLRenderingContextBasecpp"></a>
<div class="modfile"><h4>Modified: branches/safari-603-branch/Source/WebCore/html/canvas/WebGLRenderingContextBase.cpp (210355 => 210356)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-603-branch/Source/WebCore/html/canvas/WebGLRenderingContextBase.cpp 2017-01-05 17:09:49 UTC (rev 210355)
+++ branches/safari-603-branch/Source/WebCore/html/canvas/WebGLRenderingContextBase.cpp 2017-01-05 17:09:54 UTC (rev 210356)
</span><span class="lines">@@ -399,6 +399,9 @@
</span><span class="cx"> if (frame->settings().forceSoftwareWebGLRendering())
</span><span class="cx"> attributes.forceSoftwareRenderer = true;
</span><span class="cx">
</span><ins>+ if (!attributes.preferLowPowerToHighPerformance && frame->settings().preferLowPowerWebGLRendering())
+ attributes.preferLowPowerToHighPerformance = true;
+
</ins><span class="cx"> if (page)
</span><span class="cx"> attributes.devicePixelRatio = page->deviceScaleFactor();
</span><span class="cx">
</span></span></pre></div>
<a id="branchessafari603branchSourceWebCorepageSettingsin"></a>
<div class="modfile"><h4>Modified: branches/safari-603-branch/Source/WebCore/page/Settings.in (210355 => 210356)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-603-branch/Source/WebCore/page/Settings.in 2017-01-05 17:09:49 UTC (rev 210355)
+++ branches/safari-603-branch/Source/WebCore/page/Settings.in 2017-01-05 17:09:54 UTC (rev 210356)
</span><span class="lines">@@ -108,6 +108,7 @@
</span><span class="cx"> webGLErrorsToConsoleEnabled initial=true
</span><span class="cx"> openGLMultisamplingEnabled initial=true
</span><span class="cx"> forceSoftwareWebGLRendering initial=false
</span><ins>+preferLowPowerWebGLRendering initial=false
</ins><span class="cx"> accelerated2dCanvasEnabled initial=false
</span><span class="cx"> antialiased2dCanvasEnabled initial=true
</span><span class="cx"> loadDeferringEnabled initial=true
</span></span></pre></div>
<a id="branchessafari603branchSourceWebKitmacChangeLog"></a>
<div class="modfile"><h4>Modified: branches/safari-603-branch/Source/WebKit/mac/ChangeLog (210355 => 210356)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-603-branch/Source/WebKit/mac/ChangeLog 2017-01-05 17:09:49 UTC (rev 210355)
+++ branches/safari-603-branch/Source/WebKit/mac/ChangeLog 2017-01-05 17:09:54 UTC (rev 210356)
</span><span class="lines">@@ -1,5 +1,27 @@
</span><span class="cx"> 2017-01-05 Matthew Hanson <matthew_hanson@apple.com>
</span><span class="cx">
</span><ins>+ Merge r210273. rdar://problem/29834093
+
+ 2017-01-04 Tim Horton <timothy_horton@apple.com>
+
+ Provide a setting for clients to always prefer low-power WebGL
+ https://bugs.webkit.org/show_bug.cgi?id=166675
+ <rdar://problem/29834093>
+
+ Reviewed by Dan Bernstein.
+
+ * WebView/WebPreferenceKeysPrivate.h:
+ * WebView/WebPreferences.mm:
+ (+[WebPreferences initialize]):
+ (-[WebPreferences preferLowPowerWebGLRendering]):
+ (-[WebPreferences setPreferLowPowerWebGLRendering:]):
+ * WebView/WebPreferencesPrivate.h:
+ * WebView/WebView.mm:
+ (-[WebView _preferencesChanged:]):
+ Expose a new private preferLowPowerWebGLRendering WebKit1 preference.
+
+2017-01-05 Matthew Hanson <matthew_hanson@apple.com>
+
</ins><span class="cx"> Merge r210266. rdar://problem/29447824
</span><span class="cx">
</span><span class="cx"> 2017-01-03 Tim Horton <timothy_horton@apple.com>
</span></span></pre></div>
<a id="branchessafari603branchSourceWebKitmacWebViewWebPreferenceKeysPrivateh"></a>
<div class="modfile"><h4>Modified: branches/safari-603-branch/Source/WebKit/mac/WebView/WebPreferenceKeysPrivate.h (210355 => 210356)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-603-branch/Source/WebKit/mac/WebView/WebPreferenceKeysPrivate.h 2017-01-05 17:09:49 UTC (rev 210355)
+++ branches/safari-603-branch/Source/WebKit/mac/WebView/WebPreferenceKeysPrivate.h 2017-01-05 17:09:54 UTC (rev 210356)
</span><span class="lines">@@ -111,6 +111,7 @@
</span><span class="cx"> #define WebKitWebGLEnabledPreferenceKey @"WebKitWebGLEnabled"
</span><span class="cx"> #define WebKitWebGL2EnabledPreferenceKey @"WebKitWebGL2Enabled"
</span><span class="cx"> #define WebKitForceSoftwareWebGLRenderingPreferenceKey @"WebKitForceSoftwareWebGLRendering"
</span><ins>+#define WebKitPreferLowPowerWebGLRenderingPreferenceKey @"WebKitPreferLowPowerWebGLRendering"
</ins><span class="cx"> #define WebKitAccelerated2dCanvasEnabledPreferenceKey @"WebKitAccelerated2dCanvasEnabled"
</span><span class="cx"> #define WebKitFrameFlatteningEnabledPreferenceKey @"WebKitFrameFlatteningEnabled"
</span><span class="cx"> #define WebKitSpatialNavigationEnabledPreferenceKey @"WebKitSpatialNavigationEnabled"
</span></span></pre></div>
<a id="branchessafari603branchSourceWebKitmacWebViewWebPreferencesmm"></a>
<div class="modfile"><h4>Modified: branches/safari-603-branch/Source/WebKit/mac/WebView/WebPreferences.mm (210355 => 210356)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-603-branch/Source/WebKit/mac/WebView/WebPreferences.mm 2017-01-05 17:09:49 UTC (rev 210355)
+++ branches/safari-603-branch/Source/WebKit/mac/WebView/WebPreferences.mm 2017-01-05 17:09:54 UTC (rev 210356)
</span><span class="lines">@@ -504,6 +504,7 @@
</span><span class="cx"> [NSNumber numberWithBool:NO], WebKitShowRepaintCounterPreferenceKey,
</span><span class="cx"> [NSNumber numberWithBool:YES], WebKitWebGLEnabledPreferenceKey,
</span><span class="cx"> [NSNumber numberWithBool:NO], WebKitForceSoftwareWebGLRenderingPreferenceKey,
</span><ins>+ [NSNumber numberWithBool:NO], WebKitPreferLowPowerWebGLRenderingPreferenceKey,
</ins><span class="cx"> [NSNumber numberWithBool:NO], WebKitAccelerated2dCanvasEnabledPreferenceKey,
</span><span class="cx"> [NSNumber numberWithBool:NO], WebKitSubpixelCSSOMElementMetricsEnabledPreferenceKey,
</span><span class="cx"> [NSNumber numberWithBool:NO], WebKitResourceLoadStatisticsEnabledPreferenceKey,
</span><span class="lines">@@ -2026,6 +2027,16 @@
</span><span class="cx"> [self _setBoolValue:forced forKey:WebKitForceSoftwareWebGLRenderingPreferenceKey];
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+- (BOOL)preferLowPowerWebGLRendering
+{
+ return [self _boolValueForKey:WebKitPreferLowPowerWebGLRenderingPreferenceKey];
+}
+
+- (void)setPreferLowPowerWebGLRendering:(BOOL)preferLowPower
+{
+ [self _setBoolValue:preferLowPower forKey:WebKitPreferLowPowerWebGLRenderingPreferenceKey];
+}
+
</ins><span class="cx"> - (BOOL)accelerated2dCanvasEnabled
</span><span class="cx"> {
</span><span class="cx"> return [self _boolValueForKey:WebKitAccelerated2dCanvasEnabledPreferenceKey];
</span></span></pre></div>
<a id="branchessafari603branchSourceWebKitmacWebViewWebPreferencesPrivateh"></a>
<div class="modfile"><h4>Modified: branches/safari-603-branch/Source/WebKit/mac/WebView/WebPreferencesPrivate.h (210355 => 210356)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-603-branch/Source/WebKit/mac/WebView/WebPreferencesPrivate.h 2017-01-05 17:09:49 UTC (rev 210355)
+++ branches/safari-603-branch/Source/WebKit/mac/WebView/WebPreferencesPrivate.h 2017-01-05 17:09:54 UTC (rev 210356)
</span><span class="lines">@@ -248,6 +248,9 @@
</span><span class="cx"> - (BOOL)forceSoftwareWebGLRendering;
</span><span class="cx"> - (void)setForceSoftwareWebGLRendering:(BOOL)forced;
</span><span class="cx">
</span><ins>+- (BOOL)preferLowPowerWebGLRendering;
+- (void)setPreferLowPowerWebGLRendering:(BOOL)preferLowPower;
+
</ins><span class="cx"> - (BOOL)accelerated2dCanvasEnabled;
</span><span class="cx"> - (void)setAccelerated2dCanvasEnabled:(BOOL)enabled;
</span><span class="cx">
</span></span></pre></div>
<a id="branchessafari603branchSourceWebKitmacWebViewWebViewmm"></a>
<div class="modfile"><h4>Modified: branches/safari-603-branch/Source/WebKit/mac/WebView/WebView.mm (210355 => 210356)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-603-branch/Source/WebKit/mac/WebView/WebView.mm 2017-01-05 17:09:49 UTC (rev 210355)
+++ branches/safari-603-branch/Source/WebKit/mac/WebView/WebView.mm 2017-01-05 17:09:54 UTC (rev 210356)
</span><span class="lines">@@ -2661,6 +2661,7 @@
</span><span class="cx"> settings.setSubpixelCSSOMElementMetricsEnabled([preferences subpixelCSSOMElementMetricsEnabled]);
</span><span class="cx">
</span><span class="cx"> settings.setForceSoftwareWebGLRendering([preferences forceSoftwareWebGLRendering]);
</span><ins>+ settings.setPreferLowPowerWebGLRendering([preferences preferLowPowerWebGLRendering]);
</ins><span class="cx"> settings.setAccelerated2dCanvasEnabled([preferences accelerated2dCanvasEnabled]);
</span><span class="cx"> settings.setLoadDeferringEnabled(shouldEnableLoadDeferring());
</span><span class="cx"> settings.setWindowFocusRestricted(shouldRestrictWindowFocus());
</span></span></pre></div>
<a id="branchessafari603branchToolsChangeLog"></a>
<div class="modfile"><h4>Modified: branches/safari-603-branch/Tools/ChangeLog (210355 => 210356)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-603-branch/Tools/ChangeLog 2017-01-05 17:09:49 UTC (rev 210355)
+++ branches/safari-603-branch/Tools/ChangeLog 2017-01-05 17:09:54 UTC (rev 210356)
</span><span class="lines">@@ -1,5 +1,25 @@
</span><span class="cx"> 2017-01-05 Matthew Hanson <matthew_hanson@apple.com>
</span><span class="cx">
</span><ins>+ Merge r210273. rdar://problem/29834093
+
+ 2017-01-04 Tim Horton <timothy_horton@apple.com>
+
+ Provide a setting for clients to always prefer low-power WebGL
+ https://bugs.webkit.org/show_bug.cgi?id=166675
+ <rdar://problem/29834093>
+
+ Reviewed by Dan Bernstein.
+
+ * MiniBrowser/mac/Info.plist:
+ Have MiniBrowser claim to be a modern app that supports
+ automatic graphics switching. WebKit needs to support automatic
+ graphics switching, so our test app might as well. Without this
+ Info.plist parameter, this change has no effect, and bringing up
+ a WebGL context still brings up the discrete GPU (also true of the
+ existing web-exposed preferLowPowerToHighPerformance API).
+
+2017-01-05 Matthew Hanson <matthew_hanson@apple.com>
+
</ins><span class="cx"> Merge r210266. rdar://problem/29447824
</span><span class="cx">
</span><span class="cx"> 2017-01-03 Tim Horton <timothy_horton@apple.com>
</span></span></pre></div>
<a id="branchessafari603branchToolsMiniBrowsermacInfoplist"></a>
<div class="modfile"><h4>Modified: branches/safari-603-branch/Tools/MiniBrowser/mac/Info.plist (210355 => 210356)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-603-branch/Tools/MiniBrowser/mac/Info.plist 2017-01-05 17:09:49 UTC (rev 210355)
+++ branches/safari-603-branch/Tools/MiniBrowser/mac/Info.plist 2017-01-05 17:09:54 UTC (rev 210356)
</span><span class="lines">@@ -33,5 +33,7 @@
</span><span class="cx"> <key>NSAllowsArbitraryLoads</key>
</span><span class="cx"> <true/>
</span><span class="cx"> </dict>
</span><ins>+ <key>NSSupportsAutomaticGraphicsSwitching</key>
+ <true/>
</ins><span class="cx"> </dict>
</span><span class="cx"> </plist>
</span></span></pre>
</div>
</div>
</body>
</html>