<!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>[176652] branches/safari-600.3-branch/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/176652">176652</a></dd>
<dt>Author</dt> <dd>dburkart@apple.com</dd>
<dt>Date</dt> <dd>2014-12-02 07:57:21 -0800 (Tue, 02 Dec 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Merged <a href="http://trac.webkit.org/projects/webkit/changeset/176511">r176511</a>. rdar://problems/19070840</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#branchessafari6003branchSourceWebKit2ChangeLog">branches/safari-600.3-branch/Source/WebKit2/ChangeLog</a></li>
<li><a href="#branchessafari6003branchSourceWebKit2UIProcessAPICocoaWKViewPrivateh">branches/safari-600.3-branch/Source/WebKit2/UIProcess/API/Cocoa/WKViewPrivate.h</a></li>
<li><a href="#branchessafari6003branchSourceWebKit2UIProcessAPImacWKViewmm">branches/safari-600.3-branch/Source/WebKit2/UIProcess/API/mac/WKView.mm</a></li>
<li><a href="#branchessafari6003branchSourceWebKit2UIProcessmacWKActionMenuControllermm">branches/safari-600.3-branch/Source/WebKit2/UIProcess/mac/WKActionMenuController.mm</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="branchessafari6003branchSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: branches/safari-600.3-branch/Source/WebKit2/ChangeLog (176651 => 176652)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.3-branch/Source/WebKit2/ChangeLog 2014-12-02 15:43:48 UTC (rev 176651)
+++ branches/safari-600.3-branch/Source/WebKit2/ChangeLog 2014-12-02 15:57:21 UTC (rev 176652)
</span><span class="lines">@@ -1,3 +1,31 @@
</span><ins>+2014-12-02 Dana Burkart <dburkart@apple.com>
+
+ Merge r176511. <rdar://problem/19070840>
+
+ 2014-11-23 Conrad Shultz <conrad_shultz@apple.com>
+
+ Page previews should have titles
+ https://bugs.webkit.org/show_bug.cgi?id=139020
+
+ Reviewed by Tim Horton.
+
+ * UIProcess/API/Cocoa/WKViewPrivate.h:
+ Declare -_titleForPreviewOfURL:.
+
+ * UIProcess/API/mac/WKView.mm:
+ (-[WKView _titleForPreviewOfURL:]):
+ Stub implementation.
+
+ * UIProcess/mac/WKActionMenuController.mm:
+ (+[WKPagePreviewViewController previewPadding]):
+ Account for the title height.
+ (-[WKPagePreviewViewController loadView]):
+ Set correct autoresize masks on some views; create and configure a title view that is
+ horizontally and vertically centered.
+ (-[WKActionMenuController pagePreviewViewController:titleForPreviewOfURL:]):
+ WKPagePreviewViewControllerDelegate method; wrap -[WKView _titleForPreviewOfURL:].
+
+
</ins><span class="cx"> 2014-11-21 Jer Noble <jer.noble@apple.com>
</span><span class="cx">
</span><span class="cx"> Support multiple signatures of diagnostic logging.
</span></span></pre></div>
<a id="branchessafari6003branchSourceWebKit2UIProcessAPICocoaWKViewPrivateh"></a>
<div class="modfile"><h4>Modified: branches/safari-600.3-branch/Source/WebKit2/UIProcess/API/Cocoa/WKViewPrivate.h (176651 => 176652)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.3-branch/Source/WebKit2/UIProcess/API/Cocoa/WKViewPrivate.h 2014-12-02 15:43:48 UTC (rev 176651)
+++ branches/safari-600.3-branch/Source/WebKit2/UIProcess/API/Cocoa/WKViewPrivate.h 2014-12-02 15:57:21 UTC (rev 176652)
</span><span class="lines">@@ -122,6 +122,7 @@
</span><span class="cx"> - (NSArray *)_actionMenuItemsForHitTestResult:(WKHitTestResultRef)hitTestResult withType:(_WKActionMenuType)type defaultActionMenuItems:(NSArray *)defaultMenuItems userData:(WKTypeRef)userData;
</span><span class="cx">
</span><span class="cx"> - (NSView *)_viewForPreviewingURL:(NSURL *)url initialFrameSize:(NSSize)initialFrameSize;
</span><ins>+- (NSString *)_titleForPreviewOfURL:(NSURL *)url;
</ins><span class="cx"> - (void)_finishPreviewingURL:(NSURL *)url withPreviewView:(NSView *)previewView;
</span><span class="cx"> - (void)_handleClickInPreviewView:(NSView *)previewView URL:(NSURL *)url;
</span><span class="cx"> #endif
</span></span></pre></div>
<a id="branchessafari6003branchSourceWebKit2UIProcessAPImacWKViewmm"></a>
<div class="modfile"><h4>Modified: branches/safari-600.3-branch/Source/WebKit2/UIProcess/API/mac/WKView.mm (176651 => 176652)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.3-branch/Source/WebKit2/UIProcess/API/mac/WKView.mm 2014-12-02 15:43:48 UTC (rev 176651)
+++ branches/safari-600.3-branch/Source/WebKit2/UIProcess/API/mac/WKView.mm 2014-12-02 15:57:21 UTC (rev 176652)
</span><span class="lines">@@ -4214,6 +4214,11 @@
</span><span class="cx"> return nil;
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+- (NSString *)_titleForPreviewOfURL:(NSURL *)url
+{
+ return nil;
+}
+
</ins><span class="cx"> - (void)_finishPreviewingURL:(NSURL *)url withPreviewView:(NSView *)previewView
</span><span class="cx"> {
</span><span class="cx"> }
</span></span></pre></div>
<a id="branchessafari6003branchSourceWebKit2UIProcessmacWKActionMenuControllermm"></a>
<div class="modfile"><h4>Modified: branches/safari-600.3-branch/Source/WebKit2/UIProcess/mac/WKActionMenuController.mm (176651 => 176652)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.3-branch/Source/WebKit2/UIProcess/mac/WKActionMenuController.mm 2014-12-02 15:43:48 UTC (rev 176651)
+++ branches/safari-600.3-branch/Source/WebKit2/UIProcess/mac/WKActionMenuController.mm 2014-12-02 15:57:21 UTC (rev 176652)
</span><span class="lines">@@ -72,11 +72,13 @@
</span><span class="cx"> #if WK_API_ENABLED
</span><span class="cx">
</span><span class="cx"> static const CGFloat previewViewInset = 3;
</span><ins>+static const CGFloat previewViewTitleHeight = 34;
</ins><span class="cx">
</span><span class="cx"> @class WKPagePreviewViewController;
</span><span class="cx">
</span><span class="cx"> @protocol WKPagePreviewViewControllerDelegate <NSObject>
</span><span class="cx"> - (NSView *)pagePreviewViewController:(WKPagePreviewViewController *)pagePreviewViewController viewForPreviewingURL:(NSURL *)url initialFrameSize:(NSSize)initialFrameSize;
</span><ins>+- (NSString *)pagePreviewViewController:(WKPagePreviewViewController *)pagePreviewViewController titleForPreviewOfURL:(NSURL *)url;
</ins><span class="cx"> - (void)pagePreviewViewControllerWasClicked:(WKPagePreviewViewController *)pagePreviewViewController;
</span><span class="cx"> @end
</span><span class="cx">
</span><span class="lines">@@ -111,7 +113,7 @@
</span><span class="cx">
</span><span class="cx"> + (NSSize)previewPadding
</span><span class="cx"> {
</span><del>- return NSMakeSize(2 * previewViewInset, 2 * previewViewInset);
</del><ins>+ return NSMakeSize(2 * previewViewInset, previewViewTitleHeight + 2 * previewViewInset);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> - (void)loadView
</span><span class="lines">@@ -133,14 +135,44 @@
</span><span class="cx">
</span><span class="cx"> NSRect previewFrame = [_previewView frame];
</span><span class="cx"> NSRect containerFrame = previewFrame;
</span><del>- containerFrame.size.width += 2 * previewViewInset;
- containerFrame.size.height += 2 * previewViewInset;
</del><ins>+ NSSize totalPadding = [[self class] previewPadding];
+ containerFrame.size.width += totalPadding.width;
+ containerFrame.size.height += totalPadding.height;
</ins><span class="cx"> previewFrame = NSOffsetRect(previewFrame, previewViewInset, previewViewInset);
</span><span class="cx">
</span><span class="cx"> RetainPtr<NSView> containerView = adoptNS([[NSView alloc] initWithFrame:containerFrame]);
</span><ins>+ [containerView setAutoresizingMask:NSViewWidthSizable | NSViewHeightSizable];
</ins><span class="cx"> [containerView addSubview:_previewView.get()];
</span><span class="cx"> [_previewView setFrame:previewFrame];
</span><ins>+ [_previewView setAutoresizingMask:NSViewWidthSizable | NSViewHeightSizable];
</ins><span class="cx">
</span><ins>+ RetainPtr<NSTextField> titleTextField = adoptNS([[NSTextField alloc] init]);
+ [titleTextField setWantsLayer:YES];
+ [titleTextField setAutoresizingMask:NSViewWidthSizable | NSViewMinYMargin];
+ [titleTextField setEditable:NO];
+ [titleTextField setBezeled:NO];
+ [titleTextField setDrawsBackground:NO];
+ [titleTextField setAlignment:NSCenterTextAlignment];
+ [titleTextField setUsesSingleLineMode:YES];
+ [titleTextField setLineBreakMode:NSLineBreakByTruncatingTail];
+ [titleTextField setTextColor:[NSColor labelColor]];
+
+ NSString *title = [_delegate pagePreviewViewController:self titleForPreviewOfURL:_url.get()];
+ if (!title)
+ title = [_url absoluteString];
+
+ [titleTextField setStringValue:title ? title : @""];
+
+ [titleTextField sizeToFit];
+ NSSize titleFittingSize = [titleTextField frame].size;
+ CGFloat textFieldCenteringOffset = (NSMaxY(containerFrame) - NSMaxY(previewFrame) - titleFittingSize.height) / 2;
+
+ NSRect titleFrame = previewFrame;
+ titleFrame.size.height = titleFittingSize.height;
+ titleFrame.origin.y = NSMaxY(previewFrame) + textFieldCenteringOffset;
+ [titleTextField setFrame:titleFrame];
+ [containerView addSubview:titleTextField.get()];
+
</ins><span class="cx"> // Setting the webView bounds will scale it to 75% of the _mainViewSize.
</span><span class="cx"> [_previewView setBounds:NSMakeRect(0, 0, _mainViewSize.width / _popoverToViewScale, _mainViewSize.height / _popoverToViewScale)];
</span><span class="cx">
</span><span class="lines">@@ -1087,6 +1119,11 @@
</span><span class="cx"> return [_wkView _viewForPreviewingURL:url initialFrameSize:initialFrameSize];
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+- (NSString *)pagePreviewViewController:(WKPagePreviewViewController *)pagePreviewViewController titleForPreviewOfURL:(NSURL *)url
+{
+ return [_wkView _titleForPreviewOfURL:url];
+}
+
</ins><span class="cx"> - (void)pagePreviewViewControllerWasClicked:(WKPagePreviewViewController *)pagePreviewViewController
</span><span class="cx"> {
</span><span class="cx"> if (NSURL *url = pagePreviewViewController->_url.get())
</span></span></pre>
</div>
</div>
</body>
</html>