<!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>[175589] trunk/Source/WebKit2</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/175589">175589</a></dd>
<dt>Author</dt> <dd>commit-queue@webkit.org</dd>
<dt>Date</dt> <dd>2014-11-04 16:35:29 -0800 (Tue, 04 Nov 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Use a web view for Quick Look in action menus
https://bugs.webkit.org/show_bug.cgi?id=138370
Patch by Conrad Shultz <conrad_shultz@apple.com> on 2014-11-04
Reviewed by Anders Carlsson.
Instead of using the QLPreviewBubble SPI, show a popover containing a web view. This currently
does not inherit any configuration from the presenting WKView and does not expose any
customization options.
* UIProcess/mac/WKActionMenuController.mm:
Declare new internal NSViewController subclass, WKPagePreviewViewController.
(-[WKPagePreviewViewController initWithPageURL:]):
Store the passed-in URL and set a somewhat arbitrary (iPhone 5 screen size) default preferred size.
(-[WKPagePreviewViewController loadView]):
Create a WKWebView and load the URL passed into the initializer.
(-[WKActionMenuController _previewURLFromActionMenu:]):
Renamed from -_quickLookURLFromActionMenu:; present the popover returned by -_createPreviewPopoverForURL:.
(-[WKActionMenuController _createPreviewPopoverForURL:]):
New helper method; return a popover that owns a _WKPagePreviewViewController configured to show a scaled-down web page.
(-[WKActionMenuController _createActionMenuItemForTag:]):
Update to reflect method rename.
(-[WKActionMenuController _quickLookURLFromActionMenu:]): Deleted.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebKit2ChangeLog">trunk/Source/WebKit2/ChangeLog</a></li>
<li><a href="#trunkSourceWebKit2UIProcessmacWKActionMenuControllermm">trunk/Source/WebKit2/UIProcess/mac/WKActionMenuController.mm</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/ChangeLog (175588 => 175589)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/ChangeLog 2014-11-05 00:31:37 UTC (rev 175588)
+++ trunk/Source/WebKit2/ChangeLog 2014-11-05 00:35:29 UTC (rev 175589)
</span><span class="lines">@@ -1,3 +1,28 @@
</span><ins>+2014-11-04 Conrad Shultz <conrad_shultz@apple.com>
+
+ Use a web view for Quick Look in action menus
+ https://bugs.webkit.org/show_bug.cgi?id=138370
+
+ Reviewed by Anders Carlsson.
+
+ Instead of using the QLPreviewBubble SPI, show a popover containing a web view. This currently
+ does not inherit any configuration from the presenting WKView and does not expose any
+ customization options.
+
+ * UIProcess/mac/WKActionMenuController.mm:
+ Declare new internal NSViewController subclass, WKPagePreviewViewController.
+ (-[WKPagePreviewViewController initWithPageURL:]):
+ Store the passed-in URL and set a somewhat arbitrary (iPhone 5 screen size) default preferred size.
+ (-[WKPagePreviewViewController loadView]):
+ Create a WKWebView and load the URL passed into the initializer.
+ (-[WKActionMenuController _previewURLFromActionMenu:]):
+ Renamed from -_quickLookURLFromActionMenu:; present the popover returned by -_createPreviewPopoverForURL:.
+ (-[WKActionMenuController _createPreviewPopoverForURL:]):
+ New helper method; return a popover that owns a _WKPagePreviewViewController configured to show a scaled-down web page.
+ (-[WKActionMenuController _createActionMenuItemForTag:]):
+ Update to reflect method rename.
+ (-[WKActionMenuController _quickLookURLFromActionMenu:]): Deleted.
+
</ins><span class="cx"> 2014-11-04 Chris Dumez <cdumez@apple.com>
</span><span class="cx">
</span><span class="cx"> Add ptr() method to Ref class
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessmacWKActionMenuControllermm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/mac/WKActionMenuController.mm (175588 => 175589)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/mac/WKActionMenuController.mm 2014-11-05 00:31:37 UTC (rev 175588)
+++ trunk/Source/WebKit2/UIProcess/mac/WKActionMenuController.mm 2014-11-05 00:35:29 UTC (rev 175589)
</span><span class="lines">@@ -31,6 +31,7 @@
</span><span class="cx"> #import "TextIndicator.h"
</span><span class="cx"> #import "WKNSURLExtras.h"
</span><span class="cx"> #import "WKViewInternal.h"
</span><ins>+#import "WKWebView.h"
</ins><span class="cx"> #import "WebContext.h"
</span><span class="cx"> #import "WebKitSystemInterface.h"
</span><span class="cx"> #import "WebPageMessages.h"
</span><span class="lines">@@ -52,17 +53,6 @@
</span><span class="cx"> MenuNeedsUpdate
</span><span class="cx"> };
</span><span class="cx">
</span><del>-// FIXME: This should move into an SPI header if it stays.
-@class QLPreviewBubble;
-@interface NSObject (WKQLPreviewBubbleDetails)
-@property (copy) NSArray * controls;
-@property NSSize maximumSize;
-@property NSRectEdge preferredEdge;
-@property (retain) IBOutlet NSWindow* parentWindow;
-- (void)showPreviewItem:(id)previewItem itemFrame:(NSRect)frame;
-- (void)setAutomaticallyCloseWithMask:(NSEventMask)autocloseMask filterMask:(NSEventMask)filterMask block:(void (^)(void))block;
-@end
-
</del><span class="cx"> SOFT_LINK_FRAMEWORK_IN_UMBRELLA(Quartz, ImageKit)
</span><span class="cx"> SOFT_LINK_CLASS(ImageKit, IKSlideshow)
</span><span class="cx">
</span><span class="lines">@@ -80,6 +70,43 @@
</span><span class="cx"> - (NSArray *)_actionMenuItemsForHitTestResult:(WKHitTestResultRef)hitTestResult defaultActionMenuItems:(NSArray *)defaultMenuItems;
</span><span class="cx"> @end
</span><span class="cx">
</span><ins>+@interface WKPagePreviewViewController : NSViewController {
+@public
+ NSSize _preferredSize;
+
+@private
+ RetainPtr<NSURL> _url;
+}
+
+- (instancetype)initWithPageURL:(NSURL *)URL;
+
+@end
+
+@implementation WKPagePreviewViewController
+
+- (instancetype)initWithPageURL:(NSURL *)URL
+{
+ if (!(self = [super init]))
+ return nil;
+
+ _url = URL;
+ _preferredSize = NSMakeSize(320, 568);
+
+ return self;
+}
+
+- (void)loadView
+{
+ WKWebView *webView = [[WKWebView alloc] initWithFrame:NSMakeRect(0, 0, _preferredSize.width, _preferredSize.height)];
+ if (_url) {
+ NSURLRequest *request = [NSURLRequest requestWithURL:_url.get()];
+ [webView loadRequest:request];
+ }
+ [self setView:webView];
+}
+
+@end
+
</ins><span class="cx"> @implementation WKActionMenuController
</span><span class="cx">
</span><span class="cx"> - (instancetype)initWithPage:(WebPageProxy&)page view:(WKView *)wkView
</span><span class="lines">@@ -207,23 +234,24 @@
</span><span class="cx"> [service performWithItems:@[ [NSURL _web_URLWithWTFString:hitTestResult->absoluteLinkURL()] ]];
</span><span class="cx"> }
</span><span class="cx">
</span><del>-- (void)_quickLookURLFromActionMenu:(id)sender
</del><ins>+- (void)_previewURLFromActionMenu:(id)sender
</ins><span class="cx"> {
</span><span class="cx"> WebHitTestResult* hitTestResult = _page->lastMouseMoveHitTestResult();
</span><del>- NSRect itemFrame = [_wkView convertRect:hitTestResult->elementBoundingBox() toView:nil];
- NSSize maximumPreviewSize = NSMakeSize(_wkView.bounds.size.width * 0.75, _wkView.bounds.size.height * 0.75);
</del><ins>+ NSURL *url = [NSURL _web_URLWithWTFString:hitTestResult->absoluteLinkURL()];
+ RetainPtr<NSPopover> popover = [self _createPreviewPopoverForURL:url];
+ [popover showRelativeToRect:hitTestResult->elementBoundingBox() ofView:_wkView preferredEdge:NSMaxYEdge];
+}
</ins><span class="cx">
</span><del>- RetainPtr<QLPreviewBubble> bubble = adoptNS([[NSClassFromString(@"QLPreviewBubble") alloc] init]);
- [bubble setParentWindow:_wkView.window];
- [bubble setMaximumSize:maximumPreviewSize];
- [bubble setPreferredEdge:NSMaxYEdge];
- [bubble setControls:@[ ]];
- NSEventMask filterMask = NSAnyEventMask & ~(NSAppKitDefinedMask | NSSystemDefinedMask | NSApplicationDefinedMask | NSMouseEnteredMask | NSMouseExitedMask);
- NSEventMask autocloseMask = NSLeftMouseDownMask | NSRightMouseDownMask | NSKeyDownMask;
- [bubble setAutomaticallyCloseWithMask:autocloseMask filterMask:filterMask block:[bubble] {
- [bubble close];
- }];
- [bubble showPreviewItem:[NSURL _web_URLWithWTFString:hitTestResult->absoluteLinkURL()] itemFrame:itemFrame];
</del><ins>+- (RetainPtr<NSPopover>)_createPreviewPopoverForURL:(NSURL *)url
+{
+ RetainPtr<WKPagePreviewViewController> previewViewController = adoptNS([[WKPagePreviewViewController alloc] initWithPageURL:url]);
+ NSRect wkViewBounds = [_wkView bounds];
+ previewViewController->_preferredSize = NSMakeSize(NSWidth(wkViewBounds) * 0.75, NSHeight(wkViewBounds) * 0.75);
+
+ RetainPtr<NSPopover> popover = adoptNS([[NSPopover alloc] init]);
+ [popover setBehavior:NSPopoverBehaviorTransient];
+ [popover setContentViewController:previewViewController.get()];
+ return popover;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> #pragma mark Image actions
</span><span class="lines">@@ -503,7 +531,7 @@
</span><span class="cx"> break;
</span><span class="cx">
</span><span class="cx"> case kWKContextActionItemTagPreviewLink:
</span><del>- selector = @selector(_quickLookURLFromActionMenu:);
</del><ins>+ selector = @selector(_previewURLFromActionMenu:);
</ins><span class="cx"> title = @"Preview";
</span><span class="cx"> image = [NSImage imageNamed:@"NSActionMenuQuickLook"];
</span><span class="cx"> break;
</span></span></pre>
</div>
</div>
</body>
</html>