<!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>[192090] 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/192090">192090</a></dd>
<dt>Author</dt> <dd>commit-queue@webkit.org</dd>
<dt>Date</dt> <dd>2015-11-05 20:25:39 -0800 (Thu, 05 Nov 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Unreviewed, rolling out <a href="http://trac.webkit.org/projects/webkit/changeset/192089">r192089</a>.
https://bugs.webkit.org/show_bug.cgi?id=150966
This change broke an existing layout test on Yosemite and
Mavericks (Requested by ryanhaddad on #webkit).
Reverted changeset:
"Preview on apple.com/contact with all text selected shows a
map"
https://bugs.webkit.org/show_bug.cgi?id=150963
http://trac.webkit.org/changeset/192089</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreeditingmacDictionaryLookuph">trunk/Source/WebCore/editing/mac/DictionaryLookup.h</a></li>
<li><a href="#trunkSourceWebCoreeditingmacDictionaryLookupmm">trunk/Source/WebCore/editing/mac/DictionaryLookup.mm</a></li>
<li><a href="#trunkSourceWebKit2ChangeLog">trunk/Source/WebKit2/ChangeLog</a></li>
<li><a href="#trunkSourceWebKit2WebProcessWebPagemacWebPageMacmm">trunk/Source/WebKit2/WebProcess/WebPage/mac/WebPageMac.mm</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (192089 => 192090)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2015-11-06 00:38:32 UTC (rev 192089)
+++ trunk/Source/WebCore/ChangeLog 2015-11-06 04:25:39 UTC (rev 192090)
</span><span class="lines">@@ -1,3 +1,18 @@
</span><ins>+2015-11-05 Commit Queue <commit-queue@webkit.org>
+
+ Unreviewed, rolling out r192089.
+ https://bugs.webkit.org/show_bug.cgi?id=150966
+
+ This change broke an existing layout test on Yosemite and
+ Mavericks (Requested by ryanhaddad on #webkit).
+
+ Reverted changeset:
+
+ "Preview on apple.com/contact with all text selected shows a
+ map"
+ https://bugs.webkit.org/show_bug.cgi?id=150963
+ http://trac.webkit.org/changeset/192089
+
</ins><span class="cx"> 2015-11-05 Tim Horton <timothy_horton@apple.com>
</span><span class="cx">
</span><span class="cx"> Preview on apple.com/contact with all text selected shows a map
</span></span></pre></div>
<a id="trunkSourceWebCoreeditingmacDictionaryLookuph"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/editing/mac/DictionaryLookup.h (192089 => 192090)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/editing/mac/DictionaryLookup.h 2015-11-06 00:38:32 UTC (rev 192089)
+++ trunk/Source/WebCore/editing/mac/DictionaryLookup.h 2015-11-06 04:25:39 UTC (rev 192090)
</span><span class="lines">@@ -48,12 +48,11 @@
</span><span class="cx">
</span><span class="cx"> class HitTestResult;
</span><span class="cx"> class Range;
</span><del>-class VisiblePosition;
</del><span class="cx"> class VisibleSelection;
</span><span class="cx">
</span><span class="cx"> class DictionaryLookup {
</span><span class="cx"> public:
</span><del>- WEBCORE_EXPORT static PassRefPtr<Range> rangeForSelection(const VisibleSelection&, const VisiblePosition& hitPosition, NSDictionary **options);
</del><ins>+ WEBCORE_EXPORT static PassRefPtr<Range> rangeForSelection(const VisibleSelection&, NSDictionary **options);
</ins><span class="cx"> WEBCORE_EXPORT static PassRefPtr<Range> rangeAtHitTestResult(const HitTestResult&, NSDictionary **options);
</span><span class="cx"> WEBCORE_EXPORT static NSString *stringForPDFSelection(PDFSelection *, NSDictionary **options);
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreeditingmacDictionaryLookupmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/editing/mac/DictionaryLookup.mm (192089 => 192090)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/editing/mac/DictionaryLookup.mm 2015-11-06 00:38:32 UTC (rev 192089)
+++ trunk/Source/WebCore/editing/mac/DictionaryLookup.mm 2015-11-06 04:25:39 UTC (rev 192090)
</span><span class="lines">@@ -65,7 +65,7 @@
</span><span class="cx"> return selectedRange->contains(position);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-PassRefPtr<Range> DictionaryLookup::rangeForSelection(const VisibleSelection& selection, const VisiblePosition& hitPosition, NSDictionary **options)
</del><ins>+PassRefPtr<Range> DictionaryLookup::rangeForSelection(const VisibleSelection& selection, NSDictionary **options)
</ins><span class="cx"> {
</span><span class="cx"> RefPtr<Range> selectedRange = selection.toNormalizedRange();
</span><span class="cx"> if (!selectedRange)
</span><span class="lines">@@ -82,23 +82,12 @@
</span><span class="cx"> int lengthToSelectionEnd = TextIterator::rangeLength(makeRange(paragraphStart, selectionEnd).get());
</span><span class="cx"> NSRange rangeToPass = NSMakeRange(lengthToSelectionStart, lengthToSelectionEnd - lengthToSelectionStart);
</span><span class="cx">
</span><del>- RefPtr<Range> fullRange = makeRange(paragraphStart, paragraphEnd);
- if (!fullRange)
- return nullptr;
</del><ins>+ String fullPlainTextString = plainText(makeRange(paragraphStart, paragraphEnd).get());
</ins><span class="cx">
</span><del>- String fullPlainTextString = plainText(fullRange.get());
-
</del><span class="cx"> BEGIN_BLOCK_OBJC_EXCEPTIONS;
</span><span class="cx"> // Since we already have the range we want, we just need to grab the returned options.
</span><del>- if (Class luLookupDefinitionModule = getLULookupDefinitionModuleClass()) {
- NSRange extractedRange = [luLookupDefinitionModule tokenRangeForString:fullPlainTextString range:rangeToPass options:options];
- if (extractedRange.location == NSNotFound)
- return nullptr;
-
- RefPtr<Range> lookupRange = TextIterator::subrange(fullRange.get(), extractedRange.location, extractedRange.length);
- if (!lookupRange || (hitPosition.isNotNull() && !lookupRange->contains(hitPosition)))
- return nullptr;
- }
</del><ins>+ if (Class luLookupDefinitionModule = getLULookupDefinitionModuleClass())
+ [luLookupDefinitionModule tokenRangeForString:fullPlainTextString range:rangeToPass options:options];
</ins><span class="cx"> END_BLOCK_OBJC_EXCEPTIONS;
</span><span class="cx">
</span><span class="cx"> return selectedRange.release();
</span><span class="lines">@@ -129,10 +118,8 @@
</span><span class="cx">
</span><span class="cx"> // If we hit the selection, use that instead of letting Lookup decide the range.
</span><span class="cx"> VisibleSelection selection = frame->page()->focusController().focusedOrMainFrame().selection().selection();
</span><del>- if (selectionContainsPosition(position, selection)) {
- if (auto rangeForSelection = DictionaryLookup::rangeForSelection(selection, position, options))
- return rangeForSelection;
- }
</del><ins>+ if (selectionContainsPosition(position, selection))
+ return DictionaryLookup::rangeForSelection(selection, options);
</ins><span class="cx">
</span><span class="cx"> VisibleSelection selectionAccountingForLineRules = VisibleSelection(position);
</span><span class="cx"> selectionAccountingForLineRules.expandUsingGranularity(WordGranularity);
</span></span></pre></div>
<a id="trunkSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/ChangeLog (192089 => 192090)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/ChangeLog 2015-11-06 00:38:32 UTC (rev 192089)
+++ trunk/Source/WebKit2/ChangeLog 2015-11-06 04:25:39 UTC (rev 192090)
</span><span class="lines">@@ -1,3 +1,18 @@
</span><ins>+2015-11-05 Commit Queue <commit-queue@webkit.org>
+
+ Unreviewed, rolling out r192089.
+ https://bugs.webkit.org/show_bug.cgi?id=150966
+
+ This change broke an existing layout test on Yosemite and
+ Mavericks (Requested by ryanhaddad on #webkit).
+
+ Reverted changeset:
+
+ "Preview on apple.com/contact with all text selected shows a
+ map"
+ https://bugs.webkit.org/show_bug.cgi?id=150963
+ http://trac.webkit.org/changeset/192089
+
</ins><span class="cx"> 2015-11-05 Tim Horton <timothy_horton@apple.com>
</span><span class="cx">
</span><span class="cx"> Preview on apple.com/contact with all text selected shows a map
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessWebPagemacWebPageMacmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/WebPage/mac/WebPageMac.mm (192089 => 192090)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/WebPage/mac/WebPageMac.mm 2015-11-06 00:38:32 UTC (rev 192089)
+++ trunk/Source/WebKit2/WebProcess/WebPage/mac/WebPageMac.mm 2015-11-06 04:25:39 UTC (rev 192090)
</span><span class="lines">@@ -519,7 +519,7 @@
</span><span class="cx"> void WebPage::performDictionaryLookupForSelection(Frame* frame, const VisibleSelection& selection, TextIndicatorPresentationTransition presentationTransition)
</span><span class="cx"> {
</span><span class="cx"> NSDictionary *options = nil;
</span><del>- RefPtr<Range> selectedRange = DictionaryLookup::rangeForSelection(selection, { }, &options);
</del><ins>+ RefPtr<Range> selectedRange = DictionaryLookup::rangeForSelection(selection, &options);
</ins><span class="cx"> if (selectedRange)
</span><span class="cx"> performDictionaryLookupForRange(frame, *selectedRange, options, presentationTransition);
</span><span class="cx"> }
</span></span></pre>
</div>
</div>
</body>
</html>