<!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>[177474] 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/177474">177474</a></dd>
<dt>Author</dt> <dd>matthew_hanson@apple.com</dd>
<dt>Date</dt> <dd>2014-12-17 16:25:14 -0800 (Wed, 17 Dec 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Merge <a href="http://trac.webkit.org/projects/webkit/changeset/177402">r177402</a>. rdar://problem/19266297</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="#branchessafari6003branchSourceWebKit2UIProcessmacWKImmediateActionControllerh">branches/safari-600.3-branch/Source/WebKit2/UIProcess/mac/WKImmediateActionController.h</a></li>
<li><a href="#branchessafari6003branchSourceWebKit2UIProcessmacWKImmediateActionControllermm">branches/safari-600.3-branch/Source/WebKit2/UIProcess/mac/WKImmediateActionController.mm</a></li>
<li><a href="#branchessafari6003branchSourceWebKit2UIProcessmacWKPagePreviewViewControllerh">branches/safari-600.3-branch/Source/WebKit2/UIProcess/mac/WKPagePreviewViewController.h</a></li>
<li><a href="#branchessafari6003branchSourceWebKit2UIProcessmacWKPagePreviewViewControllermm">branches/safari-600.3-branch/Source/WebKit2/UIProcess/mac/WKPagePreviewViewController.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 (177473 => 177474)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.3-branch/Source/WebKit2/ChangeLog 2014-12-18 00:15:19 UTC (rev 177473)
+++ branches/safari-600.3-branch/Source/WebKit2/ChangeLog 2014-12-18 00:25:14 UTC (rev 177474)
</span><span class="lines">@@ -1,3 +1,35 @@
</span><ins>+2014-12-17 Matthew Hanson <matthew_hanson@apple.com>
+
+ Merge r177402. rdar://problem/19266297
+
+ 2014-12-16 Conrad Shultz <conrad_shultz@apple.com>
+
+ Add a progress indicator to the preview popover
+ https://bugs.webkit.org/show_bug.cgi?id=139699
+
+ Reviewed by Tim Horton.
+
+ * UIProcess/API/Cocoa/WKViewPrivate.h:
+ * UIProcess/API/mac/WKView.mm:
+ (-[WKView _setPreviewLoading:]):
+ Wrap -[WKImmediateActionController setPreviewLoading:].
+
+ * UIProcess/mac/WKImmediateActionController.h:
+ * UIProcess/mac/WKImmediateActionController.mm:
+ (-[WKImmediateActionController _createPreviewPopoverIfNeededForURL:]):
+ Flag the preview view controller as loading before beginning the load.
+ (-[WKImmediateActionController setPreviewLoading:]):
+ Wrap -[WKPagePreviewViewController setLoading:].
+
+ * UIProcess/mac/WKPagePreviewViewController.h:
+ * UIProcess/mac/WKPagePreviewViewController.mm:
+ (-[WKPagePreviewViewController setLoading:]):
+ Toggle the progress indicator animation state.
+ (-[WKPagePreviewViewController isLoading]):
+ Accessor.
+ (-[WKPagePreviewViewController loadView]):
+ Create and center an indeterminate progress indicator that won't scale with the preview content.
+
</ins><span class="cx"> 2014-12-16 Matthew Hanson <matthew_hanson@apple.com>
</span><span class="cx">
</span><span class="cx"> Merge r177406. rdar://problem/19270279
</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 (177473 => 177474)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.3-branch/Source/WebKit2/UIProcess/API/Cocoa/WKViewPrivate.h 2014-12-18 00:15:19 UTC (rev 177473)
+++ branches/safari-600.3-branch/Source/WebKit2/UIProcess/API/Cocoa/WKViewPrivate.h 2014-12-18 00:25:14 UTC (rev 177474)
</span><span class="lines">@@ -131,6 +131,7 @@
</span><span class="cx"> - (NSView *)_viewForPreviewingURL:(NSURL *)url initialFrameSize:(NSSize)initialFrameSize;
</span><span class="cx"> - (NSString *)_titleForPreviewOfURL:(NSURL *)url;
</span><span class="cx"> - (void)_setPreviewTitle:(NSString *)previewTitle;
</span><ins>+- (void)_setPreviewLoading:(BOOL)loading;
</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"> - (BOOL)_shouldUseStandardQuickLookPreview;
</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 (177473 => 177474)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.3-branch/Source/WebKit2/UIProcess/API/mac/WKView.mm 2014-12-18 00:15:19 UTC (rev 177473)
+++ branches/safari-600.3-branch/Source/WebKit2/UIProcess/API/mac/WKView.mm 2014-12-18 00:25:14 UTC (rev 177474)
</span><span class="lines">@@ -4349,6 +4349,13 @@
</span><span class="cx"> #endif
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+- (void)_setPreviewLoading:(BOOL)loading
+{
+#if __MAC_OS_X_VERSION_MIN_REQUIRED >= 101000 && WK_API_ENABLED
+ [_data->_immediateActionController setPreviewLoading:loading];
+#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="branchessafari6003branchSourceWebKit2UIProcessmacWKImmediateActionControllerh"></a>
<div class="modfile"><h4>Modified: branches/safari-600.3-branch/Source/WebKit2/UIProcess/mac/WKImmediateActionController.h (177473 => 177474)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.3-branch/Source/WebKit2/UIProcess/mac/WKImmediateActionController.h 2014-12-18 00:15:19 UTC (rev 177473)
+++ branches/safari-600.3-branch/Source/WebKit2/UIProcess/mac/WKImmediateActionController.h 2014-12-18 00:25:14 UTC (rev 177474)
</span><span class="lines">@@ -80,6 +80,7 @@
</span><span class="cx"> #if WK_API_ENABLED
</span><span class="cx"> - (void)hidePreview;
</span><span class="cx"> - (void)setPreviewTitle:(NSString *)previewTitle;
</span><ins>+- (void)setPreviewLoading:(BOOL)loading;
</ins><span class="cx"> #endif // WK_API_ENABLED
</span><span class="cx">
</span><span class="cx"> @end
</span></span></pre></div>
<a id="branchessafari6003branchSourceWebKit2UIProcessmacWKImmediateActionControllermm"></a>
<div class="modfile"><h4>Modified: branches/safari-600.3-branch/Source/WebKit2/UIProcess/mac/WKImmediateActionController.mm (177473 => 177474)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.3-branch/Source/WebKit2/UIProcess/mac/WKImmediateActionController.mm 2014-12-18 00:15:19 UTC (rev 177473)
+++ branches/safari-600.3-branch/Source/WebKit2/UIProcess/mac/WKImmediateActionController.mm 2014-12-18 00:25:14 UTC (rev 177474)
</span><span class="lines">@@ -287,6 +287,7 @@
</span><span class="cx">
</span><span class="cx"> _previewViewController = adoptNS([[WKPagePreviewViewController alloc] initWithPageURL:url mainViewSize:_wkView.bounds.size popoverToViewScale:actualPopoverToViewScale]);
</span><span class="cx"> _previewViewController->_delegate = self;
</span><ins>+ [_previewViewController setLoading:YES];
</ins><span class="cx"> [_previewViewController loadView];
</span><span class="cx">
</span><span class="cx"> _previewPopover = adoptNS([[NSPopover alloc] init]);
</span><span class="lines">@@ -315,6 +316,11 @@
</span><span class="cx"> [_previewViewController setPreviewTitle:previewTitle];
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+- (void)setPreviewLoading:(BOOL)loading
+{
+ [_previewViewController setLoading:loading];
+}
+
</ins><span class="cx"> - (void)popoverWillClose:(NSNotification *)notification
</span><span class="cx"> {
</span><span class="cx"> [self hidePreview];
</span></span></pre></div>
<a id="branchessafari6003branchSourceWebKit2UIProcessmacWKPagePreviewViewControllerh"></a>
<div class="modfile"><h4>Modified: branches/safari-600.3-branch/Source/WebKit2/UIProcess/mac/WKPagePreviewViewController.h (177473 => 177474)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.3-branch/Source/WebKit2/UIProcess/mac/WKPagePreviewViewController.h 2014-12-18 00:15:19 UTC (rev 177473)
+++ branches/safari-600.3-branch/Source/WebKit2/UIProcess/mac/WKPagePreviewViewController.h 2014-12-18 00:25:14 UTC (rev 177474)
</span><span class="lines">@@ -49,11 +49,14 @@
</span><span class="cx"> RetainPtr<NSView> _previewView;
</span><span class="cx"> RetainPtr<NSTextField> _titleTextField;
</span><span class="cx"> RetainPtr<NSString> _previewTitle;
</span><ins>+ RetainPtr<NSProgressIndicator> _spinner;
+ BOOL _loading;
</ins><span class="cx"> id <WKPagePreviewViewControllerDelegate> _delegate;
</span><span class="cx"> CGFloat _popoverToViewScale;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> @property (nonatomic, copy) NSString *previewTitle;
</span><ins>+@property (nonatomic, getter=isLoading) BOOL loading;
</ins><span class="cx">
</span><span class="cx"> - (instancetype)initWithPageURL:(NSURL *)URL mainViewSize:(NSSize)size popoverToViewScale:(CGFloat)scale;
</span><span class="cx">
</span></span></pre></div>
<a id="branchessafari6003branchSourceWebKit2UIProcessmacWKPagePreviewViewControllermm"></a>
<div class="modfile"><h4>Modified: branches/safari-600.3-branch/Source/WebKit2/UIProcess/mac/WKPagePreviewViewController.mm (177473 => 177474)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.3-branch/Source/WebKit2/UIProcess/mac/WKPagePreviewViewController.mm 2014-12-18 00:15:19 UTC (rev 177473)
+++ branches/safari-600.3-branch/Source/WebKit2/UIProcess/mac/WKPagePreviewViewController.mm 2014-12-18 00:25:14 UTC (rev 177474)
</span><span class="lines">@@ -67,6 +67,24 @@
</span><span class="cx"> return NSMakeSize(2 * previewViewInset, previewViewTitleHeight + 2 * previewViewInset);
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+- (void)setLoading:(BOOL)loading
+{
+ if (_loading == loading)
+ return;
+
+ _loading = loading;
+
+ if (_loading)
+ [_spinner startAnimation:nil];
+ else
+ [_spinner stopAnimation:nil];
+}
+
+- (BOOL)isLoading
+{
+ return _loading;
+}
+
</ins><span class="cx"> - (void)loadView
</span><span class="cx"> {
</span><span class="cx"> NSRect defaultFrame = NSMakeRect(0, 0, _mainViewSize.width, _mainViewSize.height);
</span><span class="lines">@@ -126,6 +144,22 @@
</span><span class="cx"> [_titleTextField setFrame:titleFrame];
</span><span class="cx"> [containerView addSubview:_titleTextField.get()];
</span><span class="cx">
</span><ins>+ NSSize spinnerSize = NSMakeSize(48, 48);
+ NSRect spinnerFrame = NSMakeRect(NSMidX(containerFrame), NSMidY(containerFrame), 0, 0);
+ spinnerFrame = NSInsetRect(spinnerFrame, -spinnerSize.width * 0.5, -spinnerSize.height * 0.5);
+ spinnerFrame.origin.x = floor(spinnerFrame.origin.x);
+ spinnerFrame.origin.y = floor(spinnerFrame.origin.y);
+
+ _spinner = adoptNS([[NSProgressIndicator alloc] initWithFrame:spinnerFrame]);
+ [_spinner setStyle:NSProgressIndicatorSpinningStyle];
+ [_spinner setDisplayedWhenStopped:NO];
+ [_spinner setAutoresizingMask:NSViewMinXMargin | NSViewMaxXMargin | NSViewMinYMargin | NSViewMaxYMargin];
+ [_spinner setAppearance:[NSAppearance appearanceNamed:NSAppearanceNameAqua]];
+ if (_loading)
+ [_spinner startAnimation:nil];
+
+ [containerView addSubview:_spinner.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></pre>
</div>
</div>
</body>
</html>