<!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>[176666] 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/176666">176666</a></dd>
<dt>Author</dt> <dd>dburkart@apple.com</dd>
<dt>Date</dt> <dd>2014-12-02 09:33:28 -0800 (Tue, 02 Dec 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Merged <a href="http://trac.webkit.org/projects/webkit/changeset/176613">r176613</a>. rdar://problems/19108805</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="#branchessafari6003branchSourceWebKit2UIProcessmacWKActionMenuControllerh">branches/safari-600.3-branch/Source/WebKit2/UIProcess/mac/WKActionMenuController.h</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 (176665 => 176666)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.3-branch/Source/WebKit2/ChangeLog 2014-12-02 17:32:29 UTC (rev 176665)
+++ branches/safari-600.3-branch/Source/WebKit2/ChangeLog 2014-12-02 17:33:28 UTC (rev 176666)
</span><span class="lines">@@ -1,5 +1,37 @@
</span><span class="cx"> 2014-12-02 Dana Burkart <dburkart@apple.com>
</span><span class="cx">
</span><ins>+ Merge r176613. <rdar://problem/19108805>
+
+ 2014-12-01 Conrad Shultz <conrad_shultz@apple.com>
+
+ Clients need a way to explicitly set the title of a page preview
+ https://bugs.webkit.org/show_bug.cgi?id=139161
+
+ Reviewed by Beth Dakin.
+
+ This implicitly assumes that only one page preview can be associate with a given WKView at a time.
+
+ * UIProcess/API/Cocoa/WKViewPrivate.h:
+ * UIProcess/API/mac/WKView.mm:
+ (-[WKView _setPreviewTitle:]):
+ Wrap -[WKActionMenuController setPreviewTitle:]
+
+ * UIProcess/mac/WKActionMenuController.h:
+ * UIProcess/mac/WKActionMenuController.mm:
+ Add ivars for the title and the title text field (previously not independently exposed).
+ (-[WKPagePreviewViewController previewTitle]):
+ Accessor.
+ (-[WKPagePreviewViewController setPreviewTitle:]):
+ Accessor; set the text field's string value.
+ (-[WKPagePreviewViewController loadView]):
+ Adopt the _titleTextField ivar; assume that if a client has explicitly set the previewTitle then we don't
+ need to ask for it again.
+ (-[WKActionMenuController setPreviewTitle:]):
+ Wrap -[WKPagePreviewViewController setPreviewTitle:].
+
+
+2014-12-02 Dana Burkart <dburkart@apple.com>
+
</ins><span class="cx"> Merge r176599. <rdar://problem/18992185>
</span><span class="cx">
</span><span class="cx"> 2014-12-01 Tim Horton <timothy_horton@apple.com>
</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 (176665 => 176666)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.3-branch/Source/WebKit2/UIProcess/API/Cocoa/WKViewPrivate.h 2014-12-02 17:32:29 UTC (rev 176665)
+++ branches/safari-600.3-branch/Source/WebKit2/UIProcess/API/Cocoa/WKViewPrivate.h 2014-12-02 17:33:28 UTC (rev 176666)
</span><span class="lines">@@ -123,6 +123,7 @@
</span><span class="cx">
</span><span class="cx"> - (NSView *)_viewForPreviewingURL:(NSURL *)url initialFrameSize:(NSSize)initialFrameSize;
</span><span class="cx"> - (NSString *)_titleForPreviewOfURL:(NSURL *)url;
</span><ins>+- (void)_setPreviewTitle:(NSString *)previewTitle;
</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 (176665 => 176666)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.3-branch/Source/WebKit2/UIProcess/API/mac/WKView.mm 2014-12-02 17:32:29 UTC (rev 176665)
+++ branches/safari-600.3-branch/Source/WebKit2/UIProcess/API/mac/WKView.mm 2014-12-02 17:33:28 UTC (rev 176666)
</span><span class="lines">@@ -4219,6 +4219,13 @@
</span><span class="cx"> return nil;
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+- (void)_setPreviewTitle:(NSString *)previewTitle
+{
+#if __MAC_OS_X_VERSION_MIN_REQUIRED >= 101000
+ [_data->_actionMenuController setPreviewTitle:previewTitle];
+#endif
+}
+
</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="branchessafari6003branchSourceWebKit2UIProcessmacWKActionMenuControllerh"></a>
<div class="modfile"><h4>Modified: branches/safari-600.3-branch/Source/WebKit2/UIProcess/mac/WKActionMenuController.h (176665 => 176666)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.3-branch/Source/WebKit2/UIProcess/mac/WKActionMenuController.h 2014-12-02 17:32:29 UTC (rev 176665)
+++ branches/safari-600.3-branch/Source/WebKit2/UIProcess/mac/WKActionMenuController.h 2014-12-02 17:33:28 UTC (rev 176666)
</span><span class="lines">@@ -88,6 +88,7 @@
</span><span class="cx"> - (void)didPerformActionMenuHitTest:(const WebKit::ActionMenuHitTestResult&)hitTestResult userData:(API::Object*)userData;
</span><span class="cx">
</span><span class="cx"> - (void)dismissActionMenuPopovers;
</span><ins>+- (void)setPreviewTitle:(NSString *)previewTitle;
</ins><span class="cx">
</span><span class="cx"> @end
</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 (176665 => 176666)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.3-branch/Source/WebKit2/UIProcess/mac/WKActionMenuController.mm 2014-12-02 17:32:29 UTC (rev 176665)
+++ branches/safari-600.3-branch/Source/WebKit2/UIProcess/mac/WKActionMenuController.mm 2014-12-02 17:33:28 UTC (rev 176666)
</span><span class="lines">@@ -88,10 +88,14 @@
</span><span class="cx"> NSSize _mainViewSize;
</span><span class="cx"> RetainPtr<NSURL> _url;
</span><span class="cx"> RetainPtr<NSView> _previewView;
</span><ins>+ RetainPtr<NSTextField> _titleTextField;
+ RetainPtr<NSString> _previewTitle;
</ins><span class="cx"> id <WKPagePreviewViewControllerDelegate> _delegate;
</span><span class="cx"> CGFloat _popoverToViewScale;
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+@property (nonatomic, copy) NSString *previewTitle;
+
</ins><span class="cx"> - (instancetype)initWithPageURL:(NSURL *)URL mainViewSize:(NSSize)size popoverToViewScale:(CGFloat)scale;
</span><span class="cx">
</span><span class="cx"> + (NSSize)previewPadding;
</span><span class="lines">@@ -112,6 +116,21 @@
</span><span class="cx"> return self;
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+- (NSString *)previewTitle
+{
+ return _previewTitle.get();
+}
+
+- (void)setPreviewTitle:(NSString *)previewTitle
+{
+ if ([_previewTitle isEqualToString:previewTitle])
+ return;
+
+ // Keep a separate copy around in case this is received before the view hierarchy is created.
+ _previewTitle = adoptNS([previewTitle copy]);
+ [_titleTextField setStringValue:previewTitle ? previewTitle : @""];
+}
+
</ins><span class="cx"> + (NSSize)previewPadding
</span><span class="cx"> {
</span><span class="cx"> return NSMakeSize(2 * previewViewInset, previewViewTitleHeight + 2 * previewViewInset);
</span><span class="lines">@@ -147,32 +166,34 @@
</span><span class="cx"> [_previewView setFrame:previewFrame];
</span><span class="cx"> [_previewView setAutoresizingMask:NSViewWidthSizable | NSViewHeightSizable];
</span><span class="cx">
</span><del>- 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]];
</del><ins>+ _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]];
</ins><span class="cx">
</span><del>- NSString *title = [_delegate pagePreviewViewController:self titleForPreviewOfURL:_url.get()];
</del><ins>+ NSString *title = _previewTitle.get();
</ins><span class="cx"> if (!title)
</span><ins>+ title = [_delegate pagePreviewViewController:self titleForPreviewOfURL:_url.get()];
+ if (!title)
</ins><span class="cx"> title = [_url absoluteString];
</span><span class="cx">
</span><del>- [titleTextField setStringValue:title ? title : @""];
</del><ins>+ [_titleTextField setStringValue:title ? title : @""];
</ins><span class="cx">
</span><del>- [titleTextField sizeToFit];
- NSSize titleFittingSize = [titleTextField frame].size;
</del><ins>+ [_titleTextField sizeToFit];
+ NSSize titleFittingSize = [_titleTextField frame].size;
</ins><span class="cx"> CGFloat textFieldCenteringOffset = (NSMaxY(containerFrame) - NSMaxY(previewFrame) - titleFittingSize.height) / 2;
</span><span class="cx">
</span><span class="cx"> NSRect titleFrame = previewFrame;
</span><span class="cx"> titleFrame.size.height = titleFittingSize.height;
</span><span class="cx"> titleFrame.origin.y = NSMaxY(previewFrame) + textFieldCenteringOffset;
</span><del>- [titleTextField setFrame:titleFrame];
- [containerView addSubview:titleTextField.get()];
</del><ins>+ [_titleTextField setFrame:titleFrame];
+ [containerView addSubview:_titleTextField.get()];
</ins><span class="cx">
</span><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="lines">@@ -333,6 +354,13 @@
</span><span class="cx"> [self _clearPreviewPopover];
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+- (void)setPreviewTitle:(NSString *)previewTitle
+{
+#if WK_API_ENABLED
+ [_previewViewController setPreviewTitle:previewTitle];
+#endif
+}
+
</ins><span class="cx"> #pragma mark Text Indicator
</span><span class="cx">
</span><span class="cx"> - (void)_showTextIndicator
</span></span></pre>
</div>
</div>
</body>
</html>