<!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>[175710] trunk/Source</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/175710">175710</a></dd>
<dt>Author</dt> <dd>bdakin@apple.com</dd>
<dt>Date</dt> <dd>2014-11-06 13:03:36 -0800 (Thu, 06 Nov 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Preview views often misplaced inside popover
https://bugs.webkit.org/show_bug.cgi?id=138472
Reviewed by Tim Horton.
Source/WebCore:
* WebCore.exp.in:
Source/WebKit2:
This patch makes the popover maintain aspect ratio, and it uses the final scale of
that popover to scale the preview view as well.
* UIProcess/mac/WKActionMenuController.mm:
(-[WKPagePreviewViewController initWithPageURL:mainViewSize:popoverToViewScale:]):
(-[WKPagePreviewViewController loadView]):
(-[WKActionMenuController _createPreviewPopoverForURL:originRect:]):
(-[WKActionMenuController _targetSize:fitsInAvailableSpace:]):
(-[WKActionMenuController _preferredSizeForPopoverPresentedFromOriginRect:]):
(-[WKPagePreviewViewController initWithPageURL:]): Deleted.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreWebCoreexpin">trunk/Source/WebCore/WebCore.exp.in</a></li>
<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="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (175709 => 175710)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2014-11-06 20:37:04 UTC (rev 175709)
+++ trunk/Source/WebCore/ChangeLog 2014-11-06 21:03:36 UTC (rev 175710)
</span><span class="lines">@@ -1,3 +1,12 @@
</span><ins>+2014-11-06 Beth Dakin <bdakin@apple.com>
+
+ Preview views often misplaced inside popover
+ https://bugs.webkit.org/show_bug.cgi?id=138472
+
+ Reviewed by Tim Horton.
+
+ * WebCore.exp.in:
+
</ins><span class="cx"> 2014-11-06 Michael Saboff <msaboff@apple.com>
</span><span class="cx">
</span><span class="cx"> REGRESSION (r174985-174986): Site display disappears
</span></span></pre></div>
<a id="trunkSourceWebCoreWebCoreexpin"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/WebCore.exp.in (175709 => 175710)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/WebCore.exp.in 2014-11-06 20:37:04 UTC (rev 175709)
+++ trunk/Source/WebCore/WebCore.exp.in 2014-11-06 21:03:36 UTC (rev 175710)
</span><span class="lines">@@ -1088,6 +1088,7 @@
</span><span class="cx"> __ZN7WebCore31equalIgnoringFragmentIdentifierERKNS_3URLES2_
</span><span class="cx"> __ZN7WebCore33deleteAllCookiesModifiedAfterDateERKNS_21NetworkStorageSessionEd
</span><span class="cx"> __ZN7WebCore33stripLeadingAndTrailingHTMLSpacesERKN3WTF6StringE
</span><ins>+__ZN7WebCore36largestRectWithAspectRatioInsideRectEfRKNS_9FloatRectE
</ins><span class="cx"> __ZN7WebCore36standardUserAgentWithApplicationNameERKN3WTF6StringES3_
</span><span class="cx"> __ZN7WebCore37WidgetHierarchyUpdatesSuspensionScope11moveWidgetsEv
</span><span class="cx"> __ZN7WebCore37WidgetHierarchyUpdatesSuspensionScope35s_widgetHierarchyUpdateSuspendCountE
</span></span></pre></div>
<a id="trunkSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/ChangeLog (175709 => 175710)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/ChangeLog 2014-11-06 20:37:04 UTC (rev 175709)
+++ trunk/Source/WebKit2/ChangeLog 2014-11-06 21:03:36 UTC (rev 175710)
</span><span class="lines">@@ -1,3 +1,21 @@
</span><ins>+2014-11-06 Beth Dakin <bdakin@apple.com>
+
+ Preview views often misplaced inside popover
+ https://bugs.webkit.org/show_bug.cgi?id=138472
+
+ Reviewed by Tim Horton.
+
+ This patch makes the popover maintain aspect ratio, and it uses the final scale of
+ that popover to scale the preview view as well.
+
+ * UIProcess/mac/WKActionMenuController.mm:
+ (-[WKPagePreviewViewController initWithPageURL:mainViewSize:popoverToViewScale:]):
+ (-[WKPagePreviewViewController loadView]):
+ (-[WKActionMenuController _createPreviewPopoverForURL:originRect:]):
+ (-[WKActionMenuController _targetSize:fitsInAvailableSpace:]):
+ (-[WKActionMenuController _preferredSizeForPopoverPresentedFromOriginRect:]):
+ (-[WKPagePreviewViewController initWithPageURL:]): Deleted.
+
</ins><span class="cx"> 2014-11-06 Tim Horton <timothy_horton@apple.com>
</span><span class="cx">
</span><span class="cx"> TextIndicatorWindow's bounce animation is lopsided when indicating two short lines of text
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessmacWKActionMenuControllermm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/mac/WKActionMenuController.mm (175709 => 175710)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/mac/WKActionMenuController.mm 2014-11-06 20:37:04 UTC (rev 175709)
+++ trunk/Source/WebKit2/UIProcess/mac/WKActionMenuController.mm 2014-11-06 21:03:36 UTC (rev 175710)
</span><span class="lines">@@ -43,6 +43,7 @@
</span><span class="cx"> #import <ImageIO/ImageIO.h>
</span><span class="cx"> #import <ImageKit/ImageKit.h>
</span><span class="cx"> #import <WebCore/DataDetectorsSPI.h>
</span><ins>+#import <WebCore/GeometryUtilities.h>
</ins><span class="cx"> #import <WebCore/NSSharingServiceSPI.h>
</span><span class="cx"> #import <WebCore/NSSharingServicePickerSPI.h>
</span><span class="cx"> #import <WebCore/NSViewSPI.h>
</span><span class="lines">@@ -73,8 +74,6 @@
</span><span class="cx">
</span><span class="cx"> #if WK_API_ENABLED
</span><span class="cx">
</span><del>-static const CGFloat popoverToViewScale = 0.75;
-
</del><span class="cx"> @class WKPagePreviewViewController;
</span><span class="cx">
</span><span class="cx"> @protocol WKPagePreviewViewControllerDelegate <NSObject>
</span><span class="lines">@@ -86,21 +85,23 @@
</span><span class="cx"> NSSize _mainViewSize;
</span><span class="cx"> RetainPtr<NSURL> _url;
</span><span class="cx"> id <WKPagePreviewViewControllerDelegate> _delegate;
</span><ins>+ CGFloat _popoverToViewScale;
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-- (instancetype)initWithPageURL:(NSURL *)URL;
</del><ins>+- (instancetype)initWithPageURL:(NSURL *)URL mainViewSize:(NSSize)size popoverToViewScale:(CGFloat)scale;
</ins><span class="cx">
</span><span class="cx"> @end
</span><span class="cx">
</span><span class="cx"> @implementation WKPagePreviewViewController
</span><span class="cx">
</span><del>-- (instancetype)initWithPageURL:(NSURL *)URL
</del><ins>+- (instancetype)initWithPageURL:(NSURL *)URL mainViewSize:(NSSize)size popoverToViewScale:(CGFloat)scale
</ins><span class="cx"> {
</span><span class="cx"> if (!(self = [super init]))
</span><span class="cx"> return nil;
</span><span class="cx">
</span><span class="cx"> _url = URL;
</span><del>- _mainViewSize = NSMakeSize(320, 568);
</del><ins>+ _mainViewSize = size;
+ _popoverToViewScale = scale;
</ins><span class="cx">
</span><span class="cx"> return self;
</span><span class="cx"> }
</span><span class="lines">@@ -115,7 +116,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> // Setting the webView bounds will scale it to 75% of the _mainViewSize.
</span><del>- [webView setBounds:NSMakeRect(0, 0, _mainViewSize.width / popoverToViewScale, _mainViewSize.height / popoverToViewScale)];
</del><ins>+ [webView setBounds:NSMakeRect(0, 0, _mainViewSize.width / _popoverToViewScale, _mainViewSize.height / _popoverToViewScale)];
</ins><span class="cx">
</span><span class="cx"> RetainPtr<NSClickGestureRecognizer> clickRecognizer = adoptNS([[NSClickGestureRecognizer alloc] initWithTarget:self action:@selector(_clickRecognized:)]);
</span><span class="cx"> [webView addGestureRecognizer:clickRecognizer.get()];
</span><span class="lines">@@ -309,38 +310,60 @@
</span><span class="cx">
</span><span class="cx"> - (void)_createPreviewPopoverForURL:(NSURL *)url originRect:(NSRect)originRect
</span><span class="cx"> {
</span><del>- RetainPtr<WKPagePreviewViewController> previewViewController = adoptNS([[WKPagePreviewViewController alloc] initWithPageURL:url]);
- previewViewController->_mainViewSize = _wkView.bounds.size;
</del><ins>+ NSSize popoverSize = [self _preferredSizeForPopoverPresentedFromOriginRect:originRect];
+ CGFloat actualPopoverToViewScale = popoverSize.width / NSWidth(_wkView.bounds);
+ RetainPtr<WKPagePreviewViewController> previewViewController = adoptNS([[WKPagePreviewViewController alloc] initWithPageURL:url mainViewSize:_wkView.bounds.size popoverToViewScale:actualPopoverToViewScale]);
</ins><span class="cx"> previewViewController->_delegate = self;
</span><span class="cx">
</span><span class="cx"> _previewPopover = adoptNS([[NSPopover alloc] init]);
</span><span class="cx"> [_previewPopover setBehavior:NSPopoverBehaviorTransient];
</span><del>- [_previewPopover setContentSize:[self _preferredSizeForPopoverPresentedFromOriginRect:originRect]];
</del><ins>+ [_previewPopover setContentSize:popoverSize];
</ins><span class="cx"> [_previewPopover setContentViewController:previewViewController.get()];
</span><span class="cx"> [_previewPopover setDelegate:self];
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+static bool targetSizeFitsInAvailableSpace(NSSize targetSize, NSSize availableSpace)
+{
+ return targetSize.width <= availableSpace.width && targetSize.height <= availableSpace.height;
+}
+
</ins><span class="cx"> - (NSSize)_preferredSizeForPopoverPresentedFromOriginRect:(NSRect)originRect
</span><span class="cx"> {
</span><ins>+ static const CGFloat preferredPopoverToViewScale = 0.75;
</ins><span class="cx"> static const CGFloat screenPadding = 40;
</span><span class="cx">
</span><span class="cx"> NSWindow *window = _wkView.window;
</span><span class="cx"> NSRect originScreenRect = [window convertRectToScreen:[_wkView convertRect:originRect toView:nil]];
</span><span class="cx"> NSRect screenFrame = window.screen.visibleFrame;
</span><span class="cx">
</span><ins>+ NSRect wkViewBounds = _wkView.bounds;
+ NSSize targetSize = NSMakeSize(NSWidth(wkViewBounds) * preferredPopoverToViewScale, NSHeight(wkViewBounds) * preferredPopoverToViewScale);
+
</ins><span class="cx"> CGFloat availableSpaceAbove = NSMaxY(screenFrame) - NSMaxY(originScreenRect);
</span><span class="cx"> CGFloat availableSpaceBelow = NSMinY(originScreenRect) - NSMinY(screenFrame);
</span><span class="cx"> CGFloat maxAvailableVerticalSpace = fmax(availableSpaceAbove, availableSpaceBelow) - screenPadding;
</span><ins>+ NSSize maxSpaceAvailableOnYEdge = NSMakeSize(screenFrame.size.width - screenPadding, maxAvailableVerticalSpace);
+ if (targetSizeFitsInAvailableSpace(targetSize, maxSpaceAvailableOnYEdge))
+ return targetSize;
</ins><span class="cx">
</span><span class="cx"> CGFloat availableSpaceAtLeft = NSMinX(originScreenRect) - NSMinX(screenFrame);
</span><span class="cx"> CGFloat availableSpaceAtRight = NSMaxX(screenFrame) - NSMaxX(originScreenRect);
</span><span class="cx"> CGFloat maxAvailableHorizontalSpace = fmax(availableSpaceAtLeft, availableSpaceAtRight) - screenPadding;
</span><ins>+ NSSize maxSpaceAvailableOnXEdge = NSMakeSize(maxAvailableHorizontalSpace, screenFrame.size.height - screenPadding);
+ if (targetSizeFitsInAvailableSpace(targetSize, maxSpaceAvailableOnXEdge))
+ return targetSize;
</ins><span class="cx">
</span><del>- NSRect wkViewBounds = _wkView.bounds;
- NSSize preferredSize = NSMakeSize(NSWidth(wkViewBounds) * popoverToViewScale, NSHeight(wkViewBounds) * popoverToViewScale);
- preferredSize.width = fmin(preferredSize.width, maxAvailableHorizontalSpace);
- preferredSize.height = fmin(preferredSize.height, maxAvailableVerticalSpace);
- return preferredSize;
</del><ins>+ // If the target size doesn't fit anywhere, we'll find the largest rect that does fit that also maintains the original view's aspect ratio.
+ CGFloat aspectRatio = wkViewBounds.size.width / wkViewBounds.size.height;
+ FloatRect maxVerticalTargetSizePreservingAspectRatioRect = largestRectWithAspectRatioInsideRect(aspectRatio, FloatRect(0, 0, maxSpaceAvailableOnYEdge.width, maxSpaceAvailableOnYEdge.height));
+ FloatRect maxHorizontalTargetSizePreservingAspectRatioRect = largestRectWithAspectRatioInsideRect(aspectRatio, FloatRect(0, 0, maxSpaceAvailableOnXEdge.width, maxSpaceAvailableOnXEdge.height));
+
+ NSSize maxVerticalTargetSizePreservingAspectRatio = NSMakeSize(maxVerticalTargetSizePreservingAspectRatioRect.width(), maxVerticalTargetSizePreservingAspectRatioRect.height());
+ NSSize maxHortizontalTargetSizePreservingAspectRatio = NSMakeSize(maxHorizontalTargetSizePreservingAspectRatioRect.width(), maxHorizontalTargetSizePreservingAspectRatioRect.height());
+
+ if ((maxVerticalTargetSizePreservingAspectRatio.width * maxVerticalTargetSizePreservingAspectRatio.height) > (maxHortizontalTargetSizePreservingAspectRatio.width * maxHortizontalTargetSizePreservingAspectRatio.height))
+ return maxVerticalTargetSizePreservingAspectRatio;
+ return maxHortizontalTargetSizePreservingAspectRatio;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> #endif // WK_API_ENABLED
</span></span></pre>
</div>
</div>
</body>
</html>