Changeset 176238 in webkit

Timestamp:

Nov 17, 2014, 5:13:16 PM (12 years ago)

Author:

Conrad Shultz

Message:

Page previews should be loaded sooner
​https://bugs.webkit.org/show_bug.cgi?id=138814

Reviewed by Tim Horton.

• UIProcess/mac/WKActionMenuController.mm:

(-[WKActionMenuController willOpenMenu:withEvent:]):
Send -_createPreviewPopover..
(-[WKActionMenuController _previewURLFromActionMenu:]):
Relocate some logic to the new -_createPreviewPopover; gate early return on popover visibility.
(-[WKActionMenuController _createPreviewPopover]):
Renamed from -_createPreviewPopoverForURL:originRect:; explicitly send -loadView to warm up the preview view.
(-[WKActionMenuController _createPreviewPopoverForURL:originRect:]): Deleted.

Location:

trunk/Source/WebKit2

Files:

• ChangeLog (modified) (1 diff)
• UIProcess/mac/WKActionMenuController.mm (modified) (2 diffs)

trunk/Source/WebKit2/ChangeLog

@@ +1 @@
+2014-11-17  Conrad Shultz  <conrad_shultz@apple.com>
+
+        Page previews should be loaded sooner
+        https://bugs.webkit.org/show_bug.cgi?id=138814
+
+        Reviewed by Tim Horton.
+
+        * UIProcess/mac/WKActionMenuController.mm:
+        (-[WKActionMenuController willOpenMenu:withEvent:]):
+        Send -_createPreviewPopover..
+        (-[WKActionMenuController _previewURLFromActionMenu:]):
+        Relocate some logic to the new -_createPreviewPopover; gate early return on popover visibility.
+        (-[WKActionMenuController _createPreviewPopover]):
+        Renamed from -_createPreviewPopoverForURL:originRect:; explicitly send -loadView to warm up the preview view.
+        (-[WKActionMenuController _createPreviewPopoverForURL:originRect:]): Deleted.
+
 2014-11-17  Beth Dakin  <bdakin@apple.com>
 

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

@@ -211 +211 @@
 
     if (![self isMenuForTextContent]) {
+#if WK_API_ENABLED
+        [self _createPreviewPopover];
+#endif
         _page->clearSelection();
         return;
@@ -321 +324 @@
 - (void)_previewURLFromActionMenu:(id)sender
 {
+    ASSERT(_previewPopover);
+
     // We might already have a preview showing if the menu item was highlighted earlier.
-    if (_previewPopover)
-        return;
-
+    if ([_previewPopover isShown])
+        return;
+
+    RefPtr<WebHitTestResult> hitTestResult = [self _webHitTestResult];
+    NSRect originRect = hitTestResult->elementBoundingBox();
+    [_previewPopover showRelativeToRect:originRect ofView:_wkView preferredEdge:NSMaxYEdge];
+}
+
+- (void)_createPreviewPopover
+{
     RefPtr<WebHitTestResult> hitTestResult = [self _webHitTestResult];
     NSURL *url = [NSURL _web_URLWithWTFString:hitTestResult->absoluteLinkURL()];
     NSRect originRect = hitTestResult->elementBoundingBox();
-    [self _createPreviewPopoverForURL:url originRect:originRect];
-    [_previewPopover showRelativeToRect:originRect ofView:_wkView preferredEdge:NSMaxYEdge];
-}
-
-- (void)_createPreviewPopoverForURL:(NSURL *)url originRect:(NSRect)originRect
-{
+
     NSSize popoverSize = [self _preferredSizeForPopoverPresentedFromOriginRect:originRect];
     CGFloat actualPopoverToViewScale = popoverSize.width / NSWidth(_wkView.bounds);
     _previewViewController = adoptNS([[WKPagePreviewViewController alloc] initWithPageURL:url mainViewSize:_wkView.bounds.size popoverToViewScale:actualPopoverToViewScale]);
     _previewViewController->_delegate = self;
+    [_previewViewController loadView];
 
     _previewPopover = adoptNS([[NSPopover alloc] init]);