<!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>[202524] trunk/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/202524">202524</a></dd>
<dt>Author</dt> <dd>timothy_horton@apple.com</dd>
<dt>Date</dt> <dd>2016-06-27 17:33:28 -0700 (Mon, 27 Jun 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>REGRESSION (<a href="http://trac.webkit.org/projects/webkit/changeset/189052">r189052</a>): Clipping occurs when using context menu to Look Up words within the Dictionary app
https://bugs.webkit.org/show_bug.cgi?id=159184
<rdar://problem/26370206>
Reviewed by Beth Dakin.
* WebView/WebHTMLView.mm:
(-[WebHTMLView _lookUpInDictionaryFromMenu:]):
* WebView/WebImmediateActionController.h:
* WebView/WebImmediateActionController.mm:
(+[WebImmediateActionController _dictionaryPopupInfoForRange:inFrame:withLookupOptions:indicatorOptions:transition:]):
(-[WebImmediateActionController _animationControllerForText]):
(dictionaryPopupInfoForRange): Deleted.
WebImmediateActionController's code to make a DictionaryPopupInfo and TextIndicator
from a Range in WebKit1 is much better than WebHTMLView's; use it in both cases.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebKitmacChangeLog">trunk/Source/WebKit/mac/ChangeLog</a></li>
<li><a href="#trunkSourceWebKitmacWebViewWebHTMLViewmm">trunk/Source/WebKit/mac/WebView/WebHTMLView.mm</a></li>
<li><a href="#trunkSourceWebKitmacWebViewWebImmediateActionControllerh">trunk/Source/WebKit/mac/WebView/WebImmediateActionController.h</a></li>
<li><a href="#trunkSourceWebKitmacWebViewWebImmediateActionControllermm">trunk/Source/WebKit/mac/WebView/WebImmediateActionController.mm</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebKitmacChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/mac/ChangeLog (202523 => 202524)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/mac/ChangeLog 2016-06-28 00:26:31 UTC (rev 202523)
+++ trunk/Source/WebKit/mac/ChangeLog 2016-06-28 00:33:28 UTC (rev 202524)
</span><span class="lines">@@ -1,3 +1,21 @@
</span><ins>+2016-06-27 Tim Horton <timothy_horton@apple.com>
+
+ REGRESSION (r189052): Clipping occurs when using context menu to Look Up words within the Dictionary app
+ https://bugs.webkit.org/show_bug.cgi?id=159184
+ <rdar://problem/26370206>
+
+ Reviewed by Beth Dakin.
+
+ * WebView/WebHTMLView.mm:
+ (-[WebHTMLView _lookUpInDictionaryFromMenu:]):
+ * WebView/WebImmediateActionController.h:
+ * WebView/WebImmediateActionController.mm:
+ (+[WebImmediateActionController _dictionaryPopupInfoForRange:inFrame:withLookupOptions:indicatorOptions:transition:]):
+ (-[WebImmediateActionController _animationControllerForText]):
+ (dictionaryPopupInfoForRange): Deleted.
+ WebImmediateActionController's code to make a DictionaryPopupInfo and TextIndicator
+ from a Range in WebKit1 is much better than WebHTMLView's; use it in both cases.
+
</ins><span class="cx"> 2016-06-24 Jer Noble <jer.noble@apple.com>
</span><span class="cx">
</span><span class="cx"> Playback controls refer to wrong element when playing multiple items in a page.
</span></span></pre></div>
<a id="trunkSourceWebKitmacWebViewWebHTMLViewmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/mac/WebView/WebHTMLView.mm (202523 => 202524)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/mac/WebView/WebHTMLView.mm 2016-06-28 00:26:31 UTC (rev 202523)
+++ trunk/Source/WebKit/mac/WebView/WebHTMLView.mm 2016-06-28 00:33:28 UTC (rev 202524)
</span><span class="lines">@@ -6360,30 +6360,15 @@
</span><span class="cx">
</span><span class="cx"> - (void)_lookUpInDictionaryFromMenu:(id)sender
</span><span class="cx"> {
</span><del>- // Dictionary API will accept a whitespace-only string and display UI as if it were real text,
- // so bail out early to avoid that.
- if ([[[self selectedString] _webkit_stringByTrimmingWhitespace] length] == 0)
- return;
-
- NSAttributedString *attrString = [self selectedAttributedString];
-
</del><span class="cx"> Frame* coreFrame = core([self _frame]);
</span><span class="cx"> if (!coreFrame)
</span><span class="cx"> return;
</span><span class="cx">
</span><del>- NSRect rect = coreFrame->selection().selectionBounds();
</del><ins>+ RefPtr<Range> selectionRange = coreFrame->selection().selection().firstRange();
+ if (!selectionRange)
+ return;
</ins><span class="cx">
</span><del>- NSDictionary *attributes = [attrString fontAttributesInRange:NSMakeRange(0, 1)];
- NSFont *font = [attributes objectForKey:NSFontAttributeName];
- if (font)
- rect.origin.y += [font descender];
-
- DictionaryPopupInfo info;
- info.attributedString = attrString;
- info.origin = coreFrame->view()->contentsToWindow(enclosingIntRect(rect)).location();
- if (auto textIndicator = TextIndicator::createWithSelectionInFrame(*coreFrame, TextIndicatorOptionIncludeSnapshotWithSelectionHighlight, TextIndicatorPresentationTransition::BounceAndCrossfade))
- info.textIndicator = textIndicator->data();
- [[self _webView] _showDictionaryLookupPopup:info];
</del><ins>+ [[self _webView] _showDictionaryLookupPopup:[WebImmediateActionController _dictionaryPopupInfoForRange:*selectionRange inFrame:coreFrame withLookupOptions:nil indicatorOptions:TextIndicatorOptionIncludeSnapshotWithSelectionHighlight transition:TextIndicatorPresentationTransition::BounceAndCrossfade]];
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> - (void)quickLookWithEvent:(NSEvent *)event
</span></span></pre></div>
<a id="trunkSourceWebKitmacWebViewWebImmediateActionControllerh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/mac/WebView/WebImmediateActionController.h (202523 => 202524)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/mac/WebView/WebImmediateActionController.h 2016-06-28 00:26:31 UTC (rev 202523)
+++ trunk/Source/WebKit/mac/WebView/WebImmediateActionController.h 2016-06-28 00:33:28 UTC (rev 202524)
</span><span class="lines">@@ -28,12 +28,20 @@
</span><span class="cx"> #import "WebUIDelegatePrivate.h"
</span><span class="cx"> #import <WebCore/HitTestResult.h>
</span><span class="cx"> #import <WebCore/NSImmediateActionGestureRecognizerSPI.h>
</span><ins>+#import <WebCore/TextIndicator.h>
</ins><span class="cx"> #import <wtf/RetainPtr.h>
</span><span class="cx">
</span><span class="cx"> @class DDActionContext;
</span><span class="cx"> @class QLPreviewMenuItem;
</span><ins>+@class NSDictionary;
</ins><span class="cx"> @class WebView;
</span><span class="cx">
</span><ins>+namespace WebCore {
+class Frame;
+class Range;
+struct DictionaryPopupInfo;
+};
+
</ins><span class="cx"> @interface WebImmediateActionController : NSObject <NSImmediateActionGestureRecognizerDelegate> {
</span><span class="cx"> @private
</span><span class="cx"> WebView *_webView;
</span><span class="lines">@@ -55,6 +63,8 @@
</span><span class="cx">
</span><span class="cx"> - (NSImmediateActionGestureRecognizer *)immediateActionRecognizer;
</span><span class="cx">
</span><ins>++ (WebCore::DictionaryPopupInfo)_dictionaryPopupInfoForRange:(WebCore::Range&)range inFrame:(WebCore::Frame*)frame withLookupOptions:(NSDictionary *)lookupOptions indicatorOptions:(WebCore::TextIndicatorOptions)indicatorOptions transition:(WebCore::TextIndicatorPresentationTransition)presentationTransition;
+
</ins><span class="cx"> @end
</span><span class="cx">
</span><span class="cx"> #endif // PLATFORM(MAC)
</span></span></pre></div>
<a id="trunkSourceWebKitmacWebViewWebImmediateActionControllermm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/mac/WebView/WebImmediateActionController.mm (202523 => 202524)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/mac/WebView/WebImmediateActionController.mm 2016-06-28 00:26:31 UTC (rev 202523)
+++ trunk/Source/WebKit/mac/WebView/WebImmediateActionController.mm 2016-06-28 00:33:28 UTC (rev 202524)
</span><span class="lines">@@ -502,12 +502,14 @@
</span><span class="cx">
</span><span class="cx"> #pragma mark Text action
</span><span class="cx">
</span><del>-static DictionaryPopupInfo dictionaryPopupInfoForRange(Frame* frame, Range& range, NSDictionary *options, TextIndicatorPresentationTransition presentationTransition)
</del><ins>++ (DictionaryPopupInfo)_dictionaryPopupInfoForRange:(Range&)range inFrame:(Frame*)frame withLookupOptions:(NSDictionary *)lookupOptions indicatorOptions:(TextIndicatorOptions)indicatorOptions transition:(TextIndicatorPresentationTransition)presentationTransition
</ins><span class="cx"> {
</span><ins>+ // Dictionary API will accept a whitespace-only string and display UI as if it were real text,
+ // so bail out early to avoid that.
</ins><span class="cx"> DictionaryPopupInfo popupInfo;
</span><span class="cx"> if (range.text().stripWhiteSpace().isEmpty())
</span><span class="cx"> return popupInfo;
</span><del>-
</del><ins>+
</ins><span class="cx"> RenderObject* renderer = range.startContainer().renderer();
</span><span class="cx"> const RenderStyle& style = renderer->style();
</span><span class="cx">
</span><span class="lines">@@ -519,13 +521,13 @@
</span><span class="cx"> IntRect rangeRect = frame->view()->contentsToWindow(quads[0].enclosingBoundingBox());
</span><span class="cx">
</span><span class="cx"> popupInfo.origin = NSMakePoint(rangeRect.x(), rangeRect.y() + (style.fontMetrics().descent() * frame->page()->pageScaleFactor()));
</span><del>- popupInfo.options = options;
</del><ins>+ popupInfo.options = lookupOptions;
</ins><span class="cx">
</span><span class="cx"> NSAttributedString *nsAttributedString = editingAttributedStringFromRange(range, IncludeImagesInAttributedString::No);
</span><span class="cx"> RetainPtr<NSMutableAttributedString> scaledNSAttributedString = adoptNS([[NSMutableAttributedString alloc] initWithString:[nsAttributedString string]]);
</span><span class="cx"> NSFontManager *fontManager = [NSFontManager sharedFontManager];
</span><span class="cx">
</span><del>- [nsAttributedString enumerateAttributesInRange:NSMakeRange(0, [nsAttributedString length]) options:0 usingBlock:^(NSDictionary *attributes, NSRange range, BOOL *stop) {
</del><ins>+ [nsAttributedString enumerateAttributesInRange:NSMakeRange(0, [nsAttributedString length]) options:0 usingBlock:^(NSDictionary *attributes, NSRange attributeRange, BOOL *stop) {
</ins><span class="cx"> RetainPtr<NSMutableDictionary> scaledAttributes = adoptNS([attributes mutableCopy]);
</span><span class="cx">
</span><span class="cx"> NSFont *font = [scaledAttributes objectForKey:NSFontAttributeName];
</span><span class="lines">@@ -534,12 +536,12 @@
</span><span class="cx"> [scaledAttributes setObject:font forKey:NSFontAttributeName];
</span><span class="cx"> }
</span><span class="cx">
</span><del>- [scaledNSAttributedString addAttributes:scaledAttributes.get() range:range];
</del><ins>+ [scaledNSAttributedString addAttributes:scaledAttributes.get() range:attributeRange];
</ins><span class="cx"> }];
</span><span class="cx">
</span><span class="cx"> popupInfo.attributedString = scaledNSAttributedString.get();
</span><span class="cx">
</span><del>- if (auto textIndicator = TextIndicator::createWithRange(range, TextIndicatorOptionDefault, presentationTransition))
</del><ins>+ if (auto textIndicator = TextIndicator::createWithRange(range, indicatorOptions, presentationTransition))
</ins><span class="cx"> popupInfo.textIndicator = textIndicator->data();
</span><span class="cx"> return popupInfo;
</span><span class="cx"> }
</span><span class="lines">@@ -562,8 +564,7 @@
</span><span class="cx"> if (!dictionaryRange)
</span><span class="cx"> return nil;
</span><span class="cx">
</span><del>- RefPtr<Range> selectionRange = frame->page()->focusController().focusedOrMainFrame().selection().selection().firstRange();
- DictionaryPopupInfo dictionaryPopupInfo = dictionaryPopupInfoForRange(frame, *dictionaryRange, options, TextIndicatorPresentationTransition::FadeIn);
</del><ins>+ DictionaryPopupInfo dictionaryPopupInfo = [WebImmediateActionController _dictionaryPopupInfoForRange:*dictionaryRange inFrame:frame withLookupOptions:options indicatorOptions:TextIndicatorOptionDefault transition: TextIndicatorPresentationTransition::FadeIn];
</ins><span class="cx"> if (!dictionaryPopupInfo.attributedString)
</span><span class="cx"> return nil;
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>