<!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>[207512] 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/207512">207512</a></dd>
<dt>Author</dt> <dd>simon.fraser@apple.com</dd>
<dt>Date</dt> <dd>2016-10-18 18:03:23 -0700 (Tue, 18 Oct 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>Add a MiniBrowser menu item to apply page scale in WK1 and WK2
https://bugs.webkit.org/show_bug.cgi?id=163627
Reviewed by Dean Jackson.
Source/WebKit/mac:
Add an explanatory comment about viewScaleFactor not really being viewScaleFactor.
* WebView/WebViewPrivate.h:
Source/WebKit2:
New SPI to set and retrieve page scale.
* UIProcess/API/Cocoa/WKWebView.mm:
(-[WKWebView _setPageScale:withOrigin:]):
(-[WKWebView _pageScale]):
* UIProcess/API/Cocoa/WKWebViewPrivate.h:
Tools:
Rename setScale: to setViewScale: and add setPageScale:, hooking it up for WK1 (via exisiting SPI)
and WK2 (via new SPI).
* MiniBrowser/mac/BrowserWindowController.h:
* MiniBrowser/mac/BrowserWindowController.m:
(-[BrowserWindowController pageScaleForMenuItemTag:]):
(-[BrowserWindowController setPageScale:]):
(-[BrowserWindowController setViewScale:]):
(-[BrowserWindowController setScale:]): Deleted.
* MiniBrowser/mac/MainMenu.xib:
* MiniBrowser/mac/WK1BrowserWindowController.m:
(-[WK1BrowserWindowController setPageScale:]):
(-[WK1BrowserWindowController setViewScale:]):
(areEssentiallyEqual):
(-[WK1BrowserWindowController validateMenuItem:]):
(-[WK1BrowserWindowController setScale:]): Deleted.
* MiniBrowser/mac/WK2BrowserWindowController.m:
(-[WK2BrowserWindowController setPageScale:]):
(-[WK2BrowserWindowController viewScaleForMenuItemTag:]):
(-[WK2BrowserWindowController setViewScale:]):
(areEssentiallyEqual):
(-[WK2BrowserWindowController validateMenuItem:]):
(viewScaleForMenuItemTag): Deleted.
(-[WK2BrowserWindowController setScale:]): Deleted.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebKitmacChangeLog">trunk/Source/WebKit/mac/ChangeLog</a></li>
<li><a href="#trunkSourceWebKitmacWebViewWebViewPrivateh">trunk/Source/WebKit/mac/WebView/WebViewPrivate.h</a></li>
<li><a href="#trunkSourceWebKit2ChangeLog">trunk/Source/WebKit2/ChangeLog</a></li>
<li><a href="#trunkSourceWebKit2UIProcessAPICocoaWKWebViewmm">trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebView.mm</a></li>
<li><a href="#trunkSourceWebKit2UIProcessAPICocoaWKWebViewPrivateh">trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebViewPrivate.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="#trunkToolsMiniBrowsermacBrowserWindowControllerm">trunk/Tools/MiniBrowser/mac/BrowserWindowController.m</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 (207511 => 207512)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/mac/ChangeLog 2016-10-19 00:51:13 UTC (rev 207511)
+++ trunk/Source/WebKit/mac/ChangeLog 2016-10-19 01:03:23 UTC (rev 207512)
</span><span class="lines">@@ -1,3 +1,14 @@
</span><ins>+2016-10-18 Simon Fraser <simon.fraser@apple.com>
+
+ Add a MiniBrowser menu item to apply page scale in WK1 and WK2
+ https://bugs.webkit.org/show_bug.cgi?id=163627
+
+ Reviewed by Dean Jackson.
+
+ Add an explanatory comment about viewScaleFactor not really being viewScaleFactor.
+
+ * WebView/WebViewPrivate.h:
+
</ins><span class="cx"> 2016-10-18 Dean Jackson <dino@apple.com>
</span><span class="cx">
</span><span class="cx"> Remove CSS_SHAPES feature definition. This should always be on.
</span></span></pre></div>
<a id="trunkSourceWebKitmacWebViewWebViewPrivateh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/mac/WebView/WebViewPrivate.h (207511 => 207512)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/mac/WebView/WebViewPrivate.h 2016-10-19 00:51:13 UTC (rev 207511)
+++ trunk/Source/WebKit/mac/WebView/WebViewPrivate.h 2016-10-19 01:03:23 UTC (rev 207512)
</span><span class="lines">@@ -813,7 +813,7 @@
</span><span class="cx"> + (void)_registerURLSchemeAsAllowingDatabaseAccessInPrivateBrowsing:(NSString *)scheme;
</span><span class="cx">
</span><span class="cx"> - (void)_scaleWebView:(float)scale atOrigin:(NSPoint)origin;
</span><del>-- (float)_viewScaleFactor;
</del><ins>+- (float)_viewScaleFactor; // This is actually pageScaleFactor.
</ins><span class="cx">
</span><span class="cx"> - (void)_setUseFixedLayout:(BOOL)fixed;
</span><span class="cx"> - (void)_setFixedLayoutSize:(NSSize)size;
</span></span></pre></div>
<a id="trunkSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/ChangeLog (207511 => 207512)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/ChangeLog 2016-10-19 00:51:13 UTC (rev 207511)
+++ trunk/Source/WebKit2/ChangeLog 2016-10-19 01:03:23 UTC (rev 207512)
</span><span class="lines">@@ -1,3 +1,17 @@
</span><ins>+2016-10-18 Simon Fraser <simon.fraser@apple.com>
+
+ Add a MiniBrowser menu item to apply page scale in WK1 and WK2
+ https://bugs.webkit.org/show_bug.cgi?id=163627
+
+ Reviewed by Dean Jackson.
+
+ New SPI to set and retrieve page scale.
+
+ * UIProcess/API/Cocoa/WKWebView.mm:
+ (-[WKWebView _setPageScale:withOrigin:]):
+ (-[WKWebView _pageScale]):
+ * UIProcess/API/Cocoa/WKWebViewPrivate.h:
+
</ins><span class="cx"> 2016-10-18 Dean Jackson <dino@apple.com>
</span><span class="cx">
</span><span class="cx"> Remove CSS_SHAPES feature definition. This should always be on.
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessAPICocoaWKWebViewmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebView.mm (207511 => 207512)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebView.mm 2016-10-19 00:51:13 UTC (rev 207511)
+++ trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebView.mm 2016-10-19 01:03:23 UTC (rev 207512)
</span><span class="lines">@@ -4620,6 +4620,16 @@
</span><span class="cx"> }
</span><span class="cx"> #endif // PLATFORM(MAC)
</span><span class="cx">
</span><ins>+- (void)_setPageScale:(CGFloat)scale withOrigin:(CGPoint)origin
+{
+ _page->scalePage(scale, WebCore::roundedIntPoint(origin));
+}
+
+- (CGFloat)_pageScale
+{
+ return _page->pageScaleFactor();
+}
+
</ins><span class="cx"> // Execute the supplied block after the next transaction from the WebProcess.
</span><span class="cx"> - (void)_doAfterNextPresentationUpdate:(void (^)(void))updateBlock
</span><span class="cx"> {
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessAPICocoaWKWebViewPrivateh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebViewPrivate.h (207511 => 207512)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebViewPrivate.h 2016-10-19 00:51:13 UTC (rev 207511)
+++ trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebViewPrivate.h 2016-10-19 01:03:23 UTC (rev 207512)
</span><span class="lines">@@ -288,6 +288,9 @@
</span><span class="cx"> - (void)_handleActiveNowPlayingSessionInfoResponse:(BOOL)hasActiveSession title:(NSString *)title duration:(double)duration elapsedTime:(double)elapsedTime WK_API_AVAILABLE(macosx(WK_MAC_TBA));
</span><span class="cx"> #endif
</span><span class="cx">
</span><ins>+- (void)_setPageScale:(CGFloat)scale withOrigin:(CGPoint)origin WK_API_AVAILABLE(ios(WK_IOS_TBA));
+- (CGFloat)_pageScale WK_API_AVAILABLE(ios(WK_IOS_TBA));
+
</ins><span class="cx"> - (void)_doAfterNextPresentationUpdate:(void (^)(void))updateBlock WK_API_AVAILABLE(macosx(10.12), ios(10.0));
</span><span class="cx">
</span><span class="cx"> - (void)_disableBackForwardSnapshotVolatilityForTesting WK_API_AVAILABLE(macosx(WK_MAC_TBA), ios(WK_IOS_TBA));
</span></span></pre></div>
<a id="trunkToolsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Tools/ChangeLog (207511 => 207512)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/ChangeLog 2016-10-19 00:51:13 UTC (rev 207511)
+++ trunk/Tools/ChangeLog 2016-10-19 01:03:23 UTC (rev 207512)
</span><span class="lines">@@ -1,3 +1,35 @@
</span><ins>+2016-10-18 Simon Fraser <simon.fraser@apple.com>
+
+ Add a MiniBrowser menu item to apply page scale in WK1 and WK2
+ https://bugs.webkit.org/show_bug.cgi?id=163627
+
+ Reviewed by Dean Jackson.
+
+ Rename setScale: to setViewScale: and add setPageScale:, hooking it up for WK1 (via exisiting SPI)
+ and WK2 (via new SPI).
+
+ * MiniBrowser/mac/BrowserWindowController.h:
+ * MiniBrowser/mac/BrowserWindowController.m:
+ (-[BrowserWindowController pageScaleForMenuItemTag:]):
+ (-[BrowserWindowController setPageScale:]):
+ (-[BrowserWindowController setViewScale:]):
+ (-[BrowserWindowController setScale:]): Deleted.
+ * MiniBrowser/mac/MainMenu.xib:
+ * MiniBrowser/mac/WK1BrowserWindowController.m:
+ (-[WK1BrowserWindowController setPageScale:]):
+ (-[WK1BrowserWindowController setViewScale:]):
+ (areEssentiallyEqual):
+ (-[WK1BrowserWindowController validateMenuItem:]):
+ (-[WK1BrowserWindowController setScale:]): Deleted.
+ * MiniBrowser/mac/WK2BrowserWindowController.m:
+ (-[WK2BrowserWindowController setPageScale:]):
+ (-[WK2BrowserWindowController viewScaleForMenuItemTag:]):
+ (-[WK2BrowserWindowController setViewScale:]):
+ (areEssentiallyEqual):
+ (-[WK2BrowserWindowController validateMenuItem:]):
+ (viewScaleForMenuItemTag): Deleted.
+ (-[WK2BrowserWindowController setScale:]): Deleted.
+
</ins><span class="cx"> 2016-10-18 Anders Carlsson <andersca@apple.com>
</span><span class="cx">
</span><span class="cx"> Add an beforeunload alert to the WebKitLegacy MiniBrowser
</span></span></pre></div>
<a id="trunkToolsMiniBrowsermacBrowserWindowControllerh"></a>
<div class="modfile"><h4>Modified: trunk/Tools/MiniBrowser/mac/BrowserWindowController.h (207511 => 207512)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/MiniBrowser/mac/BrowserWindowController.h 2016-10-19 00:51:13 UTC (rev 207511)
+++ trunk/Tools/MiniBrowser/mac/BrowserWindowController.h 2016-10-19 01:03:23 UTC (rev 207512)
</span><span class="lines">@@ -67,7 +67,8 @@
</span><span class="cx">
</span><span class="cx"> - (IBAction)toggleZoomMode:(id)sender;
</span><span class="cx">
</span><del>-- (IBAction)setScale:(id)sender;
</del><ins>+- (IBAction)setPageScale:(id)sender;
+- (IBAction)setViewScale:(id)sender;
</ins><span class="cx">
</span><span class="cx"> - (IBAction)toggleShrinkToFit:(id)sender;
</span><span class="cx">
</span><span class="lines">@@ -79,5 +80,7 @@
</span><span class="cx"> - (NSURL *)currentURL;
</span><span class="cx"> - (NSView *)mainContentView;
</span><span class="cx">
</span><ins>+- (CGFloat)pageScaleForMenuItemTag:(NSInteger)tag;
+
</ins><span class="cx"> @end
</span><span class="cx">
</span></span></pre></div>
<a id="trunkToolsMiniBrowsermacBrowserWindowControllerm"></a>
<div class="modfile"><h4>Modified: trunk/Tools/MiniBrowser/mac/BrowserWindowController.m (207511 => 207512)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/MiniBrowser/mac/BrowserWindowController.m 2016-10-19 00:51:13 UTC (rev 207511)
+++ trunk/Tools/MiniBrowser/mac/BrowserWindowController.m 2016-10-19 01:03:23 UTC (rev 207512)
</span><span class="lines">@@ -157,11 +157,30 @@
</span><span class="cx"> [self doesNotRecognizeSelector:_cmd];
</span><span class="cx"> }
</span><span class="cx">
</span><del>-- (IBAction)setScale:(id)sender
</del><ins>+- (CGFloat)pageScaleForMenuItemTag:(NSInteger)tag
</ins><span class="cx"> {
</span><ins>+ if (tag == 1)
+ return 1;
+ if (tag == 2)
+ return 1.25;
+ if (tag == 3)
+ return 1.5;
+ if (tag == 4)
+ return 2.0;
+
+ return 1;
+}
+
+- (IBAction)setPageScale:(id)sender
+{
</ins><span class="cx"> [self doesNotRecognizeSelector:_cmd];
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+- (IBAction)setViewScale:(id)sender
+{
+ [self doesNotRecognizeSelector:_cmd];
+}
+
</ins><span class="cx"> - (IBAction)toggleShrinkToFit:(id)sender
</span><span class="cx"> {
</span><span class="cx"> [self doesNotRecognizeSelector:_cmd];
</span></span></pre></div>
<a id="trunkToolsMiniBrowsermacMainMenuxib"></a>
<div class="modfile"><h4>Modified: trunk/Tools/MiniBrowser/mac/MainMenu.xib (207511 => 207512)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/MiniBrowser/mac/MainMenu.xib 2016-10-19 00:51:13 UTC (rev 207511)
+++ trunk/Tools/MiniBrowser/mac/MainMenu.xib 2016-10-19 01:03:23 UTC (rev 207512)
</span><span class="lines">@@ -1,8 +1,8 @@
</span><del>-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="8096.6" systemVersion="15A178f" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none">
</del><ins>+<?xml version="1.0" encoding="UTF-8"?>
+<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="11521.1" systemVersion="16B2648a" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none">
</ins><span class="cx"> <dependencies>
</span><span class="cx"> <deployment identifier="macosx"/>
</span><del>- <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="8096.6"/>
</del><ins>+ <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="11521.1"/>
</ins><span class="cx"> </dependencies>
</span><span class="cx"> <objects>
</span><span class="cx"> <customObject id="-2" userLabel="File's Owner" customClass="NSApplication">
</span><span class="lines">@@ -12,10 +12,10 @@
</span><span class="cx"> </customObject>
</span><span class="cx"> <customObject id="-1" userLabel="First Responder" customClass="FirstResponder"/>
</span><span class="cx"> <customObject id="-3" userLabel="Application" customClass="NSObject"/>
</span><del>- <menu title="AMainMenu" systemMenu="main" userInterfaceLayoutDirection="leftToRight" id="29">
</del><ins>+ <menu title="AMainMenu" systemMenu="main" id="29">
</ins><span class="cx"> <items>
</span><span class="cx"> <menuItem title="MiniBrowser" id="56">
</span><del>- <menu key="submenu" title="MiniBrowser" systemMenu="apple" userInterfaceLayoutDirection="leftToRight" id="57">
</del><ins>+ <menu key="submenu" title="MiniBrowser" systemMenu="apple" id="57">
</ins><span class="cx"> <items>
</span><span class="cx"> <menuItem title="About MiniBrowser" id="58">
</span><span class="cx"> <modifierMask key="keyEquivalentModifierMask"/>
</span><span class="lines">@@ -31,7 +31,7 @@
</span><span class="cx"> <modifierMask key="keyEquivalentModifierMask" command="YES"/>
</span><span class="cx"> </menuItem>
</span><span class="cx"> <menuItem title="Services" id="131">
</span><del>- <menu key="submenu" title="Services" systemMenu="services" userInterfaceLayoutDirection="leftToRight" id="130"/>
</del><ins>+ <menu key="submenu" title="Services" systemMenu="services" id="130"/>
</ins><span class="cx"> </menuItem>
</span><span class="cx"> <menuItem isSeparatorItem="YES" id="144">
</span><span class="cx"> <modifierMask key="keyEquivalentModifierMask" command="YES"/>
</span><span class="lines">@@ -64,7 +64,7 @@
</span><span class="cx"> </menu>
</span><span class="cx"> </menuItem>
</span><span class="cx"> <menuItem title="File" id="83">
</span><del>- <menu key="submenu" title="File" userInterfaceLayoutDirection="leftToRight" id="81">
</del><ins>+ <menu key="submenu" title="File" id="81">
</ins><span class="cx"> <items>
</span><span class="cx"> <menuItem title="Open Location " tag="1" keyEquivalent="l" id="82">
</span><span class="cx"> <connections>
</span><span class="lines">@@ -94,7 +94,7 @@
</span><span class="cx"> </connections>
</span><span class="cx"> </menuItem>
</span><span class="cx"> <menuItem title="Open Recent" id="124">
</span><del>- <menu key="submenu" title="Open Recent" systemMenu="recentDocuments" userInterfaceLayoutDirection="leftToRight" id="125">
</del><ins>+ <menu key="submenu" title="Open Recent" systemMenu="recentDocuments" id="125">
</ins><span class="cx"> <items>
</span><span class="cx"> <menuItem title="Clear Menu" id="126">
</span><span class="cx"> <connections>
</span><span class="lines">@@ -147,7 +147,7 @@
</span><span class="cx"> </menu>
</span><span class="cx"> </menuItem>
</span><span class="cx"> <menuItem title="Edit" id="217">
</span><del>- <menu key="submenu" title="Edit" userInterfaceLayoutDirection="leftToRight" id="205">
</del><ins>+ <menu key="submenu" title="Edit" id="205">
</ins><span class="cx"> <items>
</span><span class="cx"> <menuItem title="Undo" keyEquivalent="z" id="207">
</span><span class="cx"> <connections>
</span><span class="lines">@@ -198,7 +198,7 @@
</span><span class="cx"> <modifierMask key="keyEquivalentModifierMask" command="YES"/>
</span><span class="cx"> </menuItem>
</span><span class="cx"> <menuItem title="Find" id="218">
</span><del>- <menu key="submenu" title="Find" userInterfaceLayoutDirection="leftToRight" id="220">
</del><ins>+ <menu key="submenu" title="Find" id="220">
</ins><span class="cx"> <items>
</span><span class="cx"> <menuItem title="Find…" tag="1" keyEquivalent="f" id="209">
</span><span class="cx"> <connections>
</span><span class="lines">@@ -230,7 +230,7 @@
</span><span class="cx"> </menu>
</span><span class="cx"> </menuItem>
</span><span class="cx"> <menuItem title="Spelling and Grammar" id="216">
</span><del>- <menu key="submenu" title="Spelling and Grammar" userInterfaceLayoutDirection="leftToRight" id="200">
</del><ins>+ <menu key="submenu" title="Spelling and Grammar" id="200">
</ins><span class="cx"> <items>
</span><span class="cx"> <menuItem title="Show Spelling and Grammar" keyEquivalent=":" id="204">
</span><span class="cx"> <connections>
</span><span class="lines">@@ -263,7 +263,7 @@
</span><span class="cx"> </menu>
</span><span class="cx"> </menuItem>
</span><span class="cx"> <menuItem title="Substitutions" id="348">
</span><del>- <menu key="submenu" title="Substitutions" userInterfaceLayoutDirection="leftToRight" id="349">
</del><ins>+ <menu key="submenu" title="Substitutions" id="349">
</ins><span class="cx"> <items>
</span><span class="cx"> <menuItem title="Show Substitutions" id="457">
</span><span class="cx"> <modifierMask key="keyEquivalentModifierMask"/>
</span><span class="lines">@@ -305,7 +305,7 @@
</span><span class="cx"> </menuItem>
</span><span class="cx"> <menuItem title="Transformations" id="450">
</span><span class="cx"> <modifierMask key="keyEquivalentModifierMask"/>
</span><del>- <menu key="submenu" title="Transformations" userInterfaceLayoutDirection="leftToRight" id="451">
</del><ins>+ <menu key="submenu" title="Transformations" id="451">
</ins><span class="cx"> <items>
</span><span class="cx"> <menuItem title="Make Upper Case" id="452">
</span><span class="cx"> <modifierMask key="keyEquivalentModifierMask"/>
</span><span class="lines">@@ -329,7 +329,7 @@
</span><span class="cx"> </menu>
</span><span class="cx"> </menuItem>
</span><span class="cx"> <menuItem title="Speech" id="211">
</span><del>- <menu key="submenu" title="Speech" userInterfaceLayoutDirection="leftToRight" id="212">
</del><ins>+ <menu key="submenu" title="Speech" id="212">
</ins><span class="cx"> <items>
</span><span class="cx"> <menuItem title="Start Speaking" id="196">
</span><span class="cx"> <connections>
</span><span class="lines">@@ -348,7 +348,7 @@
</span><span class="cx"> </menu>
</span><span class="cx"> </menuItem>
</span><span class="cx"> <menuItem title="View" id="295">
</span><del>- <menu key="submenu" title="View" userInterfaceLayoutDirection="leftToRight" id="296">
</del><ins>+ <menu key="submenu" title="View" id="296">
</ins><span class="cx"> <items>
</span><span class="cx"> <menuItem title="Show Toolbar" keyEquivalent="t" id="297">
</span><span class="cx"> <modifierMask key="keyEquivalentModifierMask" option="YES" command="YES"/>
</span><span class="lines">@@ -383,28 +383,59 @@
</span><span class="cx"> <action selector="toggleZoomMode:" target="-1" id="564"/>
</span><span class="cx"> </connections>
</span><span class="cx"> </menuItem>
</span><ins>+ <menuItem title="Page Scale" id="Hzb-c3-Qfv">
+ <modifierMask key="keyEquivalentModifierMask"/>
+ <menu key="submenu" title="Page Scale" id="jdo-5V-3CM">
+ <items>
+ <menuItem title="100%" state="on" tag="1" keyEquivalent="1" id="wHb-mR-Fv0">
+ <connections>
+ <action selector="setPageScale:" target="-1" id="uMw-eY-289"/>
+ </connections>
+ </menuItem>
+ <menuItem title="125%" tag="2" keyEquivalent="2" id="u4i-F7-rPb">
+ <connections>
+ <action selector="setPageScale:" target="-1" id="IbE-Ep-hfc"/>
+ </connections>
+ </menuItem>
+ <menuItem title="150%" tag="3" keyEquivalent="3" id="fwT-Iy-oK9">
+ <connections>
+ <action selector="setPageScale:" target="-1" id="9c0-eN-0f5"/>
+ </connections>
+ </menuItem>
+ <menuItem title="200%" tag="4" keyEquivalent="4" id="R5e-ct-O2u">
+ <connections>
+ <action selector="setPageScale:" target="-1" id="mkk-gh-dlN"/>
+ </connections>
+ </menuItem>
+ </items>
+ </menu>
+ </menuItem>
</ins><span class="cx"> <menuItem title="View Scale" id="8UY-Pj-H13">
</span><span class="cx"> <modifierMask key="keyEquivalentModifierMask"/>
</span><del>- <menu key="submenu" title="View Scale" userInterfaceLayoutDirection="leftToRight" id="Ml8-mk-ffu">
</del><ins>+ <menu key="submenu" title="View Scale" id="Ml8-mk-ffu">
</ins><span class="cx"> <items>
</span><del>- <menuItem title="100%" state="on" tag="1" keyEquivalent="1" id="EAm-Xn-VrC">
</del><ins>+ <menuItem title="100%" state="on" tag="1" id="EAm-Xn-VrC">
+ <modifierMask key="keyEquivalentModifierMask"/>
</ins><span class="cx"> <connections>
</span><del>- <action selector="setScale:" target="-1" id="aaW-VE-lxu"/>
</del><ins>+ <action selector="setViewScale:" target="-1" id="dkW-CI-RG4"/>
</ins><span class="cx"> </connections>
</span><span class="cx"> </menuItem>
</span><del>- <menuItem title="75%" tag="2" keyEquivalent="2" id="jcA-I1-Cbq">
</del><ins>+ <menuItem title="75%" tag="2" id="jcA-I1-Cbq">
+ <modifierMask key="keyEquivalentModifierMask"/>
</ins><span class="cx"> <connections>
</span><del>- <action selector="setScale:" target="-1" id="voc-3W-ppg"/>
</del><ins>+ <action selector="setViewScale:" target="-1" id="BAF-Ym-IqV"/>
</ins><span class="cx"> </connections>
</span><span class="cx"> </menuItem>
</span><del>- <menuItem title="50%" tag="3" keyEquivalent="3" id="BRM-D5-YNO">
</del><ins>+ <menuItem title="50%" tag="3" id="BRM-D5-YNO">
+ <modifierMask key="keyEquivalentModifierMask"/>
</ins><span class="cx"> <connections>
</span><del>- <action selector="setScale:" target="-1" id="sfY-6N-EeS"/>
</del><ins>+ <action selector="setViewScale:" target="-1" id="nXy-2b-9Zz"/>
</ins><span class="cx"> </connections>
</span><span class="cx"> </menuItem>
</span><del>- <menuItem title="25%" tag="4" keyEquivalent="4" id="gzk-YK-x0W">
</del><ins>+ <menuItem title="25%" tag="4" id="gzk-YK-x0W">
+ <modifierMask key="keyEquivalentModifierMask"/>
</ins><span class="cx"> <connections>
</span><del>- <action selector="setScale:" target="-1" id="WPq-Rm-CVA"/>
</del><ins>+ <action selector="setViewScale:" target="-1" id="KXK-f6-24N"/>
</ins><span class="cx"> </connections>
</span><span class="cx"> </menuItem>
</span><span class="cx"> </items>
</span><span class="lines">@@ -420,7 +451,7 @@
</span><span class="cx"> </menu>
</span><span class="cx"> </menuItem>
</span><span class="cx"> <menuItem title="Window" id="19">
</span><del>- <menu key="submenu" title="Window" systemMenu="window" userInterfaceLayoutDirection="leftToRight" id="24">
</del><ins>+ <menu key="submenu" title="Window" systemMenu="window" id="24">
</ins><span class="cx"> <items>
</span><span class="cx"> <menuItem title="Minimize" keyEquivalent="m" id="23">
</span><span class="cx"> <connections>
</span><span class="lines">@@ -445,7 +476,7 @@
</span><span class="cx"> </menuItem>
</span><span class="cx"> <menuItem title="Help" id="490">
</span><span class="cx"> <modifierMask key="keyEquivalentModifierMask"/>
</span><del>- <menu key="submenu" title="Help" systemMenu="help" userInterfaceLayoutDirection="leftToRight" id="491">
</del><ins>+ <menu key="submenu" title="Help" systemMenu="help" id="491">
</ins><span class="cx"> <items>
</span><span class="cx"> <menuItem title="MiniBrowser Help" keyEquivalent="?" id="492">
</span><span class="cx"> <connections>
</span><span class="lines">@@ -457,7 +488,7 @@
</span><span class="cx"> </menuItem>
</span><span class="cx"> <menuItem title="Debug" id="534">
</span><span class="cx"> <modifierMask key="keyEquivalentModifierMask"/>
</span><del>- <menu key="submenu" title="Debug" userInterfaceLayoutDirection="leftToRight" id="535">
</del><ins>+ <menu key="submenu" title="Debug" id="535">
</ins><span class="cx"> <items>
</span><span class="cx"> <menuItem title="Force Repaint" keyEquivalent="r" id="545">
</span><span class="cx"> <modifierMask key="keyEquivalentModifierMask" option="YES" command="YES"/>
</span></span></pre></div>
<a id="trunkToolsMiniBrowsermacWK1BrowserWindowControllerm"></a>
<div class="modfile"><h4>Modified: trunk/Tools/MiniBrowser/mac/WK1BrowserWindowController.m (207511 => 207512)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/MiniBrowser/mac/WK1BrowserWindowController.m 2016-10-19 00:51:13 UTC (rev 207511)
+++ trunk/Tools/MiniBrowser/mac/WK1BrowserWindowController.m 2016-10-19 01:03:23 UTC (rev 207512)
</span><span class="lines">@@ -103,11 +103,16 @@
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><del>-- (IBAction)setScale:(id)sender
</del><ins>+- (IBAction)setPageScale:(id)sender
</ins><span class="cx"> {
</span><del>-
</del><ins>+ CGFloat scale = [self pageScaleForMenuItemTag:[sender tag]];
+ [_webView _scaleWebView:scale atOrigin:NSZeroPoint];
</ins><span class="cx"> }
</span><span class="cx">
</span><ins>+- (IBAction)setViewScale:(id)sender
+{
+}
+
</ins><span class="cx"> - (IBAction)reload:(id)sender
</span><span class="cx"> {
</span><span class="cx"> [_webView reload:sender];
</span><span class="lines">@@ -128,6 +133,12 @@
</span><span class="cx"> [_webView goForward:sender];
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+static BOOL areEssentiallyEqual(double a, double b)
+{
+ double tolerance = 0.001;
+ return (fabs(a - b) <= tolerance);
+}
+
</ins><span class="cx"> - (BOOL)validateMenuItem:(NSMenuItem *)menuItem
</span><span class="cx"> {
</span><span class="cx"> SEL action = [menuItem action];
</span><span class="lines">@@ -146,6 +157,9 @@
</span><span class="cx"> else if (action == @selector(toggleZoomMode:))
</span><span class="cx"> [menuItem setState:_zoomTextOnly ? NSOnState : NSOffState];
</span><span class="cx">
</span><ins>+ if (action == @selector(setPageScale:))
+ [menuItem setState:areEssentiallyEqual([_webView _viewScaleFactor], [self pageScaleForMenuItemTag:[menuItem tag]])];
+
</ins><span class="cx"> return YES;
</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 (207511 => 207512)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/MiniBrowser/mac/WK2BrowserWindowController.m 2016-10-19 00:51:13 UTC (rev 207511)
+++ trunk/Tools/MiniBrowser/mac/WK2BrowserWindowController.m 2016-10-19 01:03:23 UTC (rev 207512)
</span><span class="lines">@@ -133,8 +133,14 @@
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><del>-static CGFloat viewScaleForMenuItemTag(NSInteger tag)
</del><ins>+- (IBAction)setPageScale:(id)sender
</ins><span class="cx"> {
</span><ins>+ CGFloat scale = [self pageScaleForMenuItemTag:[sender tag]];
+ [_webView _setPageScale:scale withOrigin:CGPointZero];
+}
+
+- (CGFloat)viewScaleForMenuItemTag:(NSInteger)tag
+{
</ins><span class="cx"> if (tag == 1)
</span><span class="cx"> return 1;
</span><span class="cx"> if (tag == 2)
</span><span class="lines">@@ -147,9 +153,9 @@
</span><span class="cx"> return 1;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-- (IBAction)setScale:(id)sender
</del><ins>+- (IBAction)setViewScale:(id)sender
</ins><span class="cx"> {
</span><del>- CGFloat scale = viewScaleForMenuItemTag([sender tag]);
</del><ins>+ CGFloat scale = [self viewScaleForMenuItemTag:[sender tag]];
</ins><span class="cx"> CGFloat oldScale = [_webView _viewScale];
</span><span class="cx">
</span><span class="cx"> if (scale == oldScale)
</span><span class="lines">@@ -164,6 +170,12 @@
</span><span class="cx"> [_webView _setViewScale:scale];
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+static BOOL areEssentiallyEqual(double a, double b)
+{
+ double tolerance = 0.001;
+ return (fabs(a - b) <= tolerance);
+}
+
</ins><span class="cx"> - (BOOL)validateMenuItem:(NSMenuItem *)menuItem
</span><span class="cx"> {
</span><span class="cx"> SEL action = [menuItem action];
</span><span class="lines">@@ -188,9 +200,12 @@
</span><span class="cx"> else if (action == @selector(toggleZoomMode:))
</span><span class="cx"> [menuItem setState:_zoomTextOnly ? NSOnState : NSOffState];
</span><span class="cx">
</span><del>- if (action == @selector(setScale:))
- [menuItem setState:[_webView _viewScale] == viewScaleForMenuItemTag([menuItem tag])];
</del><ins>+ if (action == @selector(setPageScale:))
+ [menuItem setState:areEssentiallyEqual([_webView _pageScale], [self pageScaleForMenuItemTag:[menuItem tag]])];
</ins><span class="cx">
</span><ins>+ if (action == @selector(setViewScale:))
+ [menuItem setState:areEssentiallyEqual([_webView _viewScale], [self viewScaleForMenuItemTag:[menuItem tag]])];
+
</ins><span class="cx"> return YES;
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>