<!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>[211135] 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/211135">211135</a></dd>
<dt>Author</dt> <dd>zalan@apple.com</dd>
<dt>Date</dt> <dd>2017-01-24 21:02:56 -0800 (Tue, 24 Jan 2017)</dd>
</dl>
<h3>Log Message</h3>
<pre>Add simple line layout toggle to MiniBrowser
https://bugs.webkit.org/show_bug.cgi?id=167405
Reviewed by Andreas Kling.
Source/WebKit/mac:
* WebView/WebPreferenceKeysPrivate.h:
* WebView/WebPreferences.mm:
(+[WebPreferences initialize]):
(-[WebPreferences simpleLineLayoutEnabled]):
(-[WebPreferences setSimpleLineLayoutEnabled:]):
* WebView/WebPreferencesPrivate.h:
* WebView/WebView.mm:
(-[WebView _preferencesChanged:]):
Source/WebKit2:
* UIProcess/API/Cocoa/WKPreferences.mm:
(-[WKPreferences _simpleLineLayoutEnabled]):
(-[WKPreferences _setSimpleLineLayoutEnabled:]):
* UIProcess/API/Cocoa/WKPreferencesPrivate.h:
Tools:
* MiniBrowser/mac/SettingsController.h:
* MiniBrowser/mac/SettingsController.m:
(-[SettingsController _populateMenu]):
(-[SettingsController validateMenuItem:]):
(-[SettingsController toggleSimpleLineLayoutEnabled:]):
(-[SettingsController simpleLineLayoutEnabled]):
* MiniBrowser/mac/WK1BrowserWindowController.m:
(-[WK1BrowserWindowController didChangeSettings]):
* MiniBrowser/mac/WK2BrowserWindowController.m:
(-[WK2BrowserWindowController didChangeSettings]):</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebKitmacChangeLog">trunk/Source/WebKit/mac/ChangeLog</a></li>
<li><a href="#trunkSourceWebKitmacWebViewWebPreferenceKeysPrivateh">trunk/Source/WebKit/mac/WebView/WebPreferenceKeysPrivate.h</a></li>
<li><a href="#trunkSourceWebKitmacWebViewWebPreferencesmm">trunk/Source/WebKit/mac/WebView/WebPreferences.mm</a></li>
<li><a href="#trunkSourceWebKitmacWebViewWebPreferencesPrivateh">trunk/Source/WebKit/mac/WebView/WebPreferencesPrivate.h</a></li>
<li><a href="#trunkSourceWebKitmacWebViewWebViewmm">trunk/Source/WebKit/mac/WebView/WebView.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="#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="trunkSourceWebKitmacChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/mac/ChangeLog (211134 => 211135)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/mac/ChangeLog 2017-01-25 04:25:51 UTC (rev 211134)
+++ trunk/Source/WebKit/mac/ChangeLog 2017-01-25 05:02:56 UTC (rev 211135)
</span><span class="lines">@@ -1,3 +1,19 @@
</span><ins>+2017-01-24 Zalan Bujtas <zalan@apple.com>
+
+ Add simple line layout toggle to MiniBrowser
+ https://bugs.webkit.org/show_bug.cgi?id=167405
+
+ Reviewed by Andreas Kling.
+
+ * WebView/WebPreferenceKeysPrivate.h:
+ * WebView/WebPreferences.mm:
+ (+[WebPreferences initialize]):
+ (-[WebPreferences simpleLineLayoutEnabled]):
+ (-[WebPreferences setSimpleLineLayoutEnabled:]):
+ * WebView/WebPreferencesPrivate.h:
+ * WebView/WebView.mm:
+ (-[WebView _preferencesChanged:]):
+
</ins><span class="cx"> 2017-01-24 Joseph Pecoraro <pecoraro@apple.com>
</span><span class="cx">
</span><span class="cx"> Fold USER_TIMING into WEB_TIMING and make it a RuntimeEnabledFeature
</span></span></pre></div>
<a id="trunkSourceWebKitmacWebViewWebPreferenceKeysPrivateh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/mac/WebView/WebPreferenceKeysPrivate.h (211134 => 211135)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/mac/WebView/WebPreferenceKeysPrivate.h 2017-01-25 04:25:51 UTC (rev 211134)
+++ trunk/Source/WebKit/mac/WebView/WebPreferenceKeysPrivate.h 2017-01-25 05:02:56 UTC (rev 211135)
</span><span class="lines">@@ -105,6 +105,7 @@
</span><span class="cx"> #define WebKitCanvasUsesAcceleratedDrawingPreferenceKey @"WebKitCanvasUsesAcceleratedDrawing"
</span><span class="cx"> #define WebKitAcceleratedCompositingEnabledPreferenceKey @"WebKitAcceleratedCompositingEnabled"
</span><span class="cx"> #define WebKitShowDebugBordersPreferenceKey @"WebKitShowDebugBorders"
</span><ins>+#define WebKitSimpleLineLayoutEnabledPreferenceKey @"WebKitSimpleLineLayoutEnabled"
</ins><span class="cx"> #define WebKitSimpleLineLayoutDebugBordersEnabledPreferenceKey @"WebKitSimpleLineLayoutDebugBordersEnabled"
</span><span class="cx"> #define WebKitShowRepaintCounterPreferenceKey @"WebKitShowRepaintCounter"
</span><span class="cx"> #define WebKitWebAudioEnabledPreferenceKey @"WebKitWebAudioEnabled"
</span></span></pre></div>
<a id="trunkSourceWebKitmacWebViewWebPreferencesmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/mac/WebView/WebPreferences.mm (211134 => 211135)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/mac/WebView/WebPreferences.mm 2017-01-25 04:25:51 UTC (rev 211134)
+++ trunk/Source/WebKit/mac/WebView/WebPreferences.mm 2017-01-25 05:02:56 UTC (rev 211135)
</span><span class="lines">@@ -500,6 +500,7 @@
</span><span class="cx"> [NSNumber numberWithBool:NO], WebKitCanvasUsesAcceleratedDrawingPreferenceKey,
</span><span class="cx"> #endif
</span><span class="cx"> [NSNumber numberWithBool:NO], WebKitShowDebugBordersPreferenceKey,
</span><ins>+ [NSNumber numberWithBool:YES], WebKitSimpleLineLayoutEnabledPreferenceKey,
</ins><span class="cx"> [NSNumber numberWithBool:NO], WebKitSimpleLineLayoutDebugBordersEnabledPreferenceKey,
</span><span class="cx"> [NSNumber numberWithBool:NO], WebKitShowRepaintCounterPreferenceKey,
</span><span class="cx"> [NSNumber numberWithBool:YES], WebKitWebGLEnabledPreferenceKey,
</span><span class="lines">@@ -1960,6 +1961,16 @@
</span><span class="cx"> [self _setBoolValue:enabled forKey:WebKitShowDebugBordersPreferenceKey];
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+- (BOOL)simpleLineLayoutEnabled
+{
+ return [self _boolValueForKey:WebKitSimpleLineLayoutEnabledPreferenceKey];
+}
+
+- (void)setSimpleLineLayoutEnabled:(BOOL)enabled
+{
+ [self _setBoolValue:enabled forKey:WebKitSimpleLineLayoutEnabledPreferenceKey];
+}
+
</ins><span class="cx"> - (BOOL)simpleLineLayoutDebugBordersEnabled
</span><span class="cx"> {
</span><span class="cx"> return [self _boolValueForKey:WebKitSimpleLineLayoutDebugBordersEnabledPreferenceKey];
</span></span></pre></div>
<a id="trunkSourceWebKitmacWebViewWebPreferencesPrivateh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/mac/WebView/WebPreferencesPrivate.h (211134 => 211135)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/mac/WebView/WebPreferencesPrivate.h 2017-01-25 04:25:51 UTC (rev 211134)
+++ trunk/Source/WebKit/mac/WebView/WebPreferencesPrivate.h 2017-01-25 05:02:56 UTC (rev 211135)
</span><span class="lines">@@ -227,6 +227,9 @@
</span><span class="cx"> - (BOOL)showDebugBorders;
</span><span class="cx"> - (void)setShowDebugBorders:(BOOL)show;
</span><span class="cx">
</span><ins>+- (BOOL)simpleLineLayoutEnabled;
+- (void)setSimpleLineLayoutEnabled:(BOOL)enabled;
+
</ins><span class="cx"> - (BOOL)simpleLineLayoutDebugBordersEnabled;
</span><span class="cx"> - (void)setSimpleLineLayoutDebugBordersEnabled:(BOOL)enabled;
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKitmacWebViewWebViewmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/mac/WebView/WebView.mm (211134 => 211135)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/mac/WebView/WebView.mm 2017-01-25 04:25:51 UTC (rev 211134)
+++ trunk/Source/WebKit/mac/WebView/WebView.mm 2017-01-25 05:02:56 UTC (rev 211135)
</span><span class="lines">@@ -2681,6 +2681,7 @@
</span><span class="cx"> settings.setDisplayListDrawingEnabled([preferences displayListDrawingEnabled]);
</span><span class="cx"> settings.setCanvasUsesAcceleratedDrawing([preferences canvasUsesAcceleratedDrawing]);
</span><span class="cx"> settings.setShowDebugBorders([preferences showDebugBorders]);
</span><ins>+ settings.setSimpleLineLayoutEnabled([preferences simpleLineLayoutEnabled]);
</ins><span class="cx"> settings.setSimpleLineLayoutDebugBordersEnabled([preferences simpleLineLayoutDebugBordersEnabled]);
</span><span class="cx"> settings.setShowRepaintCounter([preferences showRepaintCounter]);
</span><span class="cx"> settings.setWebGLEnabled([preferences webGLEnabled]);
</span></span></pre></div>
<a id="trunkSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/ChangeLog (211134 => 211135)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/ChangeLog 2017-01-25 04:25:51 UTC (rev 211134)
+++ trunk/Source/WebKit2/ChangeLog 2017-01-25 05:02:56 UTC (rev 211135)
</span><span class="lines">@@ -1,3 +1,15 @@
</span><ins>+2017-01-24 Zalan Bujtas <zalan@apple.com>
+
+ Add simple line layout toggle to MiniBrowser
+ https://bugs.webkit.org/show_bug.cgi?id=167405
+
+ Reviewed by Andreas Kling.
+
+ * UIProcess/API/Cocoa/WKPreferences.mm:
+ (-[WKPreferences _simpleLineLayoutEnabled]):
+ (-[WKPreferences _setSimpleLineLayoutEnabled:]):
+ * UIProcess/API/Cocoa/WKPreferencesPrivate.h:
+
</ins><span class="cx"> 2017-01-24 Joseph Pecoraro <pecoraro@apple.com>
</span><span class="cx">
</span><span class="cx"> Fold USER_TIMING into WEB_TIMING and make it a RuntimeEnabledFeature
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessAPICocoaWKPreferencesmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/API/Cocoa/WKPreferences.mm (211134 => 211135)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/API/Cocoa/WKPreferences.mm 2017-01-25 04:25:51 UTC (rev 211134)
+++ trunk/Source/WebKit2/UIProcess/API/Cocoa/WKPreferences.mm 2017-01-25 05:02:56 UTC (rev 211135)
</span><span class="lines">@@ -285,6 +285,16 @@
</span><span class="cx"> _preferences->setVisibleDebugOverlayRegions(regionFlags);
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+- (BOOL)_simpleLineLayoutEnabled
+{
+ return _preferences->simpleLineLayoutEnabled();
+}
+
+- (void)_setSimpleLineLayoutEnabled:(BOOL)simpleLineLayoutEnabled
+{
+ _preferences->setSimpleLineLayoutEnabled(simpleLineLayoutEnabled);
+}
+
</ins><span class="cx"> - (BOOL)_simpleLineLayoutDebugBordersEnabled
</span><span class="cx"> {
</span><span class="cx"> return _preferences->simpleLineLayoutDebugBordersEnabled();
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessAPICocoaWKPreferencesPrivateh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/API/Cocoa/WKPreferencesPrivate.h (211134 => 211135)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/API/Cocoa/WKPreferencesPrivate.h 2017-01-25 04:25:51 UTC (rev 211134)
+++ trunk/Source/WebKit2/UIProcess/API/Cocoa/WKPreferencesPrivate.h 2017-01-25 05:02:56 UTC (rev 211135)
</span><span class="lines">@@ -59,6 +59,7 @@
</span><span class="cx"> @property (nonatomic, setter=_setTiledScrollingIndicatorVisible:) BOOL _tiledScrollingIndicatorVisible;
</span><span class="cx"> @property (nonatomic, setter=_setResourceUsageOverlayVisible:) BOOL _resourceUsageOverlayVisible WK_API_AVAILABLE(macosx(10.12), ios(10.0));
</span><span class="cx"> @property (nonatomic, setter=_setVisibleDebugOverlayRegions:) _WKDebugOverlayRegions _visibleDebugOverlayRegions WK_API_AVAILABLE(macosx(10.11), ios(9.0));
</span><ins>+@property (nonatomic, setter=_setSimpleLineLayoutEnabled:) BOOL _simpleLineLayoutEnabled WK_API_AVAILABLE(macosx(10.12), ios(10.0));
</ins><span class="cx"> @property (nonatomic, setter=_setSimpleLineLayoutDebugBordersEnabled:) BOOL _simpleLineLayoutDebugBordersEnabled WK_API_AVAILABLE(macosx(10.11), ios(9.0));
</span><span class="cx"> @property (nonatomic, setter=_setAcceleratedDrawingEnabled:) BOOL _acceleratedDrawingEnabled WK_API_AVAILABLE(macosx(10.12), ios(10.0));
</span><span class="cx"> @property (nonatomic, setter=_setDisplayListDrawingEnabled:) BOOL _displayListDrawingEnabled WK_API_AVAILABLE(macosx(10.12), ios(10.0));
</span></span></pre></div>
<a id="trunkToolsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Tools/ChangeLog (211134 => 211135)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/ChangeLog 2017-01-25 04:25:51 UTC (rev 211134)
+++ trunk/Tools/ChangeLog 2017-01-25 05:02:56 UTC (rev 211135)
</span><span class="lines">@@ -1,3 +1,21 @@
</span><ins>+2017-01-24 Zalan Bujtas <zalan@apple.com>
+
+ Add simple line layout toggle to MiniBrowser
+ https://bugs.webkit.org/show_bug.cgi?id=167405
+
+ Reviewed by Andreas Kling.
+
+ * MiniBrowser/mac/SettingsController.h:
+ * MiniBrowser/mac/SettingsController.m:
+ (-[SettingsController _populateMenu]):
+ (-[SettingsController validateMenuItem:]):
+ (-[SettingsController toggleSimpleLineLayoutEnabled:]):
+ (-[SettingsController simpleLineLayoutEnabled]):
+ * MiniBrowser/mac/WK1BrowserWindowController.m:
+ (-[WK1BrowserWindowController didChangeSettings]):
+ * MiniBrowser/mac/WK2BrowserWindowController.m:
+ (-[WK2BrowserWindowController didChangeSettings]):
+
</ins><span class="cx"> 2017-01-24 Joseph Pecoraro <pecoraro@apple.com>
</span><span class="cx">
</span><span class="cx"> WKR does not include my nick when commit-queue lands my patch
</span></span></pre></div>
<a id="trunkToolsMiniBrowsermacSettingsControllerh"></a>
<div class="modfile"><h4>Modified: trunk/Tools/MiniBrowser/mac/SettingsController.h (211134 => 211135)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/MiniBrowser/mac/SettingsController.h 2017-01-25 04:25:51 UTC (rev 211134)
+++ trunk/Tools/MiniBrowser/mac/SettingsController.h 2017-01-25 05:02:56 UTC (rev 211135)
</span><span class="lines">@@ -38,6 +38,7 @@
</span><span class="cx"> @property (nonatomic, readonly) BOOL useTransparentWindows;
</span><span class="cx"> @property (nonatomic, readonly) BOOL usePaginatedMode;
</span><span class="cx"> @property (nonatomic, readonly) BOOL layerBordersVisible;
</span><ins>+@property (nonatomic, readonly) BOOL simpleLineLayoutEnabled;
</ins><span class="cx"> @property (nonatomic, readonly) BOOL simpleLineLayoutDebugBordersEnabled;
</span><span class="cx"> @property (nonatomic, readonly) BOOL incrementalRenderingSuppressed;
</span><span class="cx"> @property (nonatomic, readonly) BOOL tiledScrollingIndicatorVisible;
</span></span></pre></div>
<a id="trunkToolsMiniBrowsermacSettingsControllerm"></a>
<div class="modfile"><h4>Modified: trunk/Tools/MiniBrowser/mac/SettingsController.m (211134 => 211135)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/MiniBrowser/mac/SettingsController.m 2017-01-25 04:25:51 UTC (rev 211134)
+++ trunk/Tools/MiniBrowser/mac/SettingsController.m 2017-01-25 05:02:56 UTC (rev 211135)
</span><span class="lines">@@ -39,6 +39,7 @@
</span><span class="cx"> static NSString * const UseWebKit2ByDefaultPreferenceKey = @"UseWebKit2ByDefault";
</span><span class="cx"> static NSString * const CreateEditorByDefaultPreferenceKey = @"CreateEditorByDefault";
</span><span class="cx"> static NSString * const LayerBordersVisiblePreferenceKey = @"LayerBordersVisible";
</span><ins>+static NSString * const SimpleLineLayoutEnabledPreferenceKey = @"SimpleLineLayoutEnabled";
</ins><span class="cx"> static NSString * const SimpleLineLayoutDebugBordersEnabledPreferenceKey = @"SimpleLineLayoutDebugBordersEnabled";
</span><span class="cx"> static NSString * const TiledScrollingIndicatorVisiblePreferenceKey = @"TiledScrollingIndicatorVisible";
</span><span class="cx"> static NSString * const ReserveSpaceForBannersPreferenceKey = @"ReserveSpaceForBanners";
</span><span class="lines">@@ -128,6 +129,7 @@
</span><span class="cx"> [self _addItemWithTitle:@"Use Transparent Windows" action:@selector(toggleUseTransparentWindows:) indented:NO];
</span><span class="cx"> [self _addItemWithTitle:@"Use Paginated Mode" action:@selector(toggleUsePaginatedMode:) indented:NO];
</span><span class="cx"> [self _addItemWithTitle:@"Show Layer Borders" action:@selector(toggleShowLayerBorders:) indented:NO];
</span><ins>+ [self _addItemWithTitle:@"Disable Simple Line Layout" action:@selector(toggleSimpleLineLayoutEnabled:) indented:NO];
</ins><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><span class="cx"> [self _addItemWithTitle:@"Enable Accelerated Drawing" action:@selector(toggleAcceleratedDrawingEnabled:) indented:NO];
</span><span class="lines">@@ -205,6 +207,8 @@
</span><span class="cx"> [menuItem setState:[self usePaginatedMode] ? NSOnState : NSOffState];
</span><span class="cx"> else if (action == @selector(toggleShowLayerBorders:))
</span><span class="cx"> [menuItem setState:[self layerBordersVisible] ? NSOnState : NSOffState];
</span><ins>+ else if (action == @selector(toggleSimpleLineLayoutEnabled:))
+ [menuItem setState:[self simpleLineLayoutEnabled] ? NSOffState : NSOnState];
</ins><span class="cx"> else if (action == @selector(toggleSimpleLineLayoutDebugBordersEnabled:))
</span><span class="cx"> [menuItem setState:[self simpleLineLayoutDebugBordersEnabled] ? NSOnState : NSOffState];
</span><span class="cx"> else if (action == @selector(toggleIncrementalRenderingSuppressed:))
</span><span class="lines">@@ -350,6 +354,16 @@
</span><span class="cx"> return [[NSUserDefaults standardUserDefaults] boolForKey:LayerBordersVisiblePreferenceKey];
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+- (void)toggleSimpleLineLayoutEnabled:(id)sender
+{
+ [self _toggleBooleanDefault:SimpleLineLayoutEnabledPreferenceKey];
+}
+
+- (BOOL)simpleLineLayoutEnabled
+{
+ return [[NSUserDefaults standardUserDefaults] boolForKey:SimpleLineLayoutEnabledPreferenceKey];
+}
+
</ins><span class="cx"> - (void)toggleSimpleLineLayoutDebugBordersEnabled:(id)sender
</span><span class="cx"> {
</span><span class="cx"> [self _toggleBooleanDefault:SimpleLineLayoutDebugBordersEnabledPreferenceKey];
</span></span></pre></div>
<a id="trunkToolsMiniBrowsermacWK1BrowserWindowControllerm"></a>
<div class="modfile"><h4>Modified: trunk/Tools/MiniBrowser/mac/WK1BrowserWindowController.m (211134 => 211135)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/MiniBrowser/mac/WK1BrowserWindowController.m 2017-01-25 04:25:51 UTC (rev 211134)
+++ trunk/Tools/MiniBrowser/mac/WK1BrowserWindowController.m 2017-01-25 05:02:56 UTC (rev 211135)
</span><span class="lines">@@ -264,6 +264,7 @@
</span><span class="cx">
</span><span class="cx"> [[WebPreferences standardPreferences] setSubpixelCSSOMElementMetricsEnabled:settings.subPixelCSSOMMetricsEnabled];
</span><span class="cx"> [[WebPreferences standardPreferences] setShowDebugBorders:settings.layerBordersVisible];
</span><ins>+ [[WebPreferences standardPreferences] setSimpleLineLayoutEnabled:settings.simpleLineLayoutEnabled];
</ins><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></span></pre></div>
<a id="trunkToolsMiniBrowsermacWK2BrowserWindowControllerm"></a>
<div class="modfile"><h4>Modified: trunk/Tools/MiniBrowser/mac/WK2BrowserWindowController.m (211134 => 211135)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/MiniBrowser/mac/WK2BrowserWindowController.m 2017-01-25 04:25:51 UTC (rev 211134)
+++ trunk/Tools/MiniBrowser/mac/WK2BrowserWindowController.m 2017-01-25 05:02:56 UTC (rev 211135)
</span><span class="lines">@@ -370,6 +370,7 @@
</span><span class="cx"> preferences._tiledScrollingIndicatorVisible = settings.tiledScrollingIndicatorVisible;
</span><span class="cx"> preferences._compositingBordersVisible = settings.layerBordersVisible;
</span><span class="cx"> preferences._compositingRepaintCountersVisible = settings.layerBordersVisible;
</span><ins>+ preferences._simpleLineLayoutEnabled = settings.simpleLineLayoutEnabled;
</ins><span class="cx"> preferences._simpleLineLayoutDebugBordersEnabled = settings.simpleLineLayoutDebugBordersEnabled;
</span><span class="cx"> preferences._acceleratedDrawingEnabled = settings.acceleratedDrawingEnabled;
</span><span class="cx"> preferences._resourceUsageOverlayVisible = settings.resourceUsageOverlayVisible;
</span></span></pre>
</div>
</div>
</body>
</html>