<!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>[168875] branches/safari-538.34-branch/Source/WebKit/mac</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/168875">168875</a></dd>
<dt>Author</dt> <dd>matthew_hanson@apple.com</dd>
<dt>Date</dt> <dd>2014-05-14 17:20:49 -0700 (Wed, 14 May 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Merge <a href="http://trac.webkit.org/projects/webkit/changeset/168847">r168847</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#branchessafari53834branchSourceWebKitmacChangeLog">branches/safari-538.34-branch/Source/WebKit/mac/ChangeLog</a></li>
<li><a href="#branchessafari53834branchSourceWebKitmacMiscWebSharingServicePickerControllermm">branches/safari-538.34-branch/Source/WebKit/mac/Misc/WebSharingServicePickerController.mm</a></li>
<li><a href="#branchessafari53834branchSourceWebKitmacWebCoreSupportWebContextMenuClienth">branches/safari-538.34-branch/Source/WebKit/mac/WebCoreSupport/WebContextMenuClient.h</a></li>
<li><a href="#branchessafari53834branchSourceWebKitmacWebCoreSupportWebContextMenuClientmm">branches/safari-538.34-branch/Source/WebKit/mac/WebCoreSupport/WebContextMenuClient.mm</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="branchessafari53834branchSourceWebKitmacChangeLog"></a>
<div class="modfile"><h4>Modified: branches/safari-538.34-branch/Source/WebKit/mac/ChangeLog (168874 => 168875)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-538.34-branch/Source/WebKit/mac/ChangeLog 2014-05-15 00:16:42 UTC (rev 168874)
+++ branches/safari-538.34-branch/Source/WebKit/mac/ChangeLog 2014-05-15 00:20:49 UTC (rev 168875)
</span><span class="lines">@@ -1,3 +1,29 @@
</span><ins>+2014-05-14 Matthew Hanson <matthew_hanson@apple.com>
+
+ Merge r168847.
+
+ 2014-05-14 Brady Eidson <beidson@apple.com>
+
+ sourceFrameOnScreenForShareItem: can be off by a pixel
+ <rdar://problem/16878020> and https://bugs.webkit.org/show_bug.cgi?id=132911
+
+ Reviewed by Simon Fraser.
+
+ In a land of LayoutUnits and sub-pixel rendering, converting between IntRects and
+ FloatRects can be error prone. So we now try to minimize such conversions.
+
+ * Misc/WebSharingServicePickerController.mm:
+ (-[WebSharingServicePickerController sharingService:sourceFrameOnScreenForShareItem:]):
+
+ * WebCoreSupport/WebContextMenuClient.h:
+ * WebCoreSupport/WebContextMenuClient.mm:
+ (WebContextMenuClient::clientFloatRectForNode): Split this into a separate utility method
+ as it will be shared with other code very soon. Instead of using absoluteBoundingBoxRect()
+ which does lossy float->int conversions, try to keep things in terms of FloatRects as
+ much as possible.
+ (WebContextMenuClient::screenRectForHitTestNode): Call clientFloatRectForNode to get the
+ FloatRect, then perform the lossy rounding conversion to an IntRect only once.
+
</ins><span class="cx"> 2014-05-14 Dean Jackson <dino@apple.com>
</span><span class="cx">
</span><span class="cx"> Disable some features on the safari-538.34 branch.
</span></span></pre></div>
<a id="branchessafari53834branchSourceWebKitmacMiscWebSharingServicePickerControllermm"></a>
<div class="modfile"><h4>Modified: branches/safari-538.34-branch/Source/WebKit/mac/Misc/WebSharingServicePickerController.mm (168874 => 168875)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-538.34-branch/Source/WebKit/mac/Misc/WebSharingServicePickerController.mm 2014-05-15 00:16:42 UTC (rev 168874)
+++ branches/safari-538.34-branch/Source/WebKit/mac/Misc/WebSharingServicePickerController.mm 2014-05-15 00:20:49 UTC (rev 168875)
</span><span class="lines">@@ -207,9 +207,9 @@
</span><span class="cx"> - (NSRect)sharingService:(NSSharingService *)sharingService sourceFrameOnScreenForShareItem:(id <NSPasteboardWriting>)item
</span><span class="cx"> {
</span><span class="cx"> if (!_menuClient)
</span><del>- return NSRect();
</del><ins>+ return NSZeroRect;
</ins><span class="cx">
</span><del>- return (NSRect)_menuClient->screenRectForHitTestNode();
</del><ins>+ return _menuClient->screenRectForHitTestNode();
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> - (NSWindow *)sharingService:(NSSharingService *)sharingService sourceWindowForShareItems:(NSArray *)items sharingContentScope:(NSSharingContentScope *)sharingContentScope
</span></span></pre></div>
<a id="branchessafari53834branchSourceWebKitmacWebCoreSupportWebContextMenuClienth"></a>
<div class="modfile"><h4>Modified: branches/safari-538.34-branch/Source/WebKit/mac/WebCoreSupport/WebContextMenuClient.h (168874 => 168875)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-538.34-branch/Source/WebKit/mac/WebCoreSupport/WebContextMenuClient.h 2014-05-15 00:16:42 UTC (rev 168874)
+++ branches/safari-538.34-branch/Source/WebKit/mac/WebCoreSupport/WebContextMenuClient.h 2014-05-15 00:20:49 UTC (rev 168875)
</span><span class="lines">@@ -32,6 +32,10 @@
</span><span class="cx"> @class WebSharingServicePickerController;
</span><span class="cx"> @class WebView;
</span><span class="cx">
</span><ins>+namespace WebCore {
+class Node;
+}
+
</ins><span class="cx"> class WebContextMenuClient : public WebCore::ContextMenuClient {
</span><span class="cx"> public:
</span><span class="cx"> WebContextMenuClient(WebView *webView);
</span><span class="lines">@@ -51,7 +55,7 @@
</span><span class="cx"> virtual void searchWithSpotlight() override;
</span><span class="cx"> virtual void showContextMenu() override;
</span><span class="cx">
</span><del>- WebCore::IntRect screenRectForHitTestNode() const;
</del><ins>+ NSRect screenRectForHitTestNode() const;
</ins><span class="cx">
</span><span class="cx"> #if ENABLE(SERVICE_CONTROLS)
</span><span class="cx"> void clearSharingServicePickerController();
</span><span class="lines">@@ -62,6 +66,8 @@
</span><span class="cx"> private:
</span><span class="cx"> NSMenu *contextMenuForEvent(NSEvent *, NSView *);
</span><span class="cx">
</span><ins>+ bool clientFloatRectForNode(WebCore::Node&, WebCore::FloatRect&) const;
+
</ins><span class="cx"> WebView *m_webView;
</span><span class="cx"> #if ENABLE(SERVICE_CONTROLS)
</span><span class="cx"> RetainPtr<WebSharingServicePickerController> m_sharingServicePickerController;
</span></span></pre></div>
<a id="branchessafari53834branchSourceWebKitmacWebCoreSupportWebContextMenuClientmm"></a>
<div class="modfile"><h4>Modified: branches/safari-538.34-branch/Source/WebKit/mac/WebCoreSupport/WebContextMenuClient.mm (168874 => 168875)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-538.34-branch/Source/WebKit/mac/WebCoreSupport/WebContextMenuClient.mm 2014-05-15 00:16:42 UTC (rev 168874)
+++ branches/safari-538.34-branch/Source/WebKit/mac/WebCoreSupport/WebContextMenuClient.mm 2014-05-15 00:20:49 UTC (rev 168875)
</span><span class="lines">@@ -47,14 +47,15 @@
</span><span class="cx"> #import <WebCore/ContextMenu.h>
</span><span class="cx"> #import <WebCore/ContextMenuController.h>
</span><span class="cx"> #import <WebCore/Document.h>
</span><del>-#import <WebCore/URL.h>
</del><ins>+#import <WebCore/Frame.h>
+#import <WebCore/FrameView.h>
</ins><span class="cx"> #import <WebCore/LocalizedStrings.h>
</span><span class="cx"> #import <WebCore/Page.h>
</span><ins>+#import <WebCore/RenderBox.h>
</ins><span class="cx"> #import <WebCore/RenderObject.h>
</span><span class="cx"> #import <WebCore/SharedBuffer.h>
</span><del>-#import <WebCore/Frame.h>
-#import <WebCore/FrameView.h>
</del><span class="cx"> #import <WebCore/RuntimeApplicationChecks.h>
</span><ins>+#import <WebCore/URL.h>
</ins><span class="cx"> #import <WebKitLegacy/DOMPrivate.h>
</span><span class="cx">
</span><span class="cx"> using namespace WebCore;
</span><span class="lines">@@ -364,32 +365,52 @@
</span><span class="cx"> [NSApp stopSpeaking:nil];
</span><span class="cx"> }
</span><span class="cx">
</span><del>-IntRect WebContextMenuClient::screenRectForHitTestNode() const
</del><ins>+bool WebContextMenuClient::clientFloatRectForNode(Node& node, FloatRect& rect) const
</ins><span class="cx"> {
</span><ins>+ RenderObject* renderer = node.renderer();
+ if (!renderer) {
+ // This method shouldn't be called in cases where the controlled node hasn't rendered.
+ ASSERT_NOT_REACHED();
+ return false;
+ }
+
+ if (!renderer->isBox())
+ return false;
+ RenderBox* renderBox = toRenderBox(renderer);
+
+ LayoutRect layoutRect = renderBox->clientBoxRect();
+ FloatQuad floatQuad = renderBox->localToAbsoluteQuad(FloatQuad(layoutRect));
+ rect = floatQuad.boundingBox();
+
+ return true;
+}
+
+NSRect WebContextMenuClient::screenRectForHitTestNode() const
+{
</ins><span class="cx"> Page* page = [m_webView page];
</span><span class="cx"> if (!page)
</span><del>- return IntRect();
</del><ins>+ return NSZeroRect;
</ins><span class="cx">
</span><span class="cx"> Node* node = page->contextMenuController().context().hitTestResult().innerNode();
</span><span class="cx"> if (!node)
</span><del>- return IntRect();
</del><ins>+ return NSZeroRect;
</ins><span class="cx">
</span><del>- RenderObject* renderer = node->renderer();
- if (!renderer) {
- // This method shouldn't be called in cases where the controlled node hasn't rendered.
- ASSERT_NOT_REACHED();
- return IntRect();
- }
-
- IntRect rect = renderer->absoluteBoundingBoxRect();
</del><span class="cx"> FrameView* frameView = node->document().view();
</span><span class="cx"> if (!frameView) {
</span><span class="cx"> // This method shouldn't be called in cases where the controlled node isn't in a rendered view.
</span><span class="cx"> ASSERT_NOT_REACHED();
</span><del>- return IntRect();
</del><ins>+ return NSZeroRect;
</ins><span class="cx"> }
</span><span class="cx">
</span><del>- return frameView->contentsToScreen(rect);
</del><ins>+ FloatRect rect;
+ if (!clientFloatRectForNode(*node, rect))
+ return NSZeroRect;
+
+ // FIXME: https://webkit.org/b/132915
+ // Ideally we'd like to convert the content rect to screen coordinates without the lossy float -> int conversion.
+ // Creating a rounded int rect works well in practice, but might still lead to off-by-one-pixel problems in edge cases.
+ IntRect intRect = roundedIntRect(rect);
+ return frameView->contentsToScreen(intRect);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> NSMenu *WebContextMenuClient::contextMenuForEvent(NSEvent *event, NSView *view)
</span></span></pre>
</div>
</div>
</body>
</html>