<!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>[189513] 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/189513">189513</a></dd>
<dt>Author</dt> <dd>dbates@webkit.org</dd>
<dt>Date</dt> <dd>2015-09-08 16:04:34 -0700 (Tue, 08 Sep 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>[Mac] Expose Enable/Disable Accelerated Drawing in MiniBrowser
https://bugs.webkit.org/show_bug.cgi?id=148980
Reviewed by Alexey Proskuryakov.
Source/WebKit2:
Expose SPI web preference to enable/disable- and query the state of- accelerated drawing
so that we can toggle this setting in MiniBrowser on Mac.
* UIProcess/API/Cocoa/WKPreferences.mm:
(-[WKPreferences _acceleratedDrawingEnabled]): Added.
(-[WKPreferences _setAcceleratedDrawingEnabled:]): Added.
* UIProcess/API/Cocoa/WKPreferencesPrivate.h:
Tools:
Add setting to enable/disable accelerated drawing so as to support testing
this feature in MiniBrowser on Mac.
* MiniBrowser/mac/SettingsController.h:
* MiniBrowser/mac/SettingsController.m:
(-[SettingsController _populateMenu]): Add menu item.
(-[SettingsController validateMenuItem:]): Update setting when menu item is toggled.
(-[SettingsController toggleAcceleratedDrawingEnabled:]): Added.
(-[SettingsController acceleratedDrawingEnabled]): Added.
* MiniBrowser/mac/WK1BrowserWindowController.m:
(-[WK1BrowserWindowController didChangeSettings]): Apply setting in WebKit1.
* MiniBrowser/mac/WK2BrowserWindowController.m:
(-[WK2BrowserWindowController didChangeSettings]): Apply setting in WebKit2.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebKit2ChangeLog">trunk/Source/WebKit2/ChangeLog</a></li>
<li><a href="#trunkSourceWebKit2UIProcessAPICocoaWKPreferencesmm">trunk/Source/WebKit2/UIProcess/API/Cocoa/WKPreferences.mm</a></li>
<li><a href="#trunkSourceWebKit2UIProcessAPICocoaWKPreferencesPrivateh">trunk/Source/WebKit2/UIProcess/API/Cocoa/WKPreferencesPrivate.h</a></li>
<li><a href="#trunkToolsChangeLog">trunk/Tools/ChangeLog</a></li>
<li><a href="#trunkToolsMiniBrowsermacSettingsControllerh">trunk/Tools/MiniBrowser/mac/SettingsController.h</a></li>
<li><a href="#trunkToolsMiniBrowsermacSettingsControllerm">trunk/Tools/MiniBrowser/mac/SettingsController.m</a></li>
<li><a href="#trunkToolsMiniBrowsermacWK1BrowserWindowControllerm">trunk/Tools/MiniBrowser/mac/WK1BrowserWindowController.m</a></li>
<li><a href="#trunkToolsMiniBrowsermacWK2BrowserWindowControllerm">trunk/Tools/MiniBrowser/mac/WK2BrowserWindowController.m</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/ChangeLog (189512 => 189513)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/ChangeLog 2015-09-08 22:38:44 UTC (rev 189512)
+++ trunk/Source/WebKit2/ChangeLog 2015-09-08 23:04:34 UTC (rev 189513)
</span><span class="lines">@@ -1,3 +1,18 @@
</span><ins>+2015-09-08 Daniel Bates <dabates@apple.com>
+
+ [Mac] Expose Enable/Disable Accelerated Drawing in MiniBrowser
+ https://bugs.webkit.org/show_bug.cgi?id=148980
+
+ Reviewed by Alexey Proskuryakov.
+
+ Expose SPI web preference to enable/disable- and query the state of- accelerated drawing
+ so that we can toggle this setting in MiniBrowser on Mac.
+
+ * UIProcess/API/Cocoa/WKPreferences.mm:
+ (-[WKPreferences _acceleratedDrawingEnabled]): Added.
+ (-[WKPreferences _setAcceleratedDrawingEnabled:]): Added.
+ * UIProcess/API/Cocoa/WKPreferencesPrivate.h:
+
</ins><span class="cx"> 2015-09-08 Joseph Pecoraro <pecoraro@apple.com>
</span><span class="cx">
</span><span class="cx"> Web Inspector: Remove unused file: WebInspectorFrontendClient.h
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessAPICocoaWKPreferencesmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/API/Cocoa/WKPreferences.mm (189512 => 189513)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/API/Cocoa/WKPreferences.mm 2015-09-08 22:38:44 UTC (rev 189512)
+++ trunk/Source/WebKit2/UIProcess/API/Cocoa/WKPreferences.mm 2015-09-08 23:04:34 UTC (rev 189513)
</span><span class="lines">@@ -237,6 +237,16 @@
</span><span class="cx"> _preferences->setSimpleLineLayoutDebugBordersEnabled(simpleLineLayoutDebugBordersEnabled);
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+- (BOOL)_acceleratedDrawingEnabled
+{
+ return _preferences->acceleratedDrawingEnabled();
+}
+
+- (void)_setAcceleratedDrawingEnabled:(BOOL)acceleratedDrawingEnabled
+{
+ _preferences->setAcceleratedDrawingEnabled(acceleratedDrawingEnabled);
+}
+
</ins><span class="cx"> - (BOOL)_developerExtrasEnabled
</span><span class="cx"> {
</span><span class="cx"> return _preferences->developerExtrasEnabled();
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessAPICocoaWKPreferencesPrivateh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/API/Cocoa/WKPreferencesPrivate.h (189512 => 189513)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/API/Cocoa/WKPreferencesPrivate.h 2015-09-08 22:38:44 UTC (rev 189512)
+++ trunk/Source/WebKit2/UIProcess/API/Cocoa/WKPreferencesPrivate.h 2015-09-08 23:04:34 UTC (rev 189513)
</span><span class="lines">@@ -57,6 +57,7 @@
</span><span class="cx"> @property (nonatomic, setter=_setTiledScrollingIndicatorVisible:) BOOL _tiledScrollingIndicatorVisible;
</span><span class="cx"> @property (nonatomic, setter=_setVisibleDebugOverlayRegions:) _WKDebugOverlayRegions _visibleDebugOverlayRegions WK_AVAILABLE(WK_MAC_TBA, WK_IOS_TBA);
</span><span class="cx"> @property (nonatomic, setter=_setSimpleLineLayoutDebugBordersEnabled:) BOOL _simpleLineLayoutDebugBordersEnabled WK_AVAILABLE(WK_MAC_TBA, WK_IOS_TBA);
</span><ins>+@property (nonatomic, setter=_setAcceleratedDrawingEnabled:) BOOL _acceleratedDrawingEnabled WK_AVAILABLE(WK_MAC_TBA, WK_IOS_TBA);
</ins><span class="cx">
</span><span class="cx"> @property (nonatomic, setter=_setDeveloperExtrasEnabled:) BOOL _developerExtrasEnabled WK_AVAILABLE(WK_MAC_TBA, WK_IOS_TBA);
</span><span class="cx">
</span></span></pre></div>
<a id="trunkToolsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Tools/ChangeLog (189512 => 189513)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/ChangeLog 2015-09-08 22:38:44 UTC (rev 189512)
+++ trunk/Tools/ChangeLog 2015-09-08 23:04:34 UTC (rev 189513)
</span><span class="lines">@@ -1,3 +1,24 @@
</span><ins>+2015-09-08 Daniel Bates <dabates@apple.com>
+
+ [Mac] Expose Enable/Disable Accelerated Drawing in MiniBrowser
+ https://bugs.webkit.org/show_bug.cgi?id=148980
+
+ Reviewed by Alexey Proskuryakov.
+
+ Add setting to enable/disable accelerated drawing so as to support testing
+ this feature in MiniBrowser on Mac.
+
+ * MiniBrowser/mac/SettingsController.h:
+ * MiniBrowser/mac/SettingsController.m:
+ (-[SettingsController _populateMenu]): Add menu item.
+ (-[SettingsController validateMenuItem:]): Update setting when menu item is toggled.
+ (-[SettingsController toggleAcceleratedDrawingEnabled:]): Added.
+ (-[SettingsController acceleratedDrawingEnabled]): Added.
+ * MiniBrowser/mac/WK1BrowserWindowController.m:
+ (-[WK1BrowserWindowController didChangeSettings]): Apply setting in WebKit1.
+ * MiniBrowser/mac/WK2BrowserWindowController.m:
+ (-[WK2BrowserWindowController didChangeSettings]): Apply setting in WebKit2.
+
</ins><span class="cx"> 2015-09-08 Jason Marcell <jmarcell@apple.com>
</span><span class="cx">
</span><span class="cx"> Unreviewed. Added myself as a commiter in contributors.json.
</span></span></pre></div>
<a id="trunkToolsMiniBrowsermacSettingsControllerh"></a>
<div class="modfile"><h4>Modified: trunk/Tools/MiniBrowser/mac/SettingsController.h (189512 => 189513)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/MiniBrowser/mac/SettingsController.h 2015-09-08 22:38:44 UTC (rev 189512)
+++ trunk/Tools/MiniBrowser/mac/SettingsController.h 2015-09-08 23:04:34 UTC (rev 189513)
</span><span class="lines">@@ -45,6 +45,7 @@
</span><span class="cx"> @property (nonatomic, readonly) BOOL useUISideCompositing;
</span><span class="cx"> @property (nonatomic, readonly) BOOL perWindowWebProcessesDisabled;
</span><span class="cx"> @property (nonatomic, readonly) BOOL subPixelCSSOMMetricsEnabled;
</span><ins>+@property (nonatomic, readonly) BOOL acceleratedDrawingEnabled;
</ins><span class="cx"> @property (nonatomic, readonly) NSString *defaultURL;
</span><span class="cx">
</span><span class="cx"> @end
</span></span></pre></div>
<a id="trunkToolsMiniBrowsermacSettingsControllerm"></a>
<div class="modfile"><h4>Modified: trunk/Tools/MiniBrowser/mac/SettingsController.m (189512 => 189513)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/MiniBrowser/mac/SettingsController.m 2015-09-08 22:38:44 UTC (rev 189512)
+++ trunk/Tools/MiniBrowser/mac/SettingsController.m 2015-09-08 23:04:34 UTC (rev 189513)
</span><span class="lines">@@ -36,6 +36,7 @@
</span><span class="cx"> static NSString * const SimpleLineLayoutDebugBordersEnabledPreferenceKey = @"SimpleLineLayoutDebugBordersEnabled";
</span><span class="cx"> static NSString * const TiledScrollingIndicatorVisiblePreferenceKey = @"TiledScrollingIndicatorVisible";
</span><span class="cx"> static NSString * const IncrementalRenderingSuppressedPreferenceKey = @"IncrementalRenderingSuppressed";
</span><ins>+static NSString * const AcceleratedDrawingEnabledPreferenceKey = @"AcceleratedDrawingEnabled";
</ins><span class="cx">
</span><span class="cx"> static NSString * const NonFastScrollableRegionOverlayVisiblePreferenceKey = @"NonFastScrollableRegionOverlayVisible";
</span><span class="cx"> static NSString * const WheelEventHandlerRegionOverlayVisiblePreferenceKey = @"WheelEventHandlerRegionOverlayVisible";
</span><span class="lines">@@ -107,6 +108,7 @@
</span><span class="cx"> [self _addItemWithTitle:@"Show Layer Borders" action:@selector(toggleShowLayerBorders:) indented:NO];
</span><span class="cx"> [self _addItemWithTitle:@"Show Simple Line Layout Borders" action:@selector(toggleSimpleLineLayoutDebugBordersEnabled:) indented:NO];
</span><span class="cx"> [self _addItemWithTitle:@"Suppress Incremental Rendering in New Windows" action:@selector(toggleIncrementalRenderingSuppressed:) indented:NO];
</span><ins>+ [self _addItemWithTitle:@"Enable Accelerated Drawing" action:@selector(toggleAcceleratedDrawingEnabled:) indented:NO];
</ins><span class="cx">
</span><span class="cx"> [self _addHeaderWithTitle:@"WebKit2-only Settings"];
</span><span class="cx">
</span><span class="lines">@@ -152,6 +154,8 @@
</span><span class="cx"> [menuItem setState:[self simpleLineLayoutDebugBordersEnabled] ? NSOnState : NSOffState];
</span><span class="cx"> else if (action == @selector(toggleIncrementalRenderingSuppressed:))
</span><span class="cx"> [menuItem setState:[self incrementalRenderingSuppressed] ? NSOnState : NSOffState];
</span><ins>+ else if (action == @selector(toggleAcceleratedDrawingEnabled:))
+ [menuItem setState:[self acceleratedDrawingEnabled] ? NSOnState : NSOffState];
</ins><span class="cx"> else if (action == @selector(toggleShowTiledScrollingIndicator:))
</span><span class="cx"> [menuItem setState:[self tiledScrollingIndicatorVisible] ? NSOnState : NSOffState];
</span><span class="cx"> else if (action == @selector(toggleUseUISideCompositing:))
</span><span class="lines">@@ -264,6 +268,16 @@
</span><span class="cx"> return [[NSUserDefaults standardUserDefaults] boolForKey:SimpleLineLayoutDebugBordersEnabledPreferenceKey];
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+- (void)toggleAcceleratedDrawingEnabled:(id)sender
+{
+ [self _toggleBooleanDefault:AcceleratedDrawingEnabledPreferenceKey];
+}
+
+- (BOOL)acceleratedDrawingEnabled
+{
+ return [[NSUserDefaults standardUserDefaults] boolForKey:AcceleratedDrawingEnabledPreferenceKey];
+}
+
</ins><span class="cx"> - (void)toggleShowTiledScrollingIndicator:(id)sender
</span><span class="cx"> {
</span><span class="cx"> [self _toggleBooleanDefault:TiledScrollingIndicatorVisiblePreferenceKey];
</span></span></pre></div>
<a id="trunkToolsMiniBrowsermacWK1BrowserWindowControllerm"></a>
<div class="modfile"><h4>Modified: trunk/Tools/MiniBrowser/mac/WK1BrowserWindowController.m (189512 => 189513)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/MiniBrowser/mac/WK1BrowserWindowController.m 2015-09-08 22:38:44 UTC (rev 189512)
+++ trunk/Tools/MiniBrowser/mac/WK1BrowserWindowController.m 2015-09-08 23:04:34 UTC (rev 189513)
</span><span class="lines">@@ -259,6 +259,7 @@
</span><span class="cx"> [[WebPreferences standardPreferences] setSimpleLineLayoutDebugBordersEnabled:settings.simpleLineLayoutDebugBordersEnabled];
</span><span class="cx"> [[WebPreferences standardPreferences] setShowRepaintCounter:settings.layerBordersVisible];
</span><span class="cx"> [[WebPreferences standardPreferences] setSuppressesIncrementalRendering:settings.incrementalRenderingSuppressed];
</span><ins>+ [[WebPreferences standardPreferences] setAcceleratedDrawingEnabled:settings.acceleratedDrawingEnabled];
</ins><span class="cx">
</span><span class="cx"> BOOL useTransparentWindows = settings.useTransparentWindows;
</span><span class="cx"> if (useTransparentWindows != !self.window.isOpaque) {
</span></span></pre></div>
<a id="trunkToolsMiniBrowsermacWK2BrowserWindowControllerm"></a>
<div class="modfile"><h4>Modified: trunk/Tools/MiniBrowser/mac/WK2BrowserWindowController.m (189512 => 189513)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/MiniBrowser/mac/WK2BrowserWindowController.m 2015-09-08 22:38:44 UTC (rev 189512)
+++ trunk/Tools/MiniBrowser/mac/WK2BrowserWindowController.m 2015-09-08 23:04:34 UTC (rev 189513)
</span><span class="lines">@@ -341,6 +341,7 @@
</span><span class="cx"> preferences._compositingBordersVisible = settings.layerBordersVisible;
</span><span class="cx"> preferences._compositingRepaintCountersVisible = settings.layerBordersVisible;
</span><span class="cx"> preferences._simpleLineLayoutDebugBordersEnabled = settings.simpleLineLayoutDebugBordersEnabled;
</span><ins>+ preferences._acceleratedDrawingEnabled = settings.acceleratedDrawingEnabled;
</ins><span class="cx">
</span><span class="cx"> BOOL useTransparentWindows = settings.useTransparentWindows;
</span><span class="cx"> if (useTransparentWindows != _webView._drawsTransparentBackground) {
</span></span></pre>
</div>
</div>
</body>
</html>