<!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>[178056] 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/178056">178056</a></dd>
<dt>Author</dt> <dd>bdakin@apple.com</dd>
<dt>Date</dt> <dd>2015-01-07 14:48:07 -0800 (Wed, 07 Jan 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Adopt delegate callbacks so that standardQuickLookMenuItem does not obscure the
link
https://bugs.webkit.org/show_bug.cgi?id=140206
-and corresponding-
rdar://problem/19300492
Reviewed by Tim Horton.
Source/WebCore:
More delegate methods.
* platform/spi/mac/QuickLookMacSPI.h:
Source/WebKit/mac:
Providing and item frame will ensure that the original link is not obscured.
* WebView/WebImmediateActionController.mm:
(elementBoundingBoxInWindowCoordinatesFromNode):
(-[WebImmediateActionController menuItem:itemFrameForPoint:]):
For now use a max size that is smaller than the WebView, with the screen’s aspect
ratio, and scaled down.
(-[WebImmediateActionController menuItem:maxSizeForPoint:]):
Source/WebKit2:
Providing and item frame will ensure that the original link is not obscured.
* UIProcess/mac/WKImmediateActionController.mm:
(-[WKImmediateActionController menuItem:itemFrameForPoint:]):
For now use a max size that is smaller than the WKView, with the screen’s aspect
ratio, and scaled down.
(-[WKImmediateActionController menuItem:maxSizeForPoint:]):</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreplatformspimacQuickLookMacSPIh">trunk/Source/WebCore/platform/spi/mac/QuickLookMacSPI.h</a></li>
<li><a href="#trunkSourceWebKitmacChangeLog">trunk/Source/WebKit/mac/ChangeLog</a></li>
<li><a href="#trunkSourceWebKitmacWebViewWebImmediateActionControllermm">trunk/Source/WebKit/mac/WebView/WebImmediateActionController.mm</a></li>
<li><a href="#trunkSourceWebKit2ChangeLog">trunk/Source/WebKit2/ChangeLog</a></li>
<li><a href="#trunkSourceWebKit2UIProcessmacWKImmediateActionControllermm">trunk/Source/WebKit2/UIProcess/mac/WKImmediateActionController.mm</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (178055 => 178056)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2015-01-07 22:46:10 UTC (rev 178055)
+++ trunk/Source/WebCore/ChangeLog 2015-01-07 22:48:07 UTC (rev 178056)
</span><span class="lines">@@ -1,3 +1,16 @@
</span><ins>+2015-01-07 Beth Dakin <bdakin@apple.com>
+
+ Adopt delegate callbacks so that standardQuickLookMenuItem does not obscure the
+ link
+ https://bugs.webkit.org/show_bug.cgi?id=140206
+ -and corresponding-
+ rdar://problem/19300492
+
+ Reviewed by Tim Horton.
+
+ More delegate methods.
+ * platform/spi/mac/QuickLookMacSPI.h:
+
</ins><span class="cx"> 2015-01-07 Bem Jones-Bey <bjonesbe@adobe.com>
</span><span class="cx">
</span><span class="cx"> [CSS Shapes] Negative raster shape height leads to crash
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformspimacQuickLookMacSPIh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/spi/mac/QuickLookMacSPI.h (178055 => 178056)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/spi/mac/QuickLookMacSPI.h 2015-01-07 22:46:10 UTC (rev 178055)
+++ trunk/Source/WebCore/platform/spi/mac/QuickLookMacSPI.h 2015-01-07 22:48:07 UTC (rev 178056)
</span><span class="lines">@@ -32,6 +32,8 @@
</span><span class="cx"> - (id<QLPreviewItem>)menuItem:(NSMenuItem *)menuItem previewItemAtPoint:(NSPoint)point;
</span><span class="cx"> - (NSRectEdge)menuItem:(NSMenuItem *)menuItem preferredEdgeForPoint:(NSPoint)point;
</span><span class="cx"> - (void)menuItemDidClose:(NSMenuItem *)menuItem;
</span><ins>+- (NSRect)menuItem:(NSMenuItem *)menuItem itemFrameForPoint:(NSPoint)point;
+- (NSSize)menuItem:(NSMenuItem *)menuItem maxSizeForPoint:(NSPoint)point;
</ins><span class="cx">
</span><span class="cx"> @end
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKitmacChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/mac/ChangeLog (178055 => 178056)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/mac/ChangeLog 2015-01-07 22:46:10 UTC (rev 178055)
+++ trunk/Source/WebKit/mac/ChangeLog 2015-01-07 22:48:07 UTC (rev 178056)
</span><span class="lines">@@ -1,3 +1,22 @@
</span><ins>+2015-01-07 Beth Dakin <bdakin@apple.com>
+
+ Adopt delegate callbacks so that standardQuickLookMenuItem does not obscure the
+ link
+ https://bugs.webkit.org/show_bug.cgi?id=140206
+ -and corresponding-
+ rdar://problem/19300492
+
+ Reviewed by Tim Horton.
+
+ Providing and item frame will ensure that the original link is not obscured.
+ * WebView/WebImmediateActionController.mm:
+ (elementBoundingBoxInWindowCoordinatesFromNode):
+ (-[WebImmediateActionController menuItem:itemFrameForPoint:]):
+
+ For now use a max size that is smaller than the WebView, with the screen’s aspect
+ ratio, and scaled down.
+ (-[WebImmediateActionController menuItem:maxSizeForPoint:]):
+
</ins><span class="cx"> 2015-01-07 Anders Carlsson <andersca@apple.com>
</span><span class="cx">
</span><span class="cx"> Give simple HTML documents a database provider
</span></span></pre></div>
<a id="trunkSourceWebKitmacWebViewWebImmediateActionControllermm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/mac/WebView/WebImmediateActionController.mm (178055 => 178056)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/mac/WebView/WebImmediateActionController.mm 2015-01-07 22:46:10 UTC (rev 178055)
+++ trunk/Source/WebKit/mac/WebView/WebImmediateActionController.mm 2015-01-07 22:48:07 UTC (rev 178056)
</span><span class="lines">@@ -44,6 +44,7 @@
</span><span class="cx"> #import <WebCore/FocusController.h>
</span><span class="cx"> #import <WebCore/Frame.h>
</span><span class="cx"> #import <WebCore/FrameView.h>
</span><ins>+#import <WebCore/GeometryUtilities.h>
</ins><span class="cx"> #import <WebCore/HTMLConverter.h>
</span><span class="cx"> #import <WebCore/LookupSPI.h>
</span><span class="cx"> #import <WebCore/NSMenuSPI.h>
</span><span class="lines">@@ -261,6 +262,48 @@
</span><span class="cx"> [self _clearImmediateActionState];
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+static IntRect elementBoundingBoxInWindowCoordinatesFromNode(Node* node)
+{
+ if (!node)
+ return IntRect();
+
+ Frame* frame = node->document().frame();
+ if (!frame)
+ return IntRect();
+
+ FrameView* view = frame->view();
+ if (!view)
+ return IntRect();
+
+ RenderObject* renderer = node->renderer();
+ if (!renderer)
+ return IntRect();
+
+ return view->contentsToWindow(renderer->absoluteBoundingBoxRect());
+}
+
+- (NSRect)menuItem:(NSMenuItem *)menuItem itemFrameForPoint:(NSPoint)point
+{
+ if (!_webView)
+ return NSZeroRect;
+
+ Node* node = _hitTestResult.innerNode();
+ if (!node)
+ return NSZeroRect;
+
+ return elementBoundingBoxInWindowCoordinatesFromNode(node);
+}
+
+- (NSSize)menuItem:(NSMenuItem *)menuItem maxSizeForPoint:(NSPoint)point
+{
+ if (!_webView)
+ return NSZeroSize;
+
+ NSSize screenSize = _webView.window.screen.frame.size;
+ FloatRect largestRect = largestRectWithAspectRatioInsideRect(screenSize.width / screenSize.height, _webView.bounds);
+ return NSMakeSize(largestRect.width() * 0.75, largestRect.height() * 0.75);
+}
+
</ins><span class="cx"> #pragma mark Data Detectors actions
</span><span class="cx">
</span><span class="cx"> - (NSMenuItem *)_menuItemForDataDetectedText
</span></span></pre></div>
<a id="trunkSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/ChangeLog (178055 => 178056)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/ChangeLog 2015-01-07 22:46:10 UTC (rev 178055)
+++ trunk/Source/WebKit2/ChangeLog 2015-01-07 22:48:07 UTC (rev 178056)
</span><span class="lines">@@ -1,3 +1,21 @@
</span><ins>+2015-01-07 Beth Dakin <bdakin@apple.com>
+
+ Adopt delegate callbacks so that standardQuickLookMenuItem does not obscure the
+ link
+ https://bugs.webkit.org/show_bug.cgi?id=140206
+ -and corresponding-
+ rdar://problem/19300492
+
+ Reviewed by Tim Horton.
+
+ Providing and item frame will ensure that the original link is not obscured.
+ * UIProcess/mac/WKImmediateActionController.mm:
+ (-[WKImmediateActionController menuItem:itemFrameForPoint:]):
+
+ For now use a max size that is smaller than the WKView, with the screen’s aspect
+ ratio, and scaled down.
+ (-[WKImmediateActionController menuItem:maxSizeForPoint:]):
+
</ins><span class="cx"> 2015-01-07 Alexey Proskuryakov <ap@apple.com>
</span><span class="cx">
</span><span class="cx"> Release build fix.
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessmacWKImmediateActionControllermm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/mac/WKImmediateActionController.mm (178055 => 178056)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/mac/WKImmediateActionController.mm 2015-01-07 22:46:10 UTC (rev 178055)
+++ trunk/Source/WebKit2/UIProcess/mac/WKImmediateActionController.mm 2015-01-07 22:48:07 UTC (rev 178056)
</span><span class="lines">@@ -35,6 +35,7 @@
</span><span class="cx"> #import "WebPageProxyMessages.h"
</span><span class="cx"> #import "WebProcessProxy.h"
</span><span class="cx"> #import <WebCore/DataDetectorsSPI.h>
</span><ins>+#import <WebCore/GeometryUtilities.h>
</ins><span class="cx"> #import <WebCore/LookupSPI.h>
</span><span class="cx"> #import <WebCore/NSMenuSPI.h>
</span><span class="cx"> #import <WebCore/NSPopoverSPI.h>
</span><span class="lines">@@ -287,6 +288,25 @@
</span><span class="cx"> [self _clearImmediateActionState];
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+- (NSRect)menuItem:(NSMenuItem *)menuItem itemFrameForPoint:(NSPoint)point
+{
+ if (!_wkView)
+ return NSZeroRect;
+
+ RefPtr<WebHitTestResult> hitTestResult = [self _webHitTestResult];
+ return [_wkView convertRect:hitTestResult->elementBoundingBox() toView:nil];
+}
+
+- (NSSize)menuItem:(NSMenuItem *)menuItem maxSizeForPoint:(NSPoint)point
+{
+ if (!_wkView)
+ return NSZeroSize;
+
+ NSSize screenSize = _wkView.window.screen.frame.size;
+ FloatRect largestRect = largestRectWithAspectRatioInsideRect(screenSize.width / screenSize.height, _wkView.bounds);
+ return NSMakeSize(largestRect.width() * 0.75, largestRect.height() * 0.75);
+}
+
</ins><span class="cx"> #pragma mark Data Detectors actions
</span><span class="cx">
</span><span class="cx"> - (NSMenuItem *)_menuItemForDataDetectedText
</span></span></pre>
</div>
</div>
</body>
</html>