<!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>[170896] 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/170896">170896</a></dd>
<dt>Author</dt> <dd>timothy_horton@apple.com</dd>
<dt>Date</dt> <dd>2014-07-08 15:24:41 -0700 (Tue, 08 Jul 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>[WK2] Expose a few drawing/compositing settings on WKPreferences(Private)
https://bugs.webkit.org/show_bug.cgi?id=134645
Reviewed by Dan Bernstein.
* UIProcess/API/Cocoa/WKPreferences.mm:
(-[WKPreferences _compositingBordersVisible]):
(-[WKPreferences _setCompositingBordersVisible:]):
(-[WKPreferences _compositingRepaintCountersVisible]):
(-[WKPreferences _setCompositingRepaintCountersVisible:]):
(-[WKPreferences _tiledScrollingIndicatorVisible]):
(-[WKPreferences _setTiledScrollingIndicatorVisible:]):
* UIProcess/API/Cocoa/WKPreferencesPrivate.h:
Expose layer borders, repaint counters, and the tiled scrolling indicator on WKPreferences, as SPI.
* WebView/WebPreferences.mm:
(-[WebPreferences setSubpixelCSSOMElementMetricsEnabled:]):
Remove an extra unnecessary space.
* MiniBrowser/mac/BrowserWindowController.h:
* MiniBrowser/mac/MainMenu.xib:
Add menu items for layer borders and the tiled scrolling indicator.
* MiniBrowser/mac/WK1BrowserWindowController.m:
(-[WK1BrowserWindowController validateMenuItem:]):
(-[WK1BrowserWindowController layerBordersAreVisible]):
(-[WK1BrowserWindowController toggleLayerBordersVisibility:]):
Add getters/setters/validators for layer borders.
* MiniBrowser/mac/WK2BrowserWindowController.m:
(-[WK2BrowserWindowController awakeFromNib]):
(-[WK2BrowserWindowController validateMenuItem:]):
(-[WK2BrowserWindowController layerBordersAreVisible]):
(-[WK2BrowserWindowController toggleLayerBordersVisibility:]):
(-[WK2BrowserWindowController tiledScrollingIndicatorIsVisible]):
(-[WK2BrowserWindowController toggleTiledScrollingIndicatorVisibility:]):
Add getters/setters/validators for layer borders and the tiled scrolling indicator.
(-[WK2BrowserWindowController isSubpixelCSSOMElementMetricsEnabled]): Deleted.
(-[WK2BrowserWindowController toggleSubpixelCSSOMElementMetricsEnabled:]): Deleted.
Remove the WebKit2 version of the subpixel metrics pref, because it doesn't work, because
nothing in WebKit2 reads this default, and there is no WebKit2 API for adjusting this preference.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebKitmacChangeLog">trunk/Source/WebKit/mac/ChangeLog</a></li>
<li><a href="#trunkSourceWebKitmacWebViewWebPreferencesmm">trunk/Source/WebKit/mac/WebView/WebPreferences.mm</a></li>
<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="#trunkToolsMiniBrowsermacBrowserWindowControllerh">trunk/Tools/MiniBrowser/mac/BrowserWindowController.h</a></li>
<li><a href="#trunkToolsMiniBrowsermacMainMenuxib">trunk/Tools/MiniBrowser/mac/MainMenu.xib</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="trunkSourceWebKitmacChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/mac/ChangeLog (170895 => 170896)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/mac/ChangeLog 2014-07-08 22:10:43 UTC (rev 170895)
+++ trunk/Source/WebKit/mac/ChangeLog 2014-07-08 22:24:41 UTC (rev 170896)
</span><span class="lines">@@ -1,3 +1,14 @@
</span><ins>+2014-07-08 Tim Horton <timothy_horton@apple.com>
+
+ [WK2] Expose a few drawing/compositing settings on WKPreferences(Private)
+ https://bugs.webkit.org/show_bug.cgi?id=134645
+
+ Reviewed by Dan Bernstein.
+
+ * WebView/WebPreferences.mm:
+ (-[WebPreferences setSubpixelCSSOMElementMetricsEnabled:]):
+ Remove an extra unnecessary space.
+
</ins><span class="cx"> 2014-07-03 Daniel Bates <dabates@apple.com>
</span><span class="cx">
</span><span class="cx"> Add WTF::move()
</span></span></pre></div>
<a id="trunkSourceWebKitmacWebViewWebPreferencesmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/mac/WebView/WebPreferences.mm (170895 => 170896)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/mac/WebView/WebPreferences.mm 2014-07-08 22:10:43 UTC (rev 170895)
+++ trunk/Source/WebKit/mac/WebView/WebPreferences.mm 2014-07-08 22:24:41 UTC (rev 170896)
</span><span class="lines">@@ -1915,7 +1915,7 @@
</span><span class="cx"> return [self _boolValueForKey:WebKitSubpixelCSSOMElementMetricsEnabledPreferenceKey];
</span><span class="cx"> }
</span><span class="cx">
</span><del>-- (void) setSubpixelCSSOMElementMetricsEnabled:(BOOL)enabled
</del><ins>+- (void)setSubpixelCSSOMElementMetricsEnabled:(BOOL)enabled
</ins><span class="cx"> {
</span><span class="cx"> [self _setBoolValue:enabled forKey:WebKitSubpixelCSSOMElementMetricsEnabledPreferenceKey];
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/ChangeLog (170895 => 170896)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/ChangeLog 2014-07-08 22:10:43 UTC (rev 170895)
+++ trunk/Source/WebKit2/ChangeLog 2014-07-08 22:24:41 UTC (rev 170896)
</span><span class="lines">@@ -1,5 +1,22 @@
</span><span class="cx"> 2014-07-08 Tim Horton <timothy_horton@apple.com>
</span><span class="cx">
</span><ins>+ [WK2] Expose a few drawing/compositing settings on WKPreferences(Private)
+ https://bugs.webkit.org/show_bug.cgi?id=134645
+
+ Reviewed by Dan Bernstein.
+
+ * UIProcess/API/Cocoa/WKPreferences.mm:
+ (-[WKPreferences _compositingBordersVisible]):
+ (-[WKPreferences _setCompositingBordersVisible:]):
+ (-[WKPreferences _compositingRepaintCountersVisible]):
+ (-[WKPreferences _setCompositingRepaintCountersVisible:]):
+ (-[WKPreferences _tiledScrollingIndicatorVisible]):
+ (-[WKPreferences _setTiledScrollingIndicatorVisible:]):
+ * UIProcess/API/Cocoa/WKPreferencesPrivate.h:
+ Expose layer borders, repaint counters, and the tiled scrolling indicator on WKPreferences, as SPI.
+
+2014-07-08 Tim Horton <timothy_horton@apple.com>
+
</ins><span class="cx"> WKProcessPoolConfigurationPrivate's maximumProcessCount property has no effect
</span><span class="cx"> https://bugs.webkit.org/show_bug.cgi?id=134711
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessAPICocoaWKPreferencesmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/API/Cocoa/WKPreferences.mm (170895 => 170896)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/API/Cocoa/WKPreferences.mm 2014-07-08 22:10:43 UTC (rev 170895)
+++ trunk/Source/WebKit2/UIProcess/API/Cocoa/WKPreferences.mm 2014-07-08 22:24:41 UTC (rev 170896)
</span><span class="lines">@@ -163,6 +163,36 @@
</span><span class="cx"> _preferences->setOfflineWebApplicationCacheEnabled(offlineApplicationCacheIsEnabled);
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+- (BOOL)_compositingBordersVisible
+{
+ return _preferences->compositingBordersVisible();
+}
+
+- (void)_setCompositingBordersVisible:(BOOL)compositingBordersVisible
+{
+ _preferences->setCompositingBordersVisible(compositingBordersVisible);
+}
+
+- (BOOL)_compositingRepaintCountersVisible
+{
+ return _preferences->compositingRepaintCountersVisible();
+}
+
+- (void)_setCompositingRepaintCountersVisible:(BOOL)repaintCountersVisible
+{
+ _preferences->setCompositingRepaintCountersVisible(repaintCountersVisible);
+}
+
+- (BOOL)_tiledScrollingIndicatorVisible
+{
+ return _preferences->tiledScrollingIndicatorVisible();
+}
+
+- (void)_setTiledScrollingIndicatorVisible:(BOOL)tiledScrollingIndicatorVisible
+{
+ _preferences->setTiledScrollingIndicatorVisible(tiledScrollingIndicatorVisible);
+}
+
</ins><span class="cx"> @end
</span><span class="cx">
</span><span class="cx"> #endif // WK_API_ENABLED
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessAPICocoaWKPreferencesPrivateh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/API/Cocoa/WKPreferencesPrivate.h (170895 => 170896)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/API/Cocoa/WKPreferencesPrivate.h 2014-07-08 22:10:43 UTC (rev 170895)
+++ trunk/Source/WebKit2/UIProcess/API/Cocoa/WKPreferencesPrivate.h 2014-07-08 22:24:41 UTC (rev 170896)
</span><span class="lines">@@ -39,10 +39,16 @@
</span><span class="cx">
</span><span class="cx"> @interface WKPreferences (WKPrivate)
</span><span class="cx">
</span><ins>+// FIXME: This property should not have the verb "is" in it.
</ins><span class="cx"> @property (nonatomic, setter=_setTelephoneNumberDetectionIsEnabled:) BOOL _telephoneNumberDetectionIsEnabled;
</span><span class="cx"> @property (nonatomic, setter=_setStorageBlockingPolicy:) _WKStorageBlockingPolicy _storageBlockingPolicy;
</span><span class="cx">
</span><ins>+@property (nonatomic, setter=_setCompositingBordersVisible:) BOOL _compositingBordersVisible;
+@property (nonatomic, setter=_setCompositingRepaintCountersVisible:) BOOL _compositingRepaintCountersVisible;
+@property (nonatomic, setter=_setTiledScrollingIndicatorVisible:) BOOL _tiledScrollingIndicatorVisible;
+
</ins><span class="cx"> // FIXME: This should be configured on the WKWebsiteDataStore.
</span><ins>+// FIXME: This property should not have the verb "is" in it.
</ins><span class="cx"> @property (nonatomic, setter=_setOfflineApplicationCacheIsEnabled:) BOOL _offlineApplicationCacheIsEnabled;
</span><span class="cx">
</span><span class="cx"> @end
</span></span></pre></div>
<a id="trunkToolsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Tools/ChangeLog (170895 => 170896)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/ChangeLog 2014-07-08 22:10:43 UTC (rev 170895)
+++ trunk/Tools/ChangeLog 2014-07-08 22:24:41 UTC (rev 170896)
</span><span class="lines">@@ -1,3 +1,34 @@
</span><ins>+2014-07-08 Tim Horton <timothy_horton@apple.com>
+
+ [WK2] Expose a few drawing/compositing settings on WKPreferences(Private)
+ https://bugs.webkit.org/show_bug.cgi?id=134645
+
+ Reviewed by Dan Bernstein.
+
+ * MiniBrowser/mac/BrowserWindowController.h:
+ * MiniBrowser/mac/MainMenu.xib:
+ Add menu items for layer borders and the tiled scrolling indicator.
+
+ * MiniBrowser/mac/WK1BrowserWindowController.m:
+ (-[WK1BrowserWindowController validateMenuItem:]):
+ (-[WK1BrowserWindowController layerBordersAreVisible]):
+ (-[WK1BrowserWindowController toggleLayerBordersVisibility:]):
+ Add getters/setters/validators for layer borders.
+
+ * MiniBrowser/mac/WK2BrowserWindowController.m:
+ (-[WK2BrowserWindowController awakeFromNib]):
+ (-[WK2BrowserWindowController validateMenuItem:]):
+ (-[WK2BrowserWindowController layerBordersAreVisible]):
+ (-[WK2BrowserWindowController toggleLayerBordersVisibility:]):
+ (-[WK2BrowserWindowController tiledScrollingIndicatorIsVisible]):
+ (-[WK2BrowserWindowController toggleTiledScrollingIndicatorVisibility:]):
+ Add getters/setters/validators for layer borders and the tiled scrolling indicator.
+
+ (-[WK2BrowserWindowController isSubpixelCSSOMElementMetricsEnabled]): Deleted.
+ (-[WK2BrowserWindowController toggleSubpixelCSSOMElementMetricsEnabled:]): Deleted.
+ Remove the WebKit2 version of the subpixel metrics pref, because it doesn't work, because
+ nothing in WebKit2 reads this default, and there is no WebKit2 API for adjusting this preference.
+
</ins><span class="cx"> 2014-07-08 Adrian Perez de Castro <aperez@igalia.com>
</span><span class="cx">
</span><span class="cx"> [GTK] Move user style sheet API out of WebKitWebViewGroup
</span></span></pre></div>
<a id="trunkToolsMiniBrowsermacBrowserWindowControllerh"></a>
<div class="modfile"><h4>Modified: trunk/Tools/MiniBrowser/mac/BrowserWindowController.h (170895 => 170896)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/MiniBrowser/mac/BrowserWindowController.h 2014-07-08 22:10:43 UTC (rev 170895)
+++ trunk/Tools/MiniBrowser/mac/BrowserWindowController.h 2014-07-08 22:24:41 UTC (rev 170896)
</span><span class="lines">@@ -46,13 +46,15 @@
</span><span class="cx"> - (IBAction)toggleZoomMode:(id)sender;
</span><span class="cx"> - (IBAction)togglePaginationMode:(id)sender;
</span><span class="cx"> - (IBAction)toggleTransparentWindow:(id)sender;
</span><del>-- (IBAction)toggleSubpixelCSSOMElementMetricsEnabled:(id)sender;
</del><ins>+- (IBAction)toggleLayerBordersVisibility:(id)sender;
</ins><span class="cx">
</span><span class="cx"> - (IBAction)dumpSourceToConsole:(id)sender;
</span><span class="cx"> - (IBAction)find:(id)sender;
</span><span class="cx">
</span><span class="cx"> @optional
</span><ins>+- (IBAction)toggleSubpixelCSSOMElementMetricsEnabled:(id)sender;
</ins><span class="cx"> - (IBAction)toggleUISideCompositing:(id)sender;
</span><ins>+- (IBAction)toggleTiledScrollingIndicatorVisibility:(id)sender;
</ins><span class="cx">
</span><span class="cx"> @end
</span><span class="cx">
</span></span></pre></div>
<a id="trunkToolsMiniBrowsermacMainMenuxib"></a>
<div class="modfile"><h4>Modified: trunk/Tools/MiniBrowser/mac/MainMenu.xib (170895 => 170896)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/MiniBrowser/mac/MainMenu.xib 2014-07-08 22:10:43 UTC (rev 170895)
+++ trunk/Tools/MiniBrowser/mac/MainMenu.xib 2014-07-08 22:24:41 UTC (rev 170896)
</span><span class="lines">@@ -469,6 +469,18 @@
</span><span class="cx"> <action selector="toggleUISideCompositing:" target="-1" id="1Ed-C5-0po"/>
</span><span class="cx"> </connections>
</span><span class="cx"> </menuItem>
</span><ins>+ <menuItem title="Layer Borders" id="00T-EI-Wqj">
+ <modifierMask key="keyEquivalentModifierMask"/>
+ <connections>
+ <action selector="toggleLayerBordersVisibility:" target="-1" id="gmt-1Z-XcQ"/>
+ </connections>
+ </menuItem>
+ <menuItem title="Tiled Scrolling Indicator" id="iBU-Yy-GuV">
+ <modifierMask key="keyEquivalentModifierMask"/>
+ <connections>
+ <action selector="toggleTiledScrollingIndicatorVisibility:" target="-1" id="RJB-dt-xSR"/>
+ </connections>
+ </menuItem>
</ins><span class="cx"> <menuItem title="Enable Sub-Pixel offsetWidth etc." state="on" id="8X5-i6-t2d">
</span><span class="cx"> <modifierMask key="keyEquivalentModifierMask"/>
</span><span class="cx"> <connections>
</span></span></pre></div>
<a id="trunkToolsMiniBrowsermacWK1BrowserWindowControllerm"></a>
<div class="modfile"><h4>Modified: trunk/Tools/MiniBrowser/mac/WK1BrowserWindowController.m (170895 => 170896)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/MiniBrowser/mac/WK1BrowserWindowController.m 2014-07-08 22:10:43 UTC (rev 170895)
+++ trunk/Tools/MiniBrowser/mac/WK1BrowserWindowController.m 2014-07-08 22:24:41 UTC (rev 170896)
</span><span class="lines">@@ -136,6 +136,8 @@
</span><span class="cx"> [menuItem setState:[[self window] isOpaque] ? NSOffState : NSOnState];
</span><span class="cx"> else if (action == @selector(toggleSubpixelCSSOMElementMetricsEnabled:))
</span><span class="cx"> [menuItem setState:[self isSubpixelCSSOMElementMetricsEnabled] ? NSOnState : NSOffState];
</span><ins>+ else if (action == @selector(toggleLayerBordersVisibility:))
+ [menuItem setState:[self layerBordersVisible] ? NSOnState : NSOffState];
</ins><span class="cx">
</span><span class="cx"> return YES;
</span><span class="cx"> }
</span><span class="lines">@@ -265,6 +267,18 @@
</span><span class="cx"> [[WebPreferences standardPreferences] setSubpixelCSSOMElementMetricsEnabled:![self isSubpixelCSSOMElementMetricsEnabled]];
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+- (BOOL)layerBordersVisible
+{
+ return [[WebPreferences standardPreferences] showDebugBorders];
+}
+
+- (IBAction)toggleLayerBordersVisibility:(id)sender
+{
+ BOOL newValue = ![self layerBordersVisible];
+ [[WebPreferences standardPreferences] setShowDebugBorders:newValue];
+ [[WebPreferences standardPreferences] setShowRepaintCounter:newValue];
+}
+
</ins><span class="cx"> - (IBAction)find:(id)sender
</span><span class="cx"> {
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkToolsMiniBrowsermacWK2BrowserWindowControllerm"></a>
<div class="modfile"><h4>Modified: trunk/Tools/MiniBrowser/mac/WK2BrowserWindowController.m (170895 => 170896)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/MiniBrowser/mac/WK2BrowserWindowController.m 2014-07-08 22:10:43 UTC (rev 170895)
+++ trunk/Tools/MiniBrowser/mac/WK2BrowserWindowController.m 2014-07-08 22:24:41 UTC (rev 170896)
</span><span class="lines">@@ -30,6 +30,7 @@
</span><span class="cx"> #import "AppDelegate.h"
</span><span class="cx"> #import <WebKit/WKFrameInfo.h>
</span><span class="cx"> #import <WebKit/WKNavigationDelegate.h>
</span><ins>+#import <WebKit/WKPreferencesPrivate.h>
</ins><span class="cx"> #import <WebKit/WKUIDelegate.h>
</span><span class="cx"> #import <WebKit/WKWebView.h>
</span><span class="cx"> #import <WebKit/WKWebViewConfiguration.h>
</span><span class="lines">@@ -37,8 +38,10 @@
</span><span class="cx">
</span><span class="cx"> static void* keyValueObservingContext = &keyValueObservingContext;
</span><span class="cx"> static NSString * const WebKit2UseRemoteLayerTreeDrawingAreaKey = @"WebKit2UseRemoteLayerTreeDrawingArea";
</span><del>-static NSString * const WebKit2SubpixelCSSOMElementMetricsEnabledKey = @"WebKitSubpixelCSSOMElementMetricsEnabled";
</del><span class="cx">
</span><ins>+static NSString * const LayerBordersVisiblePreferenceKey = @"LayerBordersVisible";
+static NSString * const TiledScrollingIndicatorVisiblePreferenceKey = @"TiledScrollingIndicatorVisibleKey";
+
</ins><span class="cx"> @interface WK2BrowserWindowController () <WKNavigationDelegate, WKUIDelegate>
</span><span class="cx"> @end
</span><span class="cx">
</span><span class="lines">@@ -50,8 +53,13 @@
</span><span class="cx"> - (void)awakeFromNib
</span><span class="cx"> {
</span><span class="cx"> static WKWebViewConfiguration *configuration;
</span><del>- if (!configuration)
</del><ins>+ if (!configuration) {
</ins><span class="cx"> configuration = [[WKWebViewConfiguration alloc] init];
</span><ins>+
+ configuration.preferences._tiledScrollingIndicatorVisible = [self tiledScrollingIndicatorVisible];
+ configuration.preferences._compositingBordersVisible = [self layerBordersVisible];
+ configuration.preferences._compositingRepaintCountersVisible = [self layerBordersVisible];
+ }
</ins><span class="cx"> _webView = [[WKWebView alloc] initWithFrame:[containerView bounds] configuration:configuration];
</span><span class="cx">
</span><span class="cx"> _webView.allowsMagnification = YES;
</span><span class="lines">@@ -138,8 +146,10 @@
</span><span class="cx"> [menuItem setState:[[self window] isOpaque] ? NSOffState : NSOnState];
</span><span class="cx"> else if (action == @selector(toggleUISideCompositing:))
</span><span class="cx"> [menuItem setState:[self isUISideCompositingEnabled] ? NSOnState : NSOffState];
</span><del>- else if (action == @selector(toggleSubpixelCSSOMElementMetricsEnabled:))
- [menuItem setState:[self isSubpixelCSSOMElementMetricsEnabled] ? NSOnState : NSOffState];
</del><ins>+ else if (action == @selector(toggleLayerBordersVisibility:))
+ [menuItem setState:[self layerBordersVisible] ? NSOnState : NSOffState];
+ else if (action == @selector(toggleTiledScrollingIndicatorVisibility:))
+ [menuItem setState:[self tiledScrollingIndicatorVisible] ? NSOnState : NSOffState];
</ins><span class="cx">
</span><span class="cx"> return YES;
</span><span class="cx"> }
</span><span class="lines">@@ -301,28 +311,41 @@
</span><span class="cx"> [[self window] display];
</span><span class="cx"> }
</span><span class="cx">
</span><del>-- (BOOL)isSubpixelCSSOMElementMetricsEnabled
</del><ins>+- (BOOL)isUISideCompositingEnabled
</ins><span class="cx"> {
</span><del>- return [[NSUserDefaults standardUserDefaults] boolForKey:WebKit2SubpixelCSSOMElementMetricsEnabledKey];
</del><ins>+ return [[NSUserDefaults standardUserDefaults] boolForKey:WebKit2UseRemoteLayerTreeDrawingAreaKey];
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-- (IBAction)toggleSubpixelCSSOMElementMetricsEnabled:(id)sender
</del><ins>+- (IBAction)toggleUISideCompositing:(id)sender
</ins><span class="cx"> {
</span><del>- [[NSUserDefaults standardUserDefaults] setBool:![self isSubpixelCSSOMElementMetricsEnabled] forKey:WebKit2SubpixelCSSOMElementMetricsEnabledKey];
</del><ins>+ [[NSUserDefaults standardUserDefaults] setBool:![self isUISideCompositingEnabled] forKey:WebKit2UseRemoteLayerTreeDrawingAreaKey];
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-- (BOOL)isUISideCompositingEnabled
</del><ins>+- (BOOL)layerBordersVisible
</ins><span class="cx"> {
</span><del>- return [[NSUserDefaults standardUserDefaults] boolForKey:WebKit2UseRemoteLayerTreeDrawingAreaKey];
</del><ins>+ return [[NSUserDefaults standardUserDefaults] boolForKey:LayerBordersVisiblePreferenceKey];
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-- (IBAction)toggleUISideCompositing:(id)sender
</del><ins>+- (IBAction)toggleLayerBordersVisibility:(id)sender
</ins><span class="cx"> {
</span><del>- NSUserDefaults *userDefaults = [NSUserDefaults standardUserDefaults];
- BOOL newValue = ![userDefaults boolForKey:WebKit2UseRemoteLayerTreeDrawingAreaKey];
- [userDefaults setBool:newValue forKey:WebKit2UseRemoteLayerTreeDrawingAreaKey];
</del><ins>+ BOOL newState = ![self layerBordersVisible];
+ [[NSUserDefaults standardUserDefaults] setBool:newState forKey:LayerBordersVisiblePreferenceKey];
+ _webView.configuration.preferences._compositingBordersVisible = newState;
+ _webView.configuration.preferences._compositingRepaintCountersVisible = newState;
</ins><span class="cx"> }
</span><span class="cx">
</span><ins>+- (BOOL)tiledScrollingIndicatorVisible
+{
+ return [[NSUserDefaults standardUserDefaults] boolForKey:TiledScrollingIndicatorVisiblePreferenceKey];
+}
+
+- (IBAction)toggleTiledScrollingIndicatorVisibility:(id)sender
+{
+ BOOL newState = ![self tiledScrollingIndicatorVisible];
+ [[NSUserDefaults standardUserDefaults] setBool:newState forKey:TiledScrollingIndicatorVisiblePreferenceKey];
+ _webView.configuration.preferences._tiledScrollingIndicatorVisible = newState;
+}
+
</ins><span class="cx"> - (void)observeValueForKeyPath:(NSString *)keyPath ofObject:(id)object change:(NSDictionary *)change context:(void *)context
</span><span class="cx"> {
</span><span class="cx"> if (context != keyValueObservingContext || object != _webView)
</span></span></pre>
</div>
</div>
</body>
</html>