<!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>[171926] trunk/Tools</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/171926">171926</a></dd>
<dt>Author</dt> <dd>timothy_horton@apple.com</dd>
<dt>Date</dt> <dd>2014-08-01 11:21:11 -0700 (Fri, 01 Aug 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Make it easer to add switches to MiniBrowser
https://bugs.webkit.org/show_bug.cgi?id=135499
Reviewed by Simon Fraser.
Add a single class to manage a set of persistent, global settings for MiniBrowser.
Add a new menu that contains items to toggle the aforementioned settings (moving them out of the Debug menu).
* MiniBrowser/MiniBrowser.xcodeproj/project.pbxproj:
Add SettingsController.{m, h}.
* MiniBrowser/mac/AppDelegate.h:
Move _browserWindowControllers to the implementation.
Get rid of toggleUseWebKit2ByDefault, because SettingsController now takes care
of that; instead, we'll receive didChangeSettings.
* MiniBrowser/mac/AppDelegate.m:
Move the default URL, default URL preference key, and use-WebKit2-by-default
preference key into SettingsController.
(-[BrowserAppDelegate awakeFromNib]):
Add the dynamically-generated SettingsController menu just to the left of the Debug menu.
(-[BrowserAppDelegate newWindow:]):
Ask SettingsController if we should use WebKit2 by default, and what the initial URL to load is.
(-[BrowserAppDelegate applicationDidFinishLaunching:]):
SettingsController now takes care of reading the default URL preference.
WK1BrowserWindowController now takes care of enabling the developer extras, via WebPreferences.
(-[BrowserAppDelegate didChangeSettings]):
When settings change, update the key equivalents for the new-window menu items, as they
might have changed (as use-WebKit2-by-default is one of the settings).
Dispatch settings change notifications to all live BrowserControllers.
(-[BrowserAppDelegate _updateNewWindowKeyEquivalents]):
(-[BrowserAppDelegate toggleUseWebKit2ByDefault:]): Deleted.
(-[BrowserAppDelegate _useWebKit2ByDefault]): Deleted.
(-[BrowserAppDelegate validateMenuItem:]): Deleted.
All menu item validation for settings is moved into SettingsController.
* MiniBrowser/mac/BrowserWindowController.h:
Simplify the BrowserWindowController interface; "toggling" settings will happen inside SettingsController,
the BrowserWindowController subclasses will be able to a) know when any setting changes, b) query the current setting state.
* MiniBrowser/mac/MainMenu.xib:
Remove the settings menu items from the "Debug" menu.
* MiniBrowser/mac/SettingsController.h: Added.
* MiniBrowser/mac/SettingsController.m: Added.
(+[SettingsController shared]):
(-[SettingsController menu]):
(-[SettingsController _addItemWithTitle:action:indented:]):
(-[SettingsController _addHeaderWithTitle:]):
NSMenuItem-creating helpers.
(-[SettingsController _populateMenu]):
Build the menu. Ideally this and the validation step would eventually be made more dynamic.
(-[SettingsController validateMenuItem:]):
Validate menu items; since they can be used to toggle the default state of a setting,
we'll always return YES. However, we will use this opportunity to set the 'checked' state
of each item.
(-[SettingsController _toggleBooleanDefault:]):
Toggle the given boolean default, and notify BrowserAppDelegate that something changed.
(-[SettingsController toggleUseWebKit2ByDefault:]):
(-[SettingsController useWebKit2ByDefault]):
(-[SettingsController toggleUseTransparentWindows:]):
(-[SettingsController useTransparentWindows]):
(-[SettingsController toggleUsePaginatedMode:]):
(-[SettingsController usePaginatedMode]):
(-[SettingsController toggleUseUISideCompositing:]):
(-[SettingsController useUISideCompositing]):
(-[SettingsController toggleShowLayerBorders:]):
(-[SettingsController layerBordersVisible]):
(-[SettingsController toggleShowTiledScrollingIndicator:]):
(-[SettingsController tiledScrollingIndicatorVisible]):
(-[SettingsController toggleEnableSubPixelCSSOMMetrics:]):
(-[SettingsController subPixelCSSOMMetricsEnabled]):
(-[SettingsController defaultURL]):
Toggle or return the current state of each preference.
* MiniBrowser/mac/WK1BrowserWindowController.m:
(-[WK1BrowserWindowController awakeFromNib]):
(-[WK1BrowserWindowController validateMenuItem:]):
(-[WK1BrowserWindowController windowWillClose:]):
(-[WK1BrowserWindowController find:]):
(-[WK1BrowserWindowController dumpSourceToConsole:]):
(-[WK1BrowserWindowController didChangeSettings]):
(-[WK1BrowserWindowController webView:didReceiveTitle:forFrame:]):
(-[WK1BrowserWindowController isPaginated]): Deleted.
(-[WK1BrowserWindowController togglePaginationMode:]): Deleted.
(-[WK1BrowserWindowController toggleTransparentWindow:]): Deleted.
(-[WK1BrowserWindowController isSubpixelCSSOMElementMetricsEnabled]): Deleted.
(-[WK1BrowserWindowController toggleSubpixelCSSOMElementMetricsEnabled:]): Deleted.
(-[WK1BrowserWindowController layerBordersVisible]): Deleted.
(-[WK1BrowserWindowController toggleLayerBordersVisibility:]): Deleted.
* MiniBrowser/mac/WK2BrowserWindowController.m:
(-[WK2BrowserWindowController awakeFromNib]):
(-[WK2BrowserWindowController validateMenuItem:]):
(-[WK2BrowserWindowController forceRepaint:]):
(-[WK2BrowserWindowController windowWillClose:]):
(-[WK2BrowserWindowController didChangeSettings]):
(-[WK2BrowserWindowController isPaginated]): Deleted.
(-[WK2BrowserWindowController togglePaginationMode:]): Deleted.
(-[WK2BrowserWindowController toggleTransparentWindow:]): Deleted.
(-[WK2BrowserWindowController isUISideCompositingEnabled]): Deleted.
(-[WK2BrowserWindowController toggleUISideCompositing:]): Deleted.
(-[WK2BrowserWindowController layerBordersVisible]): Deleted.
(-[WK2BrowserWindowController toggleLayerBordersVisibility:]): Deleted.
(-[WK2BrowserWindowController tiledScrollingIndicatorVisible]): Deleted.
(-[WK2BrowserWindowController toggleTiledScrollingIndicatorVisibility:]): Deleted.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkToolsChangeLog">trunk/Tools/ChangeLog</a></li>
<li><a href="#trunkToolsMiniBrowserMiniBrowserxcodeprojprojectpbxproj">trunk/Tools/MiniBrowser/MiniBrowser.xcodeproj/project.pbxproj</a></li>
<li><a href="#trunkToolsMiniBrowsermacAppDelegateh">trunk/Tools/MiniBrowser/mac/AppDelegate.h</a></li>
<li><a href="#trunkToolsMiniBrowsermacAppDelegatem">trunk/Tools/MiniBrowser/mac/AppDelegate.m</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>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkToolsMiniBrowsermacSettingsControllerh">trunk/Tools/MiniBrowser/mac/SettingsController.h</a></li>
<li><a href="#trunkToolsMiniBrowsermacSettingsControllerm">trunk/Tools/MiniBrowser/mac/SettingsController.m</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkToolsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Tools/ChangeLog (171925 => 171926)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/ChangeLog 2014-08-01 18:20:04 UTC (rev 171925)
+++ trunk/Tools/ChangeLog 2014-08-01 18:21:11 UTC (rev 171926)
</span><span class="lines">@@ -1,5 +1,125 @@
</span><span class="cx"> 2014-08-01 Tim Horton <timothy_horton@apple.com>
</span><span class="cx">
</span><ins>+ Make it easer to add switches to MiniBrowser
+ https://bugs.webkit.org/show_bug.cgi?id=135499
+
+ Reviewed by Simon Fraser.
+
+ Add a single class to manage a set of persistent, global settings for MiniBrowser.
+ Add a new menu that contains items to toggle the aforementioned settings (moving them out of the Debug menu).
+
+ * MiniBrowser/MiniBrowser.xcodeproj/project.pbxproj:
+ Add SettingsController.{m, h}.
+
+ * MiniBrowser/mac/AppDelegate.h:
+ Move _browserWindowControllers to the implementation.
+ Get rid of toggleUseWebKit2ByDefault, because SettingsController now takes care
+ of that; instead, we'll receive didChangeSettings.
+
+ * MiniBrowser/mac/AppDelegate.m:
+ Move the default URL, default URL preference key, and use-WebKit2-by-default
+ preference key into SettingsController.
+
+ (-[BrowserAppDelegate awakeFromNib]):
+ Add the dynamically-generated SettingsController menu just to the left of the Debug menu.
+
+ (-[BrowserAppDelegate newWindow:]):
+ Ask SettingsController if we should use WebKit2 by default, and what the initial URL to load is.
+
+ (-[BrowserAppDelegate applicationDidFinishLaunching:]):
+ SettingsController now takes care of reading the default URL preference.
+ WK1BrowserWindowController now takes care of enabling the developer extras, via WebPreferences.
+
+ (-[BrowserAppDelegate didChangeSettings]):
+ When settings change, update the key equivalents for the new-window menu items, as they
+ might have changed (as use-WebKit2-by-default is one of the settings).
+
+ Dispatch settings change notifications to all live BrowserControllers.
+
+ (-[BrowserAppDelegate _updateNewWindowKeyEquivalents]):
+ (-[BrowserAppDelegate toggleUseWebKit2ByDefault:]): Deleted.
+ (-[BrowserAppDelegate _useWebKit2ByDefault]): Deleted.
+ (-[BrowserAppDelegate validateMenuItem:]): Deleted.
+ All menu item validation for settings is moved into SettingsController.
+
+ * MiniBrowser/mac/BrowserWindowController.h:
+ Simplify the BrowserWindowController interface; "toggling" settings will happen inside SettingsController,
+ the BrowserWindowController subclasses will be able to a) know when any setting changes, b) query the current setting state.
+
+ * MiniBrowser/mac/MainMenu.xib:
+ Remove the settings menu items from the "Debug" menu.
+
+ * MiniBrowser/mac/SettingsController.h: Added.
+ * MiniBrowser/mac/SettingsController.m: Added.
+ (+[SettingsController shared]):
+ (-[SettingsController menu]):
+
+ (-[SettingsController _addItemWithTitle:action:indented:]):
+ (-[SettingsController _addHeaderWithTitle:]):
+ NSMenuItem-creating helpers.
+
+ (-[SettingsController _populateMenu]):
+ Build the menu. Ideally this and the validation step would eventually be made more dynamic.
+
+ (-[SettingsController validateMenuItem:]):
+ Validate menu items; since they can be used to toggle the default state of a setting,
+ we'll always return YES. However, we will use this opportunity to set the 'checked' state
+ of each item.
+
+
+ (-[SettingsController _toggleBooleanDefault:]):
+ Toggle the given boolean default, and notify BrowserAppDelegate that something changed.
+
+ (-[SettingsController toggleUseWebKit2ByDefault:]):
+ (-[SettingsController useWebKit2ByDefault]):
+ (-[SettingsController toggleUseTransparentWindows:]):
+ (-[SettingsController useTransparentWindows]):
+ (-[SettingsController toggleUsePaginatedMode:]):
+ (-[SettingsController usePaginatedMode]):
+ (-[SettingsController toggleUseUISideCompositing:]):
+ (-[SettingsController useUISideCompositing]):
+ (-[SettingsController toggleShowLayerBorders:]):
+ (-[SettingsController layerBordersVisible]):
+ (-[SettingsController toggleShowTiledScrollingIndicator:]):
+ (-[SettingsController tiledScrollingIndicatorVisible]):
+ (-[SettingsController toggleEnableSubPixelCSSOMMetrics:]):
+ (-[SettingsController subPixelCSSOMMetricsEnabled]):
+ (-[SettingsController defaultURL]):
+ Toggle or return the current state of each preference.
+
+ * MiniBrowser/mac/WK1BrowserWindowController.m:
+ (-[WK1BrowserWindowController awakeFromNib]):
+ (-[WK1BrowserWindowController validateMenuItem:]):
+ (-[WK1BrowserWindowController windowWillClose:]):
+ (-[WK1BrowserWindowController find:]):
+ (-[WK1BrowserWindowController dumpSourceToConsole:]):
+ (-[WK1BrowserWindowController didChangeSettings]):
+ (-[WK1BrowserWindowController webView:didReceiveTitle:forFrame:]):
+ (-[WK1BrowserWindowController isPaginated]): Deleted.
+ (-[WK1BrowserWindowController togglePaginationMode:]): Deleted.
+ (-[WK1BrowserWindowController toggleTransparentWindow:]): Deleted.
+ (-[WK1BrowserWindowController isSubpixelCSSOMElementMetricsEnabled]): Deleted.
+ (-[WK1BrowserWindowController toggleSubpixelCSSOMElementMetricsEnabled:]): Deleted.
+ (-[WK1BrowserWindowController layerBordersVisible]): Deleted.
+ (-[WK1BrowserWindowController toggleLayerBordersVisibility:]): Deleted.
+ * MiniBrowser/mac/WK2BrowserWindowController.m:
+ (-[WK2BrowserWindowController awakeFromNib]):
+ (-[WK2BrowserWindowController validateMenuItem:]):
+ (-[WK2BrowserWindowController forceRepaint:]):
+ (-[WK2BrowserWindowController windowWillClose:]):
+ (-[WK2BrowserWindowController didChangeSettings]):
+ (-[WK2BrowserWindowController isPaginated]): Deleted.
+ (-[WK2BrowserWindowController togglePaginationMode:]): Deleted.
+ (-[WK2BrowserWindowController toggleTransparentWindow:]): Deleted.
+ (-[WK2BrowserWindowController isUISideCompositingEnabled]): Deleted.
+ (-[WK2BrowserWindowController toggleUISideCompositing:]): Deleted.
+ (-[WK2BrowserWindowController layerBordersVisible]): Deleted.
+ (-[WK2BrowserWindowController toggleLayerBordersVisibility:]): Deleted.
+ (-[WK2BrowserWindowController tiledScrollingIndicatorVisible]): Deleted.
+ (-[WK2BrowserWindowController toggleTiledScrollingIndicatorVisibility:]): Deleted.
+
+2014-08-01 Tim Horton <timothy_horton@apple.com>
+
</ins><span class="cx"> MiniBrowser doesn't support data URLs
</span><span class="cx"> https://bugs.webkit.org/show_bug.cgi?id=135492
</span><span class="cx">
</span></span></pre></div>
<a id="trunkToolsMiniBrowserMiniBrowserxcodeprojprojectpbxproj"></a>
<div class="modfile"><h4>Modified: trunk/Tools/MiniBrowser/MiniBrowser.xcodeproj/project.pbxproj (171925 => 171926)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/MiniBrowser/MiniBrowser.xcodeproj/project.pbxproj 2014-08-01 18:20:04 UTC (rev 171925)
+++ trunk/Tools/MiniBrowser/MiniBrowser.xcodeproj/project.pbxproj 2014-08-01 18:21:11 UTC (rev 171926)
</span><span class="lines">@@ -14,6 +14,7 @@
</span><span class="cx"> 1AFFEF8818611C3D00DA465E /* MiniBrowserWebProcessPlugIn.m in Sources */ = {isa = PBXBuildFile; fileRef = 1AFFEF8618611C3D00DA465E /* MiniBrowserWebProcessPlugIn.m */; };
</span><span class="cx"> 1AFFEF8B18611D8A00DA465E /* MiniBrowser.wkbundle in Copy Bundle */ = {isa = PBXBuildFile; fileRef = 1AFFEF751860EE6700DA465E /* MiniBrowser.wkbundle */; };
</span><span class="cx"> 256AC3DA0F4B6AC300CF3369 /* AppDelegate.m in Sources */ = {isa = PBXBuildFile; fileRef = 256AC3D90F4B6AC300CF3369 /* AppDelegate.m */; };
</span><ins>+ 2DC37343198B62D300EC33E9 /* SettingsController.m in Sources */ = {isa = PBXBuildFile; fileRef = 2DC37342198B62D300EC33E9 /* SettingsController.m */; };
</ins><span class="cx"> 51E244FA11EFCE07008228D1 /* MBToolbarItem.m in Sources */ = {isa = PBXBuildFile; fileRef = 51E244F911EFCE07008228D1 /* MBToolbarItem.m */; };
</span><span class="cx"> 8D11072F0486CEB800E47090 /* Cocoa.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 1058C7A1FEA54F0111CA2CBB /* Cocoa.framework */; };
</span><span class="cx"> BC329487116A92E2008635D0 /* main.m in Sources */ = {isa = PBXBuildFile; fileRef = BC329486116A92E2008635D0 /* main.m */; };
</span><span class="lines">@@ -68,6 +69,8 @@
</span><span class="cx"> 256AC3F00F4B6AF500CF3369 /* MiniBrowser_Prefix.pch */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = MiniBrowser_Prefix.pch; path = mac/MiniBrowser_Prefix.pch; sourceTree = "<group>"; };
</span><span class="cx"> 29B97324FDCFA39411CA2CEA /* AppKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = AppKit.framework; path = /System/Library/Frameworks/AppKit.framework; sourceTree = "<absolute>"; };
</span><span class="cx"> 29B97325FDCFA39411CA2CEA /* Foundation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Foundation.framework; path = /System/Library/Frameworks/Foundation.framework; sourceTree = "<absolute>"; };
</span><ins>+ 2DC37341198B62D300EC33E9 /* SettingsController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = SettingsController.h; path = mac/SettingsController.h; sourceTree = "<group>"; };
+ 2DC37342198B62D300EC33E9 /* SettingsController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = SettingsController.m; path = mac/SettingsController.m; sourceTree = "<group>"; };
</ins><span class="cx"> 51E244F811EFCE07008228D1 /* MBToolbarItem.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MBToolbarItem.h; sourceTree = "<group>"; };
</span><span class="cx"> 51E244F911EFCE07008228D1 /* MBToolbarItem.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = MBToolbarItem.m; sourceTree = "<group>"; };
</span><span class="cx"> 8D1107320486CEB800E47090 /* MiniBrowser.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = MiniBrowser.app; sourceTree = BUILT_PRODUCTS_DIR; };
</span><span class="lines">@@ -119,6 +122,8 @@
</span><span class="cx"> 0FE643A3161FAC660059E3FF /* WK1BrowserWindowController.m */,
</span><span class="cx"> BC329496116A941B008635D0 /* WK2BrowserWindowController.h */,
</span><span class="cx"> BC329497116A941B008635D0 /* WK2BrowserWindowController.m */,
</span><ins>+ 2DC37341198B62D300EC33E9 /* SettingsController.h */,
+ 2DC37342198B62D300EC33E9 /* SettingsController.m */,
</ins><span class="cx"> );
</span><span class="cx"> name = MiniBrowser;
</span><span class="cx"> sourceTree = "<group>";
</span><span class="lines">@@ -309,6 +314,7 @@
</span><span class="cx"> files = (
</span><span class="cx"> 256AC3DA0F4B6AC300CF3369 /* AppDelegate.m in Sources */,
</span><span class="cx"> 0FE643A1161FA8940059E3FF /* BrowserWindowController.m in Sources */,
</span><ins>+ 2DC37343198B62D300EC33E9 /* SettingsController.m in Sources */,
</ins><span class="cx"> BC329487116A92E2008635D0 /* main.m in Sources */,
</span><span class="cx"> 51E244FA11EFCE07008228D1 /* MBToolbarItem.m in Sources */,
</span><span class="cx"> 0FE643A4161FAC660059E3FF /* WK1BrowserWindowController.m in Sources */,
</span></span></pre></div>
<a id="trunkToolsMiniBrowsermacAppDelegateh"></a>
<div class="modfile"><h4>Modified: trunk/Tools/MiniBrowser/mac/AppDelegate.h (171925 => 171926)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/MiniBrowser/mac/AppDelegate.h 2014-08-01 18:20:04 UTC (rev 171925)
+++ trunk/Tools/MiniBrowser/mac/AppDelegate.h 2014-08-01 18:21:11 UTC (rev 171926)
</span><span class="lines">@@ -24,14 +24,12 @@
</span><span class="cx"> */
</span><span class="cx">
</span><span class="cx"> @interface BrowserAppDelegate : NSObject <NSApplicationDelegate> {
</span><del>- NSMutableSet *_browserWindowControllers;
-
</del><span class="cx"> IBOutlet NSMenuItem *_newWebKit1WindowItem;
</span><span class="cx"> IBOutlet NSMenuItem *_newWebKit2WindowItem;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> - (void)browserWindowWillClose:(NSWindow *)window;
</span><span class="cx">
</span><del>-- (IBAction)toggleUseWebKit2ByDefault:(id)sender;
</del><ins>+- (void)didChangeSettings;
</ins><span class="cx">
</span><span class="cx"> @end
</span></span></pre></div>
<a id="trunkToolsMiniBrowsermacAppDelegatem"></a>
<div class="modfile"><h4>Modified: trunk/Tools/MiniBrowser/mac/AppDelegate.m (171925 => 171926)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/MiniBrowser/mac/AppDelegate.m 2014-08-01 18:20:04 UTC (rev 171925)
+++ trunk/Tools/MiniBrowser/mac/AppDelegate.m 2014-08-01 18:21:11 UTC (rev 171926)
</span><span class="lines">@@ -25,21 +25,20 @@
</span><span class="cx">
</span><span class="cx"> #import "AppDelegate.h"
</span><span class="cx">
</span><ins>+#import "SettingsController.h"
</ins><span class="cx"> #import "WK1BrowserWindowController.h"
</span><span class="cx"> #import "WK2BrowserWindowController.h"
</span><span class="cx"> #import <WebKit/WebHistory.h>
</span><span class="cx"> #import <WebKit/WebKit2.h>
</span><span class="cx">
</span><del>-static NSString *defaultURL = @"http://www.webkit.org/";
-static NSString *useWebKit2ByDefaultPreferenceKey = @"UseWebKit2ByDefault";
-static NSString *defaultURLPreferenceKey = @"DefaultURL";
-
</del><span class="cx"> enum {
</span><span class="cx"> WebKit1NewWindowTag = 1,
</span><span class="cx"> WebKit2NewWindowTag = 2
</span><span class="cx"> };
</span><span class="cx">
</span><del>-@implementation BrowserAppDelegate
</del><ins>+@implementation BrowserAppDelegate {
+ NSMutableSet *_browserWindowControllers;
+}
</ins><span class="cx">
</span><span class="cx"> - (id)init
</span><span class="cx"> {
</span><span class="lines">@@ -51,6 +50,13 @@
</span><span class="cx"> return self;
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+- (void)awakeFromNib
+{
+ NSMenuItem *item = [[NSMenuItem alloc] init];
+ [item setSubmenu:[[SettingsController shared] menu]];
+ [[NSApp mainMenu] insertItem:[item autorelease] atIndex:[[NSApp mainMenu] indexOfItemWithTitle:@"Debug"]];
+}
+
</ins><span class="cx"> - (IBAction)newWindow:(id)sender
</span><span class="cx"> {
</span><span class="cx"> BrowserWindowController *controller = nil;
</span><span class="lines">@@ -58,7 +64,7 @@
</span><span class="cx"> BOOL useWebKit2 = NO;
</span><span class="cx">
</span><span class="cx"> if (![sender respondsToSelector:@selector(tag)])
</span><del>- useWebKit2 = [self _useWebKit2ByDefault];
</del><ins>+ useWebKit2 = [SettingsController shared].useWebKit2ByDefault;
</ins><span class="cx"> else
</span><span class="cx"> useWebKit2 = [sender tag] == WebKit2NewWindowTag;
</span><span class="cx">
</span><span class="lines">@@ -74,7 +80,7 @@
</span><span class="cx"> [[controller window] makeKeyAndOrderFront:sender];
</span><span class="cx"> [_browserWindowControllers addObject:controller];
</span><span class="cx">
</span><del>- [controller loadURLString:defaultURL];
</del><ins>+ [controller loadURLString:[SettingsController shared].defaultURL];
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> - (void)browserWindowWillClose:(NSWindow *)window
</span><span class="lines">@@ -89,11 +95,6 @@
</span><span class="cx"> [webHistory release];
</span><span class="cx">
</span><span class="cx"> [self _updateNewWindowKeyEquivalents];
</span><del>-
- [[NSUserDefaults standardUserDefaults] setBool:@YES forKey:@"WebKitDeveloperExtrasEnabled"];
- NSString *newDefaultURL = [[NSUserDefaults standardUserDefaults] stringForKey:defaultURLPreferenceKey];
- if (newDefaultURL)
- defaultURL = [newDefaultURL retain];
</del><span class="cx">
</span><span class="cx"> [self newWindow:self];
</span><span class="cx"> }
</span><span class="lines">@@ -149,24 +150,18 @@
</span><span class="cx"> }];
</span><span class="cx"> }
</span><span class="cx">
</span><del>-- (IBAction)toggleUseWebKit2ByDefault:(id)sender
</del><ins>+- (void)didChangeSettings
</ins><span class="cx"> {
</span><del>- BOOL newUseWebKit2ByDefault = ![self _useWebKit2ByDefault];
- if (!newUseWebKit2ByDefault)
- [[NSUserDefaults standardUserDefaults] removeObjectForKey:useWebKit2ByDefaultPreferenceKey];
- else
- [[NSUserDefaults standardUserDefaults] setBool:newUseWebKit2ByDefault forKey:useWebKit2ByDefaultPreferenceKey];
</del><span class="cx"> [self _updateNewWindowKeyEquivalents];
</span><del>-}
</del><span class="cx">
</span><del>-- (BOOL)_useWebKit2ByDefault
-{
- return [[NSUserDefaults standardUserDefaults] boolForKey:useWebKit2ByDefaultPreferenceKey];
</del><ins>+ // Let all of the BrowserWindowControllers know that a setting changed, so they can attempt to dynamically update.
+ for (BrowserWindowController<BrowserController> *browserWindowController in _browserWindowControllers)
+ [browserWindowController didChangeSettings];
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> - (void)_updateNewWindowKeyEquivalents
</span><span class="cx"> {
</span><del>- if ([self _useWebKit2ByDefault]) {
</del><ins>+ if ([[SettingsController shared] useWebKit2ByDefault]) {
</ins><span class="cx"> [_newWebKit1WindowItem setKeyEquivalentModifierMask:NSCommandKeyMask | NSAlternateKeyMask];
</span><span class="cx"> [_newWebKit2WindowItem setKeyEquivalentModifierMask:NSCommandKeyMask];
</span><span class="cx"> } else {
</span><span class="lines">@@ -175,12 +170,4 @@
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><del>-- (BOOL)validateMenuItem:(NSMenuItem *)menuItem
-{
- if ([menuItem action] == @selector(toggleUseWebKit2ByDefault:))
- [menuItem setState:[self _useWebKit2ByDefault] ? NSOnState : NSOffState];
-
- return YES;
-}
-
</del><span class="cx"> @end
</span></span></pre></div>
<a id="trunkToolsMiniBrowsermacBrowserWindowControllerh"></a>
<div class="modfile"><h4>Modified: trunk/Tools/MiniBrowser/mac/BrowserWindowController.h (171925 => 171926)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/MiniBrowser/mac/BrowserWindowController.h 2014-08-01 18:20:04 UTC (rev 171925)
+++ trunk/Tools/MiniBrowser/mac/BrowserWindowController.h 2014-08-01 18:21:11 UTC (rev 171926)
</span><span class="lines">@@ -44,17 +44,11 @@
</span><span class="cx"> - (BOOL)canResetZoom;
</span><span class="cx">
</span><span class="cx"> - (IBAction)toggleZoomMode:(id)sender;
</span><del>-- (IBAction)togglePaginationMode:(id)sender;
-- (IBAction)toggleTransparentWindow:(id)sender;
-- (IBAction)toggleLayerBordersVisibility:(id)sender;
</del><span class="cx">
</span><span class="cx"> - (IBAction)dumpSourceToConsole:(id)sender;
</span><span class="cx"> - (IBAction)find:(id)sender;
</span><span class="cx">
</span><del>-@optional
-- (IBAction)toggleSubpixelCSSOMElementMetricsEnabled:(id)sender;
-- (IBAction)toggleUISideCompositing:(id)sender;
-- (IBAction)toggleTiledScrollingIndicatorVisibility:(id)sender;
</del><ins>+- (void)didChangeSettings;
</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 (171925 => 171926)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/MiniBrowser/mac/MainMenu.xib 2014-08-01 18:20:04 UTC (rev 171925)
+++ trunk/Tools/MiniBrowser/mac/MainMenu.xib 2014-08-01 18:21:11 UTC (rev 171926)
</span><span class="lines">@@ -1,5 +1,5 @@
</span><span class="cx"> <?xml version="1.0" encoding="UTF-8" standalone="no"?>
</span><del>-<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="5056" systemVersion="13D65" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none">
</del><ins>+<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="5056" systemVersion="13E28" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none">
</ins><span class="cx"> <dependencies>
</span><span class="cx"> <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="5056"/>
</span><span class="cx"> </dependencies>
</span><span class="lines">@@ -425,13 +425,6 @@
</span><span class="cx"> <modifierMask key="keyEquivalentModifierMask"/>
</span><span class="cx"> <menu key="submenu" title="Debug" id="535">
</span><span class="cx"> <items>
</span><del>- <menuItem title="Use WebKit2 By Default" id="GmH-08-ZX9">
- <modifierMask key="keyEquivalentModifierMask"/>
- <connections>
- <action selector="toggleUseWebKit2ByDefault:" target="494" id="xgA-9P-zY6"/>
- </connections>
- </menuItem>
- <menuItem isSeparatorItem="YES" id="kgf-Bs-8S1"/>
</del><span class="cx"> <menuItem title="Force Repaint" keyEquivalent="r" id="545">
</span><span class="cx"> <modifierMask key="keyEquivalentModifierMask" option="YES" command="YES"/>
</span><span class="cx"> <connections>
</span><span class="lines">@@ -451,43 +444,6 @@
</span><span class="cx"> </connections>
</span><span class="cx"> </menuItem>
</span><span class="cx"> <menuItem isSeparatorItem="YES" id="553"/>
</span><del>- <menuItem title="Paginated Mode" id="569">
- <modifierMask key="keyEquivalentModifierMask"/>
- <connections>
- <action selector="togglePaginationMode:" target="-1" id="570"/>
- </connections>
- </menuItem>
- <menuItem title="Transparent Window" id="576">
- <modifierMask key="keyEquivalentModifierMask"/>
- <connections>
- <action selector="toggleTransparentWindow:" target="-1" id="578"/>
- </connections>
- </menuItem>
- <menuItem title="UI-Side Compositing" id="BDx-He-jOK">
- <modifierMask key="keyEquivalentModifierMask"/>
- <connections>
- <action selector="toggleUISideCompositing:" target="-1" id="1Ed-C5-0po"/>
- </connections>
- </menuItem>
- <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>
- <menuItem title="Enable Sub-Pixel offsetWidth etc." state="on" id="8X5-i6-t2d">
- <modifierMask key="keyEquivalentModifierMask"/>
- <connections>
- <action selector="toggleSubpixelCSSOMElementMetricsEnabled:" target="-1" id="Lbe-UQ-A9U"/>
- </connections>
- </menuItem>
- <menuItem isSeparatorItem="YES" id="568"/>
</del><span class="cx"> <menuItem title="Dump Source To Console" id="566">
</span><span class="cx"> <modifierMask key="keyEquivalentModifierMask"/>
</span><span class="cx"> <connections>
</span></span></pre></div>
<a id="trunkToolsMiniBrowsermacSettingsControllerh"></a>
<div class="addfile"><h4>Added: trunk/Tools/MiniBrowser/mac/SettingsController.h (0 => 171926)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/MiniBrowser/mac/SettingsController.h (rev 0)
+++ trunk/Tools/MiniBrowser/mac/SettingsController.h 2014-08-01 18:21:11 UTC (rev 171926)
</span><span class="lines">@@ -0,0 +1,43 @@
</span><ins>+/*
+ * Copyright (C) 2014 Apple Inc. All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY APPLE INC. AND ITS CONTRIBUTORS ``AS IS''
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
+ * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR ITS CONTRIBUTORS
+ * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
+ * THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#import <Cocoa/Cocoa.h>
+
+@interface SettingsController : NSObject
+
++ (instancetype)shared;
+
+@property (nonatomic, readonly) NSMenu *menu;
+
+@property (nonatomic, readonly) BOOL useWebKit2ByDefault;
+@property (nonatomic, readonly) BOOL useTransparentWindows;
+@property (nonatomic, readonly) BOOL usePaginatedMode;
+@property (nonatomic, readonly) BOOL layerBordersVisible;
+@property (nonatomic, readonly) BOOL tiledScrollingIndicatorVisible;
+@property (nonatomic, readonly) BOOL useUISideCompositing;
+@property (nonatomic, readonly) BOOL subPixelCSSOMMetricsEnabled;
+@property (nonatomic, readonly) NSString *defaultURL;
+
+@end
</ins></span></pre></div>
<a id="trunkToolsMiniBrowsermacSettingsControllerm"></a>
<div class="addfile"><h4>Added: trunk/Tools/MiniBrowser/mac/SettingsController.m (0 => 171926)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/MiniBrowser/mac/SettingsController.m (rev 0)
+++ trunk/Tools/MiniBrowser/mac/SettingsController.m 2014-08-01 18:21:11 UTC (rev 171926)
</span><span class="lines">@@ -0,0 +1,212 @@
</span><ins>+/*
+ * Copyright (C) 2014 Apple Inc. All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY APPLE INC. AND ITS CONTRIBUTORS ``AS IS''
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
+ * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR ITS CONTRIBUTORS
+ * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
+ * THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#import "SettingsController.h"
+
+#import "AppDelegate.h"
+#import "BrowserWindowController.h"
+
+static NSString * const defaultURL = @"http://www.webkit.org/";
+static NSString * const DefaultURLPreferenceKey = @"DefaultURL";
+
+static NSString * const UseWebKit2ByDefaultPreferenceKey = @"UseWebKit2ByDefault";
+static NSString * const LayerBordersVisiblePreferenceKey = @"LayerBordersVisible";
+static NSString * const TiledScrollingIndicatorVisiblePreferenceKey = @"TiledScrollingIndicatorVisible";
+
+static NSString * const UseTransparentWindowsPreferenceKey = @"UseTransparentWindows";
+static NSString * const UsePaginatedModePreferenceKey = @"UsePaginatedMode";
+static NSString * const EnableSubPixelCSSOMMetricsPreferenceKey = @"EnableSubPixelCSSOMMetrics";
+
+// This default name intentionally overlaps with the key that WebKit2 checks when creating a view.
+static NSString * const UseRemoteLayerTreeDrawingAreaPreferenceKey = @"WebKit2UseRemoteLayerTreeDrawingArea";
+
+@implementation SettingsController
+
+@synthesize menu=_menu;
+
++ (instancetype)shared
+{
+ static SettingsController *sharedSettingsController;
+ static dispatch_once_t onceToken;
+ dispatch_once(&onceToken, ^{
+ sharedSettingsController = [[super alloc] init];
+ });
+
+ return sharedSettingsController;
+}
+
+- (NSMenu *)menu
+{
+ if (!_menu)
+ [self _populateMenu];
+
+ return _menu;
+}
+
+- (void)_addItemWithTitle:(NSString *)title action:(SEL)action indented:(BOOL)indented
+{
+ NSMenuItem *item = [[NSMenuItem alloc] initWithTitle:title action:action keyEquivalent:@""];
+ [item setTarget:self];
+ if (indented)
+ [item setIndentationLevel:1];
+ [_menu addItem:item];
+ [item release];
+}
+
+- (void)_addHeaderWithTitle:(NSString *)title
+{
+ [_menu addItem:[NSMenuItem separatorItem]];
+ [_menu addItem:[[[NSMenuItem alloc] initWithTitle:title action:nil keyEquivalent:@""] autorelease]];
+}
+
+- (void)_populateMenu
+{
+ _menu = [[NSMenu alloc] initWithTitle:@"Settings"];
+
+ [self _addItemWithTitle:@"Use WebKit2 By Default" action:@selector(toggleUseWebKit2ByDefault:) indented:NO];
+
+ [_menu addItem:[NSMenuItem separatorItem]];
+
+ [self _addItemWithTitle:@"Use Transparent Windows" action:@selector(toggleUseTransparentWindows:) indented:NO];
+ [self _addItemWithTitle:@"Use Paginated Mode" action:@selector(toggleUsePaginatedMode:) indented:NO];
+ [self _addItemWithTitle:@"Show Layer Borders" action:@selector(toggleShowLayerBorders:) indented:NO];
+
+ [self _addHeaderWithTitle:@"WebKit2-only Settings"];
+ [self _addItemWithTitle:@"Show Tiled Scrolling Indicator" action:@selector(toggleShowTiledScrollingIndicator:) indented:YES];
+ [self _addItemWithTitle:@"Use UI-Side Compositing" action:@selector(toggleUseUISideCompositing:) indented:YES];
+
+ [self _addHeaderWithTitle:@"WebKit1-only Settings"];
+ [self _addItemWithTitle:@"Enable Subpixel CSSOM Metrics" action:@selector(toggleEnableSubPixelCSSOMMetrics:) indented:YES];
+}
+
+- (BOOL)validateMenuItem:(NSMenuItem *)menuItem
+{
+ SEL action = [menuItem action];
+
+ if (action == @selector(toggleUseWebKit2ByDefault:))
+ [menuItem setState:[self useWebKit2ByDefault] ? NSOnState : NSOffState];
+ else if (action == @selector(toggleUseTransparentWindows:))
+ [menuItem setState:[self useTransparentWindows] ? NSOnState : NSOffState];
+ else if (action == @selector(toggleUsePaginatedMode:))
+ [menuItem setState:[self usePaginatedMode] ? NSOnState : NSOffState];
+ else if (action == @selector(toggleShowLayerBorders:))
+ [menuItem setState:[self layerBordersVisible] ? NSOnState : NSOffState];
+ else if (action == @selector(toggleShowTiledScrollingIndicator:))
+ [menuItem setState:[self tiledScrollingIndicatorVisible] ? NSOnState : NSOffState];
+ else if (action == @selector(toggleUseUISideCompositing:))
+ [menuItem setState:[self useUISideCompositing] ? NSOnState : NSOffState];
+ else if (action == @selector(toggleEnableSubPixelCSSOMMetrics:))
+ [menuItem setState:[self subPixelCSSOMMetricsEnabled] ? NSOnState : NSOffState];
+
+ return YES;
+}
+
+- (void)_toggleBooleanDefault:(NSString *)defaultName
+{
+ NSUserDefaults *defaults = [NSUserDefaults standardUserDefaults];
+ [defaults setBool:![defaults boolForKey:defaultName] forKey:defaultName];
+
+ [(BrowserAppDelegate *)[NSApp delegate] didChangeSettings];
+}
+
+- (void)toggleUseWebKit2ByDefault:(id)sender
+{
+ [self _toggleBooleanDefault:UseWebKit2ByDefaultPreferenceKey];
+}
+
+- (BOOL)useWebKit2ByDefault
+{
+ return [[NSUserDefaults standardUserDefaults] boolForKey:UseWebKit2ByDefaultPreferenceKey];
+}
+
+- (void)toggleUseTransparentWindows:(id)sender
+{
+ [self _toggleBooleanDefault:UseTransparentWindowsPreferenceKey];
+}
+
+- (BOOL)useTransparentWindows
+{
+ return [[NSUserDefaults standardUserDefaults] boolForKey:UseTransparentWindowsPreferenceKey];
+}
+
+- (void)toggleUsePaginatedMode:(id)sender
+{
+ [self _toggleBooleanDefault:UsePaginatedModePreferenceKey];
+}
+
+- (BOOL)usePaginatedMode
+{
+ return [[NSUserDefaults standardUserDefaults] boolForKey:UsePaginatedModePreferenceKey];
+}
+
+- (void)toggleUseUISideCompositing:(id)sender
+{
+ [self _toggleBooleanDefault:UseRemoteLayerTreeDrawingAreaPreferenceKey];
+}
+
+- (BOOL)useUISideCompositing
+{
+ return [[NSUserDefaults standardUserDefaults] boolForKey:UseRemoteLayerTreeDrawingAreaPreferenceKey];
+}
+
+- (void)toggleShowLayerBorders:(id)sender
+{
+ [self _toggleBooleanDefault:LayerBordersVisiblePreferenceKey];
+}
+
+- (BOOL)layerBordersVisible
+{
+ return [[NSUserDefaults standardUserDefaults] boolForKey:LayerBordersVisiblePreferenceKey];
+}
+
+- (void)toggleShowTiledScrollingIndicator:(id)sender
+{
+ [self _toggleBooleanDefault:TiledScrollingIndicatorVisiblePreferenceKey];
+}
+
+- (BOOL)tiledScrollingIndicatorVisible
+{
+ return [[NSUserDefaults standardUserDefaults] boolForKey:TiledScrollingIndicatorVisiblePreferenceKey];
+}
+
+- (void)toggleEnableSubPixelCSSOMMetrics:(id)sender
+{
+ [self _toggleBooleanDefault:EnableSubPixelCSSOMMetricsPreferenceKey];
+}
+
+- (BOOL)subPixelCSSOMMetricsEnabled
+{
+ return [[NSUserDefaults standardUserDefaults] boolForKey:EnableSubPixelCSSOMMetricsPreferenceKey];
+}
+
+- (NSString *)defaultURL
+{
+ NSString *customDefaultURL = [[NSUserDefaults standardUserDefaults] stringForKey:DefaultURLPreferenceKey];
+ if (customDefaultURL)
+ return customDefaultURL;
+ return defaultURL;
+}
+
+@end
</ins></span></pre></div>
<a id="trunkToolsMiniBrowsermacWK1BrowserWindowControllerm"></a>
<div class="modfile"><h4>Modified: trunk/Tools/MiniBrowser/mac/WK1BrowserWindowController.m (171925 => 171926)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/MiniBrowser/mac/WK1BrowserWindowController.m 2014-08-01 18:20:04 UTC (rev 171925)
+++ trunk/Tools/MiniBrowser/mac/WK1BrowserWindowController.m 2014-08-01 18:21:11 UTC (rev 171926)
</span><span class="lines">@@ -25,12 +25,13 @@
</span><span class="cx">
</span><span class="cx"> #import "WK1BrowserWindowController.h"
</span><span class="cx">
</span><del>-#import <WebKit/WebKit.h>
-#import <WebKit/WebViewPrivate.h>
</del><span class="cx"> #import "AppDelegate.h"
</span><ins>+#import "SettingsController.h"
+#import <WebKit/WebKit.h>
</ins><span class="cx"> #import <WebKit/WebPreferences.h>
</span><span class="cx"> #import <WebKit/WebPreferencesPrivate.h>
</span><span class="cx"> #import <WebKit/WebPreferenceKeysPrivate.h>
</span><ins>+#import <WebKit/WebViewPrivate.h>
</ins><span class="cx">
</span><span class="cx"> @interface WK1BrowserWindowController ()
</span><span class="cx"> @end
</span><span class="lines">@@ -42,12 +43,13 @@
</span><span class="cx"> _webView = [[WebView alloc] initWithFrame:[containerView bounds] frameName:nil groupName:@"MiniBrowser"];
</span><span class="cx"> [_webView setAutoresizingMask:(NSViewWidthSizable | NSViewHeightSizable)];
</span><span class="cx">
</span><del>- // Set the WebView delegates
</del><span class="cx"> [_webView setFrameLoadDelegate:self];
</span><span class="cx"> [_webView setUIDelegate:self];
</span><span class="cx"> [_webView setResourceLoadDelegate:self];
</span><span class="cx"> [_webView setPolicyDelegate:self];
</span><ins>+
</ins><span class="cx"> [[WebPreferences standardPreferences] setFullScreenEnabled:YES];
</span><ins>+ [[WebPreferences standardPreferences] setDeveloperExtrasEnabled:YES];
</ins><span class="cx">
</span><span class="cx"> [containerView addSubview:_webView];
</span><span class="cx"> }
</span><span class="lines">@@ -131,14 +133,6 @@
</span><span class="cx"> [menuItem setTitle:[_webView window] ? @"Remove Web View" : @"Insert Web View"];
</span><span class="cx"> else if (action == @selector(toggleZoomMode:))
</span><span class="cx"> [menuItem setState:_zoomTextOnly ? NSOnState : NSOffState];
</span><del>- else if (action == @selector(togglePaginationMode:))
- [menuItem setState:[self isPaginated] ? NSOnState : NSOffState];
- else if (action == @selector(toggleTransparentWindow:))
- [menuItem setState:[[self window] isOpaque] ? NSOffState : NSOnState];
- else if (action == @selector(toggleSubpixelCSSOMElementMetricsEnabled:))
- [menuItem setState:[self isSubpixelCSSOMElementMetricsEnabled] ? NSOnState : NSOffState];
- else if (action == @selector(toggleLayerBordersVisibility:))
- [menuItem setState:[self layerBordersVisible] ? NSOnState : NSOffState];
</del><span class="cx">
</span><span class="cx"> return YES;
</span><span class="cx"> }
</span><span class="lines">@@ -168,7 +162,7 @@
</span><span class="cx">
</span><span class="cx"> - (void)windowWillClose:(NSNotification *)notification
</span><span class="cx"> {
</span><del>- [(BrowserAppDelegate *)[NSApp delegate] browserWindowWillClose:[self window]];
</del><ins>+ [(BrowserAppDelegate *)[NSApp delegate] browserWindowWillClose:self.window];
</ins><span class="cx"> [self autorelease];
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -226,68 +220,43 @@
</span><span class="cx"> _zoomTextOnly = !_zoomTextOnly;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-- (BOOL)isPaginated
</del><ins>+- (IBAction)find:(id)sender
</ins><span class="cx"> {
</span><del>- return [_webView _paginationMode] != WebPaginationModeUnpaginated;
</del><span class="cx"> }
</span><span class="cx">
</span><del>-- (IBAction)togglePaginationMode:(id)sender
</del><ins>+- (IBAction)dumpSourceToConsole:(id)sender
</ins><span class="cx"> {
</span><del>- if ([self isPaginated]) {
- [_webView _setPaginationMode:WebPaginationModeUnpaginated];
- } else {
- [_webView _setPaginationMode:WebPaginationModeRightToLeft];
- [_webView _setPageLength:_webView.bounds.size.width / 2];
- [_webView _setGapBetweenPages:10];
- }
</del><span class="cx"> }
</span><span class="cx">
</span><del>-- (IBAction)toggleTransparentWindow:(id)sender
</del><ins>+- (void)didChangeSettings
</ins><span class="cx"> {
</span><del>- BOOL isTransparent = ![[self window] isOpaque];
- isTransparent = !isTransparent;
-
- [[self window] setOpaque:!isTransparent];
- [[self window] setHasShadow:!isTransparent];
</del><ins>+ SettingsController *settings = [SettingsController shared];
</ins><span class="cx">
</span><del>- if (isTransparent)
- [_webView setBackgroundColor:[NSColor clearColor]];
- else
- [_webView setBackgroundColor:[NSColor whiteColor]];
</del><ins>+ [[WebPreferences standardPreferences] setSubpixelCSSOMElementMetricsEnabled:settings.subPixelCSSOMMetricsEnabled];
+ [[WebPreferences standardPreferences] setShowDebugBorders:settings.layerBordersVisible];
+ [[WebPreferences standardPreferences] setShowRepaintCounter:settings.layerBordersVisible];
</ins><span class="cx">
</span><del>- [[self window] display];
-}
</del><ins>+ BOOL useTransparentWindows = settings.useTransparentWindows;
+ if (useTransparentWindows != !self.window.isOpaque) {
+ [self.window setOpaque:!useTransparentWindows];
+ [self.window setHasShadow:!useTransparentWindows];
</ins><span class="cx">
</span><del>-- (BOOL)isSubpixelCSSOMElementMetricsEnabled
-{
- return [[WebPreferences standardPreferences] subpixelCSSOMElementMetricsEnabled];
-}
</del><ins>+ [_webView setBackgroundColor:useTransparentWindows ? [NSColor clearColor] : [NSColor whiteColor]];
</ins><span class="cx">
</span><del>-- (IBAction)toggleSubpixelCSSOMElementMetricsEnabled:(id)sender
-{
- [[WebPreferences standardPreferences] setSubpixelCSSOMElementMetricsEnabled:![self isSubpixelCSSOMElementMetricsEnabled]];
-}
</del><ins>+ [self.window display];
+ }
</ins><span class="cx">
</span><del>-- (BOOL)layerBordersVisible
-{
- return [[WebPreferences standardPreferences] showDebugBorders];
</del><ins>+ BOOL usePaginatedMode = settings.usePaginatedMode;
+ if (usePaginatedMode != (_webView._paginationMode != WebPaginationModeUnpaginated)) {
+ if (usePaginatedMode) {
+ [_webView _setPaginationMode:WebPaginationModeLeftToRight];
+ [_webView _setPageLength:_webView.bounds.size.width / 2];
+ [_webView _setGapBetweenPages:10];
+ } else
+ [_webView _setPaginationMode:WebPaginationModeUnpaginated];
+ }
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-- (IBAction)toggleLayerBordersVisibility:(id)sender
-{
- BOOL newValue = ![self layerBordersVisible];
- [[WebPreferences standardPreferences] setShowDebugBorders:newValue];
- [[WebPreferences standardPreferences] setShowRepaintCounter:newValue];
-}
-
-- (IBAction)find:(id)sender
-{
-}
-
-- (IBAction)dumpSourceToConsole:(id)sender
-{
-}
-
</del><span class="cx"> - (void)webView:(WebView *)webView decidePolicyForNavigationAction:(NSDictionary *)actionInformation request:(NSURLRequest *)request frame:(WebFrame *)frame decisionListener:(id<WebPolicyDecisionListener>)listener
</span><span class="cx"> {
</span><span class="cx"> [listener use];
</span><span class="lines">@@ -312,7 +281,7 @@
</span><span class="cx"> if (frame != [sender mainFrame])
</span><span class="cx"> return;
</span><span class="cx">
</span><del>- [[self window] setTitle:[title stringByAppendingString:@" [WK1]"]];
</del><ins>+ [self.window setTitle:[title stringByAppendingString:@" [WK1]"]];
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> - (void)webView:(WebView *)sender runJavaScriptAlertPanelWithMessage:(NSString *)message initiatedByFrame:(WebFrame *)frame
</span></span></pre></div>
<a id="trunkToolsMiniBrowsermacWK2BrowserWindowControllerm"></a>
<div class="modfile"><h4>Modified: trunk/Tools/MiniBrowser/mac/WK2BrowserWindowController.m (171925 => 171926)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/MiniBrowser/mac/WK2BrowserWindowController.m 2014-08-01 18:20:04 UTC (rev 171925)
+++ trunk/Tools/MiniBrowser/mac/WK2BrowserWindowController.m 2014-08-01 18:21:11 UTC (rev 171926)
</span><span class="lines">@@ -28,6 +28,7 @@
</span><span class="cx"> #if WK_API_ENABLED
</span><span class="cx">
</span><span class="cx"> #import "AppDelegate.h"
</span><ins>+#import "SettingsController.h"
</ins><span class="cx"> #import <WebKit/WKFrameInfo.h>
</span><span class="cx"> #import <WebKit/WKNavigationDelegate.h>
</span><span class="cx"> #import <WebKit/WKPreferencesPrivate.h>
</span><span class="lines">@@ -37,11 +38,7 @@
</span><span class="cx"> #import <WebKit/WKWebViewPrivate.h>
</span><span class="cx">
</span><span class="cx"> static void* keyValueObservingContext = &keyValueObservingContext;
</span><del>-static NSString * const WebKit2UseRemoteLayerTreeDrawingAreaKey = @"WebKit2UseRemoteLayerTreeDrawingArea";
</del><span class="cx">
</span><del>-static NSString * const LayerBordersVisiblePreferenceKey = @"LayerBordersVisible";
-static NSString * const TiledScrollingIndicatorVisiblePreferenceKey = @"TiledScrollingIndicatorVisibleKey";
-
</del><span class="cx"> @interface WK2BrowserWindowController () <WKNavigationDelegate, WKUIDelegate>
</span><span class="cx"> @end
</span><span class="cx">
</span><span class="lines">@@ -55,13 +52,10 @@
</span><span class="cx"> static WKWebViewConfiguration *configuration;
</span><span class="cx"> if (!configuration) {
</span><span class="cx"> configuration = [[WKWebViewConfiguration alloc] init];
</span><del>-
- configuration.preferences._tiledScrollingIndicatorVisible = [self tiledScrollingIndicatorVisible];
- configuration.preferences._compositingBordersVisible = [self layerBordersVisible];
- configuration.preferences._compositingRepaintCountersVisible = [self layerBordersVisible];
</del><span class="cx"> configuration.preferences._fullScreenEnabled = YES;
</span><span class="cx"> }
</span><span class="cx"> _webView = [[WKWebView alloc] initWithFrame:[containerView bounds] configuration:configuration];
</span><ins>+ [self didChangeSettings];
</ins><span class="cx">
</span><span class="cx"> _webView.allowsMagnification = YES;
</span><span class="cx"> _webView.allowsBackForwardNavigationGestures = YES;
</span><span class="lines">@@ -132,7 +126,8 @@
</span><span class="cx">
</span><span class="cx"> // Disabled until missing WK2 functionality is exposed via API/SPI.
</span><span class="cx"> if (action == @selector(dumpSourceToConsole:)
</span><del>- || action == @selector(find:))
</del><ins>+ || action == @selector(find:)
+ || action == @selector(forceRepaint:))
</ins><span class="cx"> return NO;
</span><span class="cx">
</span><span class="cx"> if (action == @selector(showHideWebView:))
</span><span class="lines">@@ -141,16 +136,6 @@
</span><span class="cx"> [menuItem setTitle:[_webView window] ? @"Remove Web View" : @"Insert Web View"];
</span><span class="cx"> else if (action == @selector(toggleZoomMode:))
</span><span class="cx"> [menuItem setState:_zoomTextOnly ? NSOnState : NSOffState];
</span><del>- else if (action == @selector(togglePaginationMode:))
- [menuItem setState:[self isPaginated] ? NSOnState : NSOffState];
- else if (action == @selector(toggleTransparentWindow:))
- [menuItem setState:[[self window] isOpaque] ? NSOffState : NSOnState];
- else if (action == @selector(toggleUISideCompositing:))
- [menuItem setState:[self isUISideCompositingEnabled] ? NSOnState : NSOffState];
- else if (action == @selector(toggleLayerBordersVisibility:))
- [menuItem setState:[self layerBordersVisible] ? NSOnState : NSOffState];
- else if (action == @selector(toggleTiledScrollingIndicatorVisibility:))
- [menuItem setState:[self tiledScrollingIndicatorVisible] ? NSOnState : NSOffState];
</del><span class="cx">
</span><span class="cx"> return YES;
</span><span class="cx"> }
</span><span class="lines">@@ -162,6 +147,7 @@
</span><span class="cx">
</span><span class="cx"> - (IBAction)forceRepaint:(id)sender
</span><span class="cx"> {
</span><ins>+ // FIXME: This doesn't actually force a repaint.
</ins><span class="cx"> [_webView setNeedsDisplay:YES];
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -232,7 +218,7 @@
</span><span class="cx">
</span><span class="cx"> - (void)windowWillClose:(NSNotification *)notification
</span><span class="cx"> {
</span><del>- [(BrowserAppDelegate *)[NSApp delegate] browserWindowWillClose:[self window]];
</del><ins>+ [(BrowserAppDelegate *)[NSApp delegate] browserWindowWillClose:self.window];
</ins><span class="cx"> [self autorelease];
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -283,70 +269,36 @@
</span><span class="cx"> self.currentZoomFactor /= DefaultZoomFactorRatio;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-- (BOOL)isPaginated
</del><ins>+- (void)didChangeSettings
</ins><span class="cx"> {
</span><del>- return _webView._paginationMode != _WKPaginationModeUnpaginated;
-}
</del><ins>+ SettingsController *settings = [SettingsController shared];
+ WKPreferences *preferences = _webView.configuration.preferences;
</ins><span class="cx">
</span><del>-- (IBAction)togglePaginationMode:(id)sender
-{
- if (self.isPaginated)
- _webView._paginationMode = _WKPaginationModeUnpaginated;
- else {
- _webView._paginationMode = _WKPaginationModeLeftToRight;
- _webView._pageLength = _webView.bounds.size.width / 2;
- _webView._gapBetweenPages = 10;
- }
-}
</del><ins>+ preferences._tiledScrollingIndicatorVisible = settings.tiledScrollingIndicatorVisible;
+ preferences._compositingBordersVisible = settings.layerBordersVisible;
+ preferences._compositingRepaintCountersVisible = settings.layerBordersVisible;
</ins><span class="cx">
</span><del>-- (IBAction)toggleTransparentWindow:(id)sender
-{
- BOOL isTransparent = _webView._drawsTransparentBackground;
- isTransparent = !isTransparent;
</del><ins>+ BOOL useTransparentWindows = settings.useTransparentWindows;
+ if (useTransparentWindows != _webView._drawsTransparentBackground) {
+ [self.window setOpaque:!useTransparentWindows];
+ [self.window setHasShadow:!useTransparentWindows];
</ins><span class="cx">
</span><del>- [[self window] setOpaque:!isTransparent];
- [[self window] setHasShadow:!isTransparent];
</del><ins>+ _webView._drawsTransparentBackground = useTransparentWindows;
</ins><span class="cx">
</span><del>- _webView._drawsTransparentBackground = isTransparent;
</del><ins>+ [self.window display];
+ }
</ins><span class="cx">
</span><del>- [[self window] display];
</del><ins>+ BOOL usePaginatedMode = settings.usePaginatedMode;
+ if (usePaginatedMode != (_webView._paginationMode != _WKPaginationModeUnpaginated)) {
+ if (usePaginatedMode) {
+ _webView._paginationMode = _WKPaginationModeLeftToRight;
+ _webView._pageLength = _webView.bounds.size.width / 2;
+ _webView._gapBetweenPages = 10;
+ } else
+ _webView._paginationMode = _WKPaginationModeUnpaginated;
+ }
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-- (BOOL)isUISideCompositingEnabled
-{
- return [[NSUserDefaults standardUserDefaults] boolForKey:WebKit2UseRemoteLayerTreeDrawingAreaKey];
-}
-
-- (IBAction)toggleUISideCompositing:(id)sender
-{
- [[NSUserDefaults standardUserDefaults] setBool:![self isUISideCompositingEnabled] forKey:WebKit2UseRemoteLayerTreeDrawingAreaKey];
-}
-
-- (BOOL)layerBordersVisible
-{
- return [[NSUserDefaults standardUserDefaults] boolForKey:LayerBordersVisiblePreferenceKey];
-}
-
-- (IBAction)toggleLayerBordersVisibility:(id)sender
-{
- BOOL newState = ![self layerBordersVisible];
- [[NSUserDefaults standardUserDefaults] setBool:newState forKey:LayerBordersVisiblePreferenceKey];
- _webView.configuration.preferences._compositingBordersVisible = newState;
- _webView.configuration.preferences._compositingRepaintCountersVisible = newState;
-}
-
-- (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;
-}
-
</del><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>