<!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>[175680] 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/175680">175680</a></dd>
<dt>Author</dt> <dd>dburkart@apple.com</dd>
<dt>Date</dt> <dd>2014-11-05 22:29:11 -0800 (Wed, 05 Nov 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Merged <a href="http://trac.webkit.org/projects/webkit/changeset/175643">r175643</a>. <rdar://problems/18885782></pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#branchessafari6003branchSourceWebKit2ChangeLog">branches/safari-600.3-branch/Source/WebKit2/ChangeLog</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 (175679 => 175680)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.3-branch/Source/WebKit2/ChangeLog 2014-11-06 06:07:06 UTC (rev 175679)
+++ branches/safari-600.3-branch/Source/WebKit2/ChangeLog 2014-11-06 06:29:11 UTC (rev 175680)
</span><span class="lines">@@ -1,5 +1,32 @@
</span><span class="cx"> 2014-11-05 Dana Burkart <dburkart@apple.com>
</span><span class="cx">
</span><ins>+ Merge r175643. <rdar://problem/18885782>
+
+ 2014-11-05 Conrad Shultz <conrad_shultz@apple.com>
+
+ Page preview popovers sometimes cover their originating element
+ https://bugs.webkit.org/show_bug.cgi?id=138437
+
+ Reviewed by Beth Dakin.
+
+ If a popover is sufficiently large, and the originating element is in a particular location, it's
+ possible that the popover can't be positioned in a manner that doesn't occlude the originating element.
+ Address this by scaling down the popover content if it can't fit entirely between the originating
+ element and the screen edge.
+
+ * UIProcess/mac/WKActionMenuController.mm:
+ (-[WKActionMenuController _previewURLFromActionMenu:]):
+ Update to use -_createPreviewPopoverForURL:originRect:.
+ (-[WKActionMenuController _createPreviewPopoverForURL:originRect:]):
+ Renamed from -_createPreviewPopoverForURL:; extract code to -_preferredSizeForPopoverPresentedFromOriginRect:.
+ (-[WKActionMenuController _preferredSizeForPopoverPresentedFromOriginRect:]):
+ Compute a size that is as large as possible while keeping the popover between the origin rect and screen edge
+ (with an arbitrary padding applied to keep from directly abutting the screen edge).
+ (-[WKActionMenuController _createPreviewPopoverForURL:]): Deleted.
+
+
+2014-11-05 Dana Burkart <dburkart@apple.com>
+
</ins><span class="cx"> Merge r175637. <rdar://problem/18877675>
</span><span class="cx">
</span><span class="cx"> 2014-11-05 Tim Horton <timothy_horton@apple.com>
</span></span></pre></div>
<a id="branchessafari6003branchSourceWebKit2UIProcessmacWKActionMenuControllermm"></a>
<div class="modfile"><h4>Modified: branches/safari-600.3-branch/Source/WebKit2/UIProcess/mac/WKActionMenuController.mm (175679 => 175680)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.3-branch/Source/WebKit2/UIProcess/mac/WKActionMenuController.mm 2014-11-06 06:07:06 UTC (rev 175679)
+++ branches/safari-600.3-branch/Source/WebKit2/UIProcess/mac/WKActionMenuController.mm 2014-11-06 06:29:11 UTC (rev 175680)
</span><span class="lines">@@ -283,23 +283,48 @@
</span><span class="cx">
</span><span class="cx"> WebHitTestResult* hitTestResult = _page->lastMouseMoveHitTestResult();
</span><span class="cx"> NSURL *url = [NSURL _web_URLWithWTFString:hitTestResult->absoluteLinkURL()];
</span><del>- [self _createPreviewPopoverForURL:url];
- [_previewPopover showRelativeToRect:hitTestResult->elementBoundingBox() ofView:_wkView preferredEdge:NSMaxYEdge];
</del><ins>+ NSRect originRect = hitTestResult->elementBoundingBox();
+ [self _createPreviewPopoverForURL:url originRect:originRect];
+ [_previewPopover showRelativeToRect:originRect ofView:_wkView preferredEdge:NSMaxYEdge];
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-- (void)_createPreviewPopoverForURL:(NSURL *)url
</del><ins>+- (void)_createPreviewPopoverForURL:(NSURL *)url originRect:(NSRect)originRect
</ins><span class="cx"> {
</span><span class="cx"> RetainPtr<WKPagePreviewViewController> previewViewController = adoptNS([[WKPagePreviewViewController alloc] initWithPageURL:url]);
</span><del>- NSRect wkViewBounds = [_wkView bounds];
- previewViewController->_preferredSize = NSMakeSize(NSWidth(wkViewBounds) * 0.75, NSHeight(wkViewBounds) * 0.75);
</del><ins>+ previewViewController->_preferredSize = [self _preferredSizeForPopoverPresentedFromOriginRect:originRect];
</ins><span class="cx">
</span><span class="cx"> _previewPopover = adoptNS([[NSPopover alloc] init]);
</span><span class="cx"> [_previewPopover setBehavior:NSPopoverBehaviorTransient];
</span><span class="cx"> [_previewPopover setContentViewController:previewViewController.get()];
</span><span class="cx"> [_previewPopover setDelegate:self];
</span><span class="cx"> }
</span><del>-#endif
</del><span class="cx">
</span><ins>+- (NSSize)_preferredSizeForPopoverPresentedFromOriginRect:(NSRect)originRect
+{
+ static const CGFloat preferredPopoverToWKViewScale = 0.75;
+ static const CGFloat screenPadding = 40;
+
+ NSWindow *window = _wkView.window;
+ NSRect originScreenRect = [window convertRectToScreen:[_wkView convertRect:originRect toView:nil]];
+ NSRect screenFrame = window.screen.visibleFrame;
+
+ CGFloat availableSpaceAbove = NSMaxY(screenFrame) - NSMaxY(originScreenRect);
+ CGFloat availableSpaceBelow = NSMinY(originScreenRect) - NSMinY(screenFrame);
+ CGFloat maxAvailableVerticalSpace = fmax(availableSpaceAbove, availableSpaceBelow) - screenPadding;
+
+ CGFloat availableSpaceAtLeft = NSMinX(originScreenRect) - NSMinX(screenFrame);
+ CGFloat availableSpaceAtRight = NSMaxX(screenFrame) - NSMaxX(originScreenRect);
+ CGFloat maxAvailableHorizontalSpace = fmax(availableSpaceAtLeft, availableSpaceAtRight) - screenPadding;
+
+ NSRect wkViewBounds = _wkView.bounds;
+ NSSize preferredSize = NSMakeSize(NSWidth(wkViewBounds) * preferredPopoverToWKViewScale, NSHeight(wkViewBounds) * preferredPopoverToWKViewScale);
+ preferredSize.width = fmin(preferredSize.width, maxAvailableHorizontalSpace);
+ preferredSize.height = fmin(preferredSize.height, maxAvailableVerticalSpace);
+ return preferredSize;
+}
+
+#endif // WK_API_ENABLED
+
</ins><span class="cx"> #pragma mark Image actions
</span><span class="cx">
</span><span class="cx"> - (NSArray *)_defaultMenuItemsForImage
</span></span></pre>
</div>
</div>
</body>
</html>