Changeset 165930 in webkit

Timestamp:

Mar 19, 2014, 4:44:39 PM (12 years ago)

Author:

Simon Fraser

Message:

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]):

Location:

trunk

Files:

• Source/WebKit2/ChangeLog (modified) (1 diff)
• Source/WebKit2/UIProcess/API/Cocoa/WKWebView.mm (modified) (1 diff)
• Source/WebKit2/UIProcess/API/Cocoa/WKWebViewPrivate.h (modified) (1 diff)
• Tools/ChangeLog (modified) (1 diff)
• Tools/MiniBrowser/mac/WK1BrowserWindowController.m (modified) (1 diff)
• Tools/MiniBrowser/mac/WK2BrowserWindowController.m (modified) (8 diffs)

trunk/Source/WebKit2/ChangeLog

@@ +1 @@
+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:
+
 2014-03-19  Benjamin Poulain  <bpoulain@apple.com>
 

trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebView.mm

@@ -1010 +1010 @@
 }
 
+- (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);
+}
+
 #pragma mark iOS-specific methods
 

trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebViewPrivate.h

@@ -108 +108 @@
 @property (readonly) NSUInteger _pageCount;
 
+@property (nonatomic, readonly) BOOL _supportsTextZoom;
+@property (nonatomic, setter=_setTextZoomFactor:) double _textZoomFactor;
+@property (nonatomic, setter=_setPageZoomFactor:) double _pageZoomFactor;
+
 @end
 

trunk/Tools/ChangeLog

@@ +1 @@
+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]):
+
 2014-03-19  Alexey Proskuryakov  <ap@apple.com>
 

trunk/Tools/MiniBrowser/mac/WK1BrowserWindowController.m

@@ -261 +261 @@
 - (void)webView:(WebView *)webView decidePolicyForNavigationAction:(NSDictionary *)actionInformation request:(NSURLRequest *)request frame:(WebFrame *)frame decisionListener:(id<WebPolicyDecisionListener>)listener
 {
-    NSLog(@"request %@ actionInformation %@", request, actionInformation);
-
     [listener use];
 }

trunk/Tools/MiniBrowser/mac/WK2BrowserWindowController.m

@@ -43 +43 @@
 @implementation WK2BrowserWindowController {
     WKWebView *_webView;
+    BOOL _zoomTextOnly;
 }
 
@@ -63 +64 @@
     _webView.navigationDelegate = self;
     _webView.UIDelegate = self;
+    
+    _zoomTextOnly = NO;
 }
 
@@ -115 +118 @@
     
     // Disabled until missing WK2 functionality is exposed via API/SPI.
-    if (action == @selector(reload:)
-        || action == @selector(toggleZoomMode:)
-        || action == @selector(resetZoom:)
-        || action == @selector(dumpSourceToConsole:)
+    if (action == @selector(dumpSourceToConsole:)
         || action == @selector(find:))
         return NO;
@@ -126 +126 @@
     else if (action == @selector(removeReinsertWebView:))
         [menuItem setTitle:[_webView window] ? @"Remove Web View" : @"Insert Web View"];
+    else if (action == @selector(toggleZoomMode:))
+        [menuItem setState:_zoomTextOnly ? NSOnState : NSOffState];
     else if ([menuItem action] == @selector(togglePaginationMode:))
         [menuItem setState:[self isPaginated] ? NSOnState : NSOffState];
@@ -138 +140 @@
 - (IBAction)reload:(id)sender
 {
+    [_webView _reload];
 }
 
@@ -157 +160 @@
 - (IBAction)toggleZoomMode:(id)sender
 {
+    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;
+    }
 }
 
 - (IBAction)resetZoom:(id)sender
 {
+    if (![self canResetZoom])
+        return;
+
+    if (_zoomTextOnly)
+        _webView._textZoomFactor = 1;
+    else
+        _webView._pageZoomFactor = 1;
 }
 
 - (BOOL)canResetZoom
 {
-    return NO;
+    return _zoomTextOnly ? (_webView._textZoomFactor != 1) : (_webView._pageZoomFactor != 1);
 }
 
@@ -211 +232 @@
 - (CGFloat)currentZoomFactor
 {
-    return 1;
+    return _zoomTextOnly ? _webView._textZoomFactor : _webView._pageZoomFactor;
 }
 
 - (void)setCurrentZoomFactor:(CGFloat)factor
 {
+    if (_zoomTextOnly)
+        _webView._textZoomFactor = factor;
+    else
+        _webView._pageZoomFactor = factor;
 }
 
 - (BOOL)canZoomIn
 {
-    return NO;
+    return self.currentZoomFactor * DefaultZoomFactorRatio < DefaultMaximumZoomFactor;
 }
 
 - (void)zoomIn:(id)sender
 {
-    if (![self canZoomIn])
-        return;
-
-    CGFloat factor = [self currentZoomFactor] * DefaultZoomFactorRatio;
-    [self setCurrentZoomFactor:factor];
+    if (!self.canZoomIn)
+        return;
+
+    self.currentZoomFactor *= DefaultZoomFactorRatio;
 }
 
 - (BOOL)canZoomOut
 {
-    return NO;
+    return self.currentZoomFactor / DefaultZoomFactorRatio > DefaultMinimumZoomFactor;
 }
 
 - (void)zoomOut:(id)sender
 {
-    if (![self canZoomIn])
-        return;
-
-    CGFloat factor = [self currentZoomFactor] / DefaultZoomFactorRatio;
-    [self setCurrentZoomFactor:factor];
+    if (!self.canZoomIn)
+        return;
+
+    self.currentZoomFactor /= DefaultZoomFactorRatio;
 }
 
@@ -253 +276 @@
 - (IBAction)togglePaginationMode:(id)sender
 {
-    if ([self isPaginated])
+    if (self.isPaginated)
         _webView._paginationMode = _WKPaginationModeUnpaginated;
     else {