Changeset 175985 in webkit

Timestamp:

Nov 11, 2014 3:59:41 PM (9 years ago)

Author:

Conrad Shultz

Message:

Clients should be notified when a page preview finishes
​https://bugs.webkit.org/show_bug.cgi?id=138635

Reviewed by Tim Horton.

Add SPI to WKView to allow clients to do any cleanup that might be necessary when the preview closes.

• UIProcess/API/Cocoa/WKViewPrivate.h:

Declare new SPI.

• UIProcess/API/mac/WKView.mm:

(-[WKView _finishPreviewingURL:withPreviewView:]):
Stub SPI implementation.

• UIProcess/mac/WKActionMenuController.h:

Add an ivar for the preview view controller.

• UIProcess/mac/WKActionMenuController.mm:

(-[WKActionMenuController _createPreviewPopoverForURL:originRect:]):
Update to use the ivar.
(-[WKActionMenuController _clearPreviewPopover]):
Send -_finishPreviewingURL:withPreviewView: and nil out the view controller ivar.

Location:

trunk/Source/WebKit2

Files:

• ChangeLog (modified) (1 diff)
• UIProcess/API/Cocoa/WKViewPrivate.h (modified) (1 diff)
• UIProcess/API/mac/WKView.mm (modified) (1 diff)
• UIProcess/mac/WKActionMenuController.h (modified) (2 diffs)
• UIProcess/mac/WKActionMenuController.mm (modified) (2 diffs)

trunk/Source/WebKit2/ChangeLog

@@ +1 @@
+2014-11-11  Conrad Shultz  <conrad_shultz@apple.com>
+
+        Clients should be notified when a page preview finishes
+        https://bugs.webkit.org/show_bug.cgi?id=138635
+
+        Reviewed by Tim Horton.
+
+        Add SPI to WKView to allow clients to do any cleanup that might be necessary when the preview closes.
+
+        * UIProcess/API/Cocoa/WKViewPrivate.h:
+        Declare new SPI.
+
+        * UIProcess/API/mac/WKView.mm:
+        (-[WKView _finishPreviewingURL:withPreviewView:]):
+        Stub SPI implementation.
+
+        * UIProcess/mac/WKActionMenuController.h:
+        Add an ivar for the preview view controller.
+
+        * UIProcess/mac/WKActionMenuController.mm:
+        (-[WKActionMenuController _createPreviewPopoverForURL:originRect:]):
+        Update to use the ivar.
+        (-[WKActionMenuController _clearPreviewPopover]):
+        Send -_finishPreviewingURL:withPreviewView: and nil out the view controller ivar.
+
 2014-11-11  Tim Horton  <timothy_horton@apple.com>
 

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

@@ -124 +124 @@
 
 - (NSView *)_viewForPreviewingURL:(NSURL *)url initialFrameSize:(NSSize)initialFrameSize;
+- (void)_finishPreviewingURL:(NSURL *)url withPreviewView:(NSView *)previewView;
 #endif
 

trunk/Source/WebKit2/UIProcess/API/mac/WKView.mm

@@ -4195 +4195 @@
 }
 
+- (void)_finishPreviewingURL:(NSURL *)url withPreviewView:(NSView *)previewView
+{
+}
+
 #if __MAC_OS_X_VERSION_MIN_REQUIRED >= 101000
 

trunk/Source/WebKit2/UIProcess/mac/WKActionMenuController.h

@@ -47 +47 @@
 @class WKView;
 
+#if WK_API_ENABLED
+@class WKPagePreviewViewController;
+#endif
+
 @interface WKActionMenuController : NSObject <NSMenuDelegate> {
 @private
@@ -61 +65 @@
     BOOL _isShowingTextIndicator;
     BOOL _shouldKeepPreviewPopoverOpen;
+
+#if WK_API_ENABLED
+    RetainPtr<WKPagePreviewViewController> _previewViewController;
+#endif
 }
 

trunk/Source/WebKit2/UIProcess/mac/WKActionMenuController.mm

@@ -326 +326 @@
     NSSize popoverSize = [self _preferredSizeForPopoverPresentedFromOriginRect:originRect];
     CGFloat actualPopoverToViewScale = popoverSize.width / NSWidth(_wkView.bounds);
-    RetainPtr<WKPagePreviewViewController> previewViewController = adoptNS([[WKPagePreviewViewController alloc] initWithPageURL:url mainViewSize:_wkView.bounds.size popoverToViewScale:actualPopoverToViewScale]);
-    previewViewController->_delegate = self;
+    _previewViewController = adoptNS([[WKPagePreviewViewController alloc] initWithPageURL:url mainViewSize:_wkView.bounds.size popoverToViewScale:actualPopoverToViewScale]);
+    _previewViewController->_delegate = self;
 
     _previewPopover = adoptNS([[NSPopover alloc] init]);
     [_previewPopover setBehavior:NSPopoverBehaviorTransient];
     [_previewPopover setContentSize:popoverSize];
-    [_previewPopover setContentViewController:previewViewController.get()];
+    [_previewPopover setContentViewController:_previewViewController.get()];
     [_previewPopover setDelegate:self];
 }
@@ -385 +385 @@
 {
 #if WK_API_ENABLED
-    if (WKPagePreviewViewController *pagePreviewViewController = (WKPagePreviewViewController *)[_previewPopover contentViewController])
-        pagePreviewViewController->_delegate = nil;
+    if (_previewViewController) {
+        _previewViewController->_delegate = nil;
+        [_wkView _finishPreviewingURL:_previewViewController->_url.get() withPreviewView:[_previewViewController view]];
+        _previewViewController = nil;
+    }
 #endif