<!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>[165930] 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/165930">165930</a></dd>
<dt>Author</dt> <dd>simon.fraser@apple.com</dd>
<dt>Date</dt> <dd>2014-03-19 16:44:39 -0700 (Wed, 19 Mar 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Expose text and page zoom in WK2 SPI, and hook them up in MiniBrowser
https://bugs.webkit.org/show_bug.cgi?id=130476
Source/WebKit2:
Reviewed by Anders Carlsson.
Expose page and text zoom as SPI.
* UIProcess/API/Cocoa/WKWebView.mm:
(-[WKWebView _supportsTextZoom]):
(-[WKWebView _textZoomFactor]):
(-[WKWebView _setTextZoomFactor:]):
(-[WKWebView _pageZoomFactor]):
(-[WKWebView _setPageZoomFactor:]):
* UIProcess/API/Cocoa/WKWebViewPrivate.h:
Tools:
Reviewed by Anders Carlsson.
Hook up page/text zoom in MiniBrowser, make reload work, remove some logging.
* MiniBrowser/mac/WK1BrowserWindowController.m:
(-[WK1BrowserWindowController webView:decidePolicyForNavigationAction:request:frame:decisionListener:]):
Remove log.
* MiniBrowser/mac/WK2BrowserWindowController.m:
(-[WK2BrowserWindowController awakeFromNib]):
(-[WK2BrowserWindowController validateMenuItem:]):
(-[WK2BrowserWindowController reload:]):
Hook up reload.
(-[WK2BrowserWindowController toggleZoomMode:]):
(-[WK2BrowserWindowController resetZoom:]):
(-[WK2BrowserWindowController canResetZoom]):
(-[WK2BrowserWindowController currentZoomFactor]):
(-[WK2BrowserWindowController setCurrentZoomFactor:]):
(-[WK2BrowserWindowController canZoomIn]):
(-[WK2BrowserWindowController canZoomOut]):</pre>
<h3>Modified Paths</h3>
<ul>
<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="#trunkToolsMiniBrowsermacWK1BrowserWindowControllerm">trunk/Tools/MiniBrowser/mac/WK1BrowserWindowController.m</a></li>
<li><a href="#trunkToolsMiniBrowsermacWK2BrowserWindowControllerm">trunk/Tools/MiniBrowser/mac/WK2BrowserWindowController.m</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/ChangeLog (165929 => 165930)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/ChangeLog 2014-03-19 23:27:50 UTC (rev 165929)
+++ trunk/Source/WebKit2/ChangeLog 2014-03-19 23:44:39 UTC (rev 165930)
</span><span class="lines">@@ -1,3 +1,20 @@
</span><ins>+2014-03-19 Simon Fraser <simon.fraser@apple.com>
+
+ Expose text and page zoom in WK2 SPI, and hook them up in MiniBrowser
+ https://bugs.webkit.org/show_bug.cgi?id=130476
+
+ Reviewed by Anders Carlsson.
+
+ Expose page and text zoom as SPI.
+
+ * UIProcess/API/Cocoa/WKWebView.mm:
+ (-[WKWebView _supportsTextZoom]):
+ (-[WKWebView _textZoomFactor]):
+ (-[WKWebView _setTextZoomFactor:]):
+ (-[WKWebView _pageZoomFactor]):
+ (-[WKWebView _setPageZoomFactor:]):
+ * UIProcess/API/Cocoa/WKWebViewPrivate.h:
+
</ins><span class="cx"> 2014-03-19 Benjamin Poulain <bpoulain@apple.com>
</span><span class="cx">
</span><span class="cx"> [iOS][WK2] Reduce the extended background's opacity when WKContentView is smaller than its WKWebView
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessAPICocoaWKWebViewmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebView.mm (165929 => 165930)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebView.mm 2014-03-19 23:27:50 UTC (rev 165929)
+++ trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebView.mm 2014-03-19 23:44:39 UTC (rev 165930)
</span><span class="lines">@@ -1009,6 +1009,31 @@
</span><span class="cx"> return _page->pageCount();
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+- (BOOL)_supportsTextZoom
+{
+ return _page->supportsTextZoom();
+}
+
+- (double)_textZoomFactor
+{
+ return _page->textZoomFactor();
+}
+
+- (void)_setTextZoomFactor:(double)zoomFactor
+{
+ _page->setTextZoomFactor(zoomFactor);
+}
+
+- (double)_pageZoomFactor
+{
+ return _page->pageZoomFactor();
+}
+
+- (void)_setPageZoomFactor:(double)zoomFactor
+{
+ _page->setPageZoomFactor(zoomFactor);
+}
+
</ins><span class="cx"> #pragma mark iOS-specific methods
</span><span class="cx">
</span><span class="cx"> #if PLATFORM(IOS)
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessAPICocoaWKWebViewPrivateh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebViewPrivate.h (165929 => 165930)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebViewPrivate.h 2014-03-19 23:27:50 UTC (rev 165929)
+++ trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebViewPrivate.h 2014-03-19 23:44:39 UTC (rev 165930)
</span><span class="lines">@@ -107,6 +107,10 @@
</span><span class="cx"> @property (nonatomic, setter=_setGapBetweenPages:) CGFloat _gapBetweenPages;
</span><span class="cx"> @property (readonly) NSUInteger _pageCount;
</span><span class="cx">
</span><ins>+@property (nonatomic, readonly) BOOL _supportsTextZoom;
+@property (nonatomic, setter=_setTextZoomFactor:) double _textZoomFactor;
+@property (nonatomic, setter=_setPageZoomFactor:) double _pageZoomFactor;
+
</ins><span class="cx"> @end
</span><span class="cx">
</span><span class="cx"> #endif
</span></span></pre></div>
<a id="trunkToolsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Tools/ChangeLog (165929 => 165930)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/ChangeLog 2014-03-19 23:27:50 UTC (rev 165929)
+++ trunk/Tools/ChangeLog 2014-03-19 23:44:39 UTC (rev 165930)
</span><span class="lines">@@ -1,3 +1,28 @@
</span><ins>+2014-03-19 Simon Fraser <simon.fraser@apple.com>
+
+ Expose text and page zoom in WK2 SPI, and hook them up in MiniBrowser
+ https://bugs.webkit.org/show_bug.cgi?id=130476
+
+ Reviewed by Anders Carlsson.
+
+ Hook up page/text zoom in MiniBrowser, make reload work, remove some logging.
+
+ * MiniBrowser/mac/WK1BrowserWindowController.m:
+ (-[WK1BrowserWindowController webView:decidePolicyForNavigationAction:request:frame:decisionListener:]):
+ Remove log.
+ * MiniBrowser/mac/WK2BrowserWindowController.m:
+ (-[WK2BrowserWindowController awakeFromNib]):
+ (-[WK2BrowserWindowController validateMenuItem:]):
+ (-[WK2BrowserWindowController reload:]):
+ Hook up reload.
+ (-[WK2BrowserWindowController toggleZoomMode:]):
+ (-[WK2BrowserWindowController resetZoom:]):
+ (-[WK2BrowserWindowController canResetZoom]):
+ (-[WK2BrowserWindowController currentZoomFactor]):
+ (-[WK2BrowserWindowController setCurrentZoomFactor:]):
+ (-[WK2BrowserWindowController canZoomIn]):
+ (-[WK2BrowserWindowController canZoomOut]):
+
</ins><span class="cx"> 2014-03-19 Alexey Proskuryakov <ap@apple.com>
</span><span class="cx">
</span><span class="cx"> REGRESSION (OS X 10.9.2): PageVisibilityStateWithWindowChanges.WebKit2 API test fails
</span></span></pre></div>
<a id="trunkToolsMiniBrowsermacWK1BrowserWindowControllerm"></a>
<div class="modfile"><h4>Modified: trunk/Tools/MiniBrowser/mac/WK1BrowserWindowController.m (165929 => 165930)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/MiniBrowser/mac/WK1BrowserWindowController.m 2014-03-19 23:27:50 UTC (rev 165929)
+++ trunk/Tools/MiniBrowser/mac/WK1BrowserWindowController.m 2014-03-19 23:44:39 UTC (rev 165930)
</span><span class="lines">@@ -260,8 +260,6 @@
</span><span class="cx">
</span><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><del>- NSLog(@"request %@ actionInformation %@", request, actionInformation);
-
</del><span class="cx"> [listener use];
</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 (165929 => 165930)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/MiniBrowser/mac/WK2BrowserWindowController.m 2014-03-19 23:27:50 UTC (rev 165929)
+++ trunk/Tools/MiniBrowser/mac/WK2BrowserWindowController.m 2014-03-19 23:44:39 UTC (rev 165930)
</span><span class="lines">@@ -42,6 +42,7 @@
</span><span class="cx">
</span><span class="cx"> @implementation WK2BrowserWindowController {
</span><span class="cx"> WKWebView *_webView;
</span><ins>+ BOOL _zoomTextOnly;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> - (void)awakeFromNib
</span><span class="lines">@@ -62,6 +63,8 @@
</span><span class="cx">
</span><span class="cx"> _webView.navigationDelegate = self;
</span><span class="cx"> _webView.UIDelegate = self;
</span><ins>+
+ _zoomTextOnly = NO;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> - (void)dealloc
</span><span class="lines">@@ -114,10 +117,7 @@
</span><span class="cx"> return [self canResetZoom];
</span><span class="cx">
</span><span class="cx"> // Disabled until missing WK2 functionality is exposed via API/SPI.
</span><del>- if (action == @selector(reload:)
- || action == @selector(toggleZoomMode:)
- || action == @selector(resetZoom:)
- || action == @selector(dumpSourceToConsole:)
</del><ins>+ if (action == @selector(dumpSourceToConsole:)
</ins><span class="cx"> || action == @selector(find:))
</span><span class="cx"> return NO;
</span><span class="cx">
</span><span class="lines">@@ -125,6 +125,8 @@
</span><span class="cx"> [menuItem setTitle:[_webView isHidden] ? @"Show Web View" : @"Hide Web View"];
</span><span class="cx"> else if (action == @selector(removeReinsertWebView:))
</span><span class="cx"> [menuItem setTitle:[_webView window] ? @"Remove Web View" : @"Insert Web View"];
</span><ins>+ else if (action == @selector(toggleZoomMode:))
+ [menuItem setState:_zoomTextOnly ? NSOnState : NSOffState];
</ins><span class="cx"> else if ([menuItem action] == @selector(togglePaginationMode:))
</span><span class="cx"> [menuItem setState:[self isPaginated] ? NSOnState : NSOffState];
</span><span class="cx"> else if ([menuItem action] == @selector(toggleTransparentWindow:))
</span><span class="lines">@@ -137,6 +139,7 @@
</span><span class="cx">
</span><span class="cx"> - (IBAction)reload:(id)sender
</span><span class="cx"> {
</span><ins>+ [_webView _reload];
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> - (IBAction)forceRepaint:(id)sender
</span><span class="lines">@@ -156,15 +159,33 @@
</span><span class="cx">
</span><span class="cx"> - (IBAction)toggleZoomMode:(id)sender
</span><span class="cx"> {
</span><ins>+ if (_zoomTextOnly) {
+ _zoomTextOnly = NO;
+ double currentTextZoom = _webView._textZoomFactor;
+ _webView._textZoomFactor = 1;
+ _webView._pageZoomFactor = currentTextZoom;
+ } else {
+ _zoomTextOnly = YES;
+ double currentPageZoom = _webView._pageZoomFactor;
+ _webView._textZoomFactor = currentPageZoom;
+ _webView._pageZoomFactor = 1;
+ }
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> - (IBAction)resetZoom:(id)sender
</span><span class="cx"> {
</span><ins>+ if (![self canResetZoom])
+ return;
+
+ if (_zoomTextOnly)
+ _webView._textZoomFactor = 1;
+ else
+ _webView._pageZoomFactor = 1;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> - (BOOL)canResetZoom
</span><span class="cx"> {
</span><del>- return NO;
</del><ins>+ return _zoomTextOnly ? (_webView._textZoomFactor != 1) : (_webView._pageZoomFactor != 1);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> - (IBAction)dumpSourceToConsole:(id)sender
</span><span class="lines">@@ -210,39 +231,41 @@
</span><span class="cx">
</span><span class="cx"> - (CGFloat)currentZoomFactor
</span><span class="cx"> {
</span><del>- return 1;
</del><ins>+ return _zoomTextOnly ? _webView._textZoomFactor : _webView._pageZoomFactor;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> - (void)setCurrentZoomFactor:(CGFloat)factor
</span><span class="cx"> {
</span><ins>+ if (_zoomTextOnly)
+ _webView._textZoomFactor = factor;
+ else
+ _webView._pageZoomFactor = factor;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> - (BOOL)canZoomIn
</span><span class="cx"> {
</span><del>- return NO;
</del><ins>+ return self.currentZoomFactor * DefaultZoomFactorRatio < DefaultMaximumZoomFactor;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> - (void)zoomIn:(id)sender
</span><span class="cx"> {
</span><del>- if (![self canZoomIn])
</del><ins>+ if (!self.canZoomIn)
</ins><span class="cx"> return;
</span><span class="cx">
</span><del>- CGFloat factor = [self currentZoomFactor] * DefaultZoomFactorRatio;
- [self setCurrentZoomFactor:factor];
</del><ins>+ self.currentZoomFactor *= DefaultZoomFactorRatio;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> - (BOOL)canZoomOut
</span><span class="cx"> {
</span><del>- return NO;
</del><ins>+ return self.currentZoomFactor / DefaultZoomFactorRatio > DefaultMinimumZoomFactor;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> - (void)zoomOut:(id)sender
</span><span class="cx"> {
</span><del>- if (![self canZoomIn])
</del><ins>+ if (!self.canZoomIn)
</ins><span class="cx"> return;
</span><span class="cx">
</span><del>- CGFloat factor = [self currentZoomFactor] / DefaultZoomFactorRatio;
- [self setCurrentZoomFactor:factor];
</del><ins>+ self.currentZoomFactor /= DefaultZoomFactorRatio;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> - (BOOL)isPaginated
</span><span class="lines">@@ -252,7 +275,7 @@
</span><span class="cx">
</span><span class="cx"> - (IBAction)togglePaginationMode:(id)sender
</span><span class="cx"> {
</span><del>- if ([self isPaginated])
</del><ins>+ if (self.isPaginated)
</ins><span class="cx"> _webView._paginationMode = _WKPaginationModeUnpaginated;
</span><span class="cx"> else {
</span><span class="cx"> _webView._paginationMode = _WKPaginationModeLeftToRight;
</span></span></pre>
</div>
</div>
</body>
</html>