<!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>[175388] 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/175388">175388</a></dd>
<dt>Author</dt> <dd>timothy_horton@apple.com</dd>
<dt>Date</dt> <dd>2014-10-30 15:37:50 -0700 (Thu, 30 Oct 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Long spins under rangeExpandedAroundPosition on Yahoo Mail
https://bugs.webkit.org/show_bug.cgi?id=138223
<rdar://problem/18819547>
Reviewed by Enrica Casucci.
* WebCore.exp.in:
Export some things.
* WebProcess/WebPage/mac/WebPageMac.mm:
(WebKit::rangeExpandedAroundPositionByCharacters):
Reimplement rangeExpandedAroundPosition to operate on characters instead of lines,
and to use Position. Moving VisiblePositions by line can be very expensive in some cases,
and for generating lookup/Data Detectors context, we don't care about that kind of precision.
This makes this function ~1000x faster when it hits on a row in the Yahoo Mail message list.
(WebKit::WebPage::performDictionaryLookupAtLocation):
(WebKit::scanForDataDetectedItems):
Adopt the new rangeExpandedAroundPositionByCharacters, expanding 250 characters
before and after, which roughly matches what we were usually getting going by line,
and is a reasonable amount of context for these operations.</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="#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 (175387 => 175388)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2014-10-30 22:33:55 UTC (rev 175387)
+++ trunk/Source/WebCore/ChangeLog 2014-10-30 22:37:50 UTC (rev 175388)
</span><span class="lines">@@ -1,3 +1,14 @@
</span><ins>+2014-10-30 Tim Horton <timothy_horton@apple.com>
+
+ Long spins under rangeExpandedAroundPosition on Yahoo Mail
+ https://bugs.webkit.org/show_bug.cgi?id=138223
+ <rdar://problem/18819547>
+
+ Reviewed by Enrica Casucci.
+
+ * WebCore.exp.in:
+ Export some things.
+
</ins><span class="cx"> 2014-10-30 Ada Chan <adachan@apple.com>
</span><span class="cx">
</span><span class="cx"> The Page's muted setting should not affect the HTMLMediaElement's 'muted' IDL attribute.
</span></span></pre></div>
<a id="trunkSourceWebCoreWebCoreexpin"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/WebCore.exp.in (175387 => 175388)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/WebCore.exp.in 2014-10-30 22:33:55 UTC (rev 175387)
+++ trunk/Source/WebCore/WebCore.exp.in 2014-10-30 22:37:50 UTC (rev 175388)
</span><span class="lines">@@ -1048,6 +1048,7 @@
</span><span class="cx"> __ZN7WebCore25addLanguageChangeObserverEPvPFvS0_E
</span><span class="cx"> __ZN7WebCore25computeViewportAttributesENS_17ViewportArgumentsEiiifNS_7IntSizeE
</span><span class="cx"> __ZN7WebCore25createCanonicalUUIDStringEv
</span><ins>+__ZN7WebCore25directionOfEnclosingBlockERKNS_8PositionE
</ins><span class="cx"> __ZN7WebCore25getOutOfLineCachedWrapperEPNS_17JSDOMGlobalObjectEPNS_4NodeE
</span><span class="cx"> __ZN7WebCore25updateRedirectChainStatusERNS_24RedirectChainCacheStatusERKNS_16ResourceResponseE
</span><span class="cx"> __ZN7WebCore26ContextDestructionObserver16contextDestroyedEv
</span><span class="lines">@@ -2043,6 +2044,8 @@
</span><span class="cx"> __ZNK7WebCore8Position25leadingWhitespacePositionENS_9EAffinityEb
</span><span class="cx"> __ZNK7WebCore8Position26trailingWhitespacePositionENS_9EAffinityEb
</span><span class="cx"> __ZNK7WebCore8Position28offsetForPositionAfterAnchorEv
</span><ins>+__ZNK7WebCore8Position4nextENS_16PositionMoveTypeE
+__ZNK7WebCore8Position8previousENS_16PositionMoveTypeE
</ins><span class="cx"> __ZNK7WebCore8Position8upstreamENS_27EditingBoundaryCrossingRuleE
</span><span class="cx"> __ZNK7WebCore8Settings15fixedFontFamilyE11UScriptCode
</span><span class="cx"> __ZNK7WebCore8Settings15serifFontFamilyE11UScriptCode
</span></span></pre></div>
<a id="trunkSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/ChangeLog (175387 => 175388)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/ChangeLog 2014-10-30 22:33:55 UTC (rev 175387)
+++ trunk/Source/WebKit2/ChangeLog 2014-10-30 22:37:50 UTC (rev 175388)
</span><span class="lines">@@ -1,3 +1,24 @@
</span><ins>+2014-10-30 Tim Horton <timothy_horton@apple.com>
+
+ Long spins under rangeExpandedAroundPosition on Yahoo Mail
+ https://bugs.webkit.org/show_bug.cgi?id=138223
+ <rdar://problem/18819547>
+
+ Reviewed by Enrica Casucci.
+
+ * WebProcess/WebPage/mac/WebPageMac.mm:
+ (WebKit::rangeExpandedAroundPositionByCharacters):
+ Reimplement rangeExpandedAroundPosition to operate on characters instead of lines,
+ and to use Position. Moving VisiblePositions by line can be very expensive in some cases,
+ and for generating lookup/Data Detectors context, we don't care about that kind of precision.
+ This makes this function ~1000x faster when it hits on a row in the Yahoo Mail message list.
+
+ (WebKit::WebPage::performDictionaryLookupAtLocation):
+ (WebKit::scanForDataDetectedItems):
+ Adopt the new rangeExpandedAroundPositionByCharacters, expanding 250 characters
+ before and after, which roughly matches what we were usually getting going by line,
+ and is a reasonable amount of context for these operations.
+
</ins><span class="cx"> 2014-10-30 Brady Eidson <beidson@apple.com>
</span><span class="cx">
</span><span class="cx"> IndexedDB is deleting data when a PK is shared amongst two objectStores
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessWebPagemacWebPageMacmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/WebPage/mac/WebPageMac.mm (175387 => 175388)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/WebPage/mac/WebPageMac.mm 2014-10-30 22:33:55 UTC (rev 175387)
+++ trunk/Source/WebKit2/WebProcess/WebPage/mac/WebPageMac.mm 2014-10-30 22:37:50 UTC (rev 175388)
</span><span class="lines">@@ -501,32 +501,23 @@
</span><span class="cx"> return isPositionInRange(position, selectedRange.get());
</span><span class="cx"> }
</span><span class="cx">
</span><del>-static PassRefPtr<Range> rangeExpandedAroundPosition(const VisiblePosition& position, int numberOfLinesToExpand)
</del><ins>+static PassRefPtr<Range> rangeExpandedAroundPositionByCharacters(const VisiblePosition& position, int numberOfCharactersToExpand)
</ins><span class="cx"> {
</span><del>- VisiblePosition contextStart = position;
- VisiblePosition contextEnd = position;
- for (int i = 0; i < numberOfLinesToExpand; i++) {
- VisiblePosition n = previousLinePosition(contextStart, contextStart.lineDirectionPointForBlockDirectionNavigation());
- if (n.isNull() || n == contextStart)
- break;
- contextStart = n;
</del><ins>+ Position start = position.deepEquivalent();
+ Position end = position.deepEquivalent();
+ for (int i = 0; i < numberOfCharactersToExpand; ++i) {
+ if (directionOfEnclosingBlock(start) == LTR)
+ start = start.previous(Character);
+ else
+ start = start.next(Character);
+
+ if (directionOfEnclosingBlock(end) == LTR)
+ end = end.next(Character);
+ else
+ end = end.previous(Character);
</ins><span class="cx"> }
</span><del>- for (int i = 0; i < numberOfLinesToExpand; i++) {
- VisiblePosition n = nextLinePosition(contextEnd, contextEnd.lineDirectionPointForBlockDirectionNavigation());
- if (n.isNull() || n == contextEnd)
- break;
- contextEnd = n;
- }
</del><span class="cx">
</span><del>- VisiblePosition lineStart = startOfLine(contextStart);
- if (!lineStart.isNull())
- contextStart = lineStart;
-
- VisiblePosition lineEnd = endOfLine(contextEnd);
- if (!lineEnd.isNull())
- contextEnd = lineEnd;
-
- return makeRange(contextStart, contextEnd);
</del><ins>+ return makeRange(start, end);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> PassRefPtr<Range> WebPage::rangeForDictionaryLookupAtHitTestResult(const WebCore::HitTestResult& hitTestResult, NSDictionary **options)
</span><span class="lines">@@ -557,8 +548,8 @@
</span><span class="cx"> return nullptr;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- // As context, we are going to use four lines of text before and after the point. (Dictionary can sometimes look up things that are four lines long)
- RefPtr<Range> fullCharacterRange = rangeExpandedAroundPosition(position, 4);
</del><ins>+ // As context, we are going to use 250 characters of text before and after the point.
+ RefPtr<Range> fullCharacterRange = rangeExpandedAroundPositionByCharacters(position, 250);
</ins><span class="cx"> NSRange rangeToPass = NSMakeRange(TextIterator::rangeLength(makeRange(fullCharacterRange->startPosition(), position).get()), 0);
</span><span class="cx">
</span><span class="cx"> String fullPlainTextString = plainText(fullCharacterRange.get());
</span><span class="lines">@@ -1090,7 +1081,7 @@
</span><span class="cx"> if (position.isNull())
</span><span class="cx"> position = firstPositionInOrBeforeNode(node);
</span><span class="cx">
</span><del>- RefPtr<Range> contextRange = rangeExpandedAroundPosition(position, 4);
</del><ins>+ RefPtr<Range> contextRange = rangeExpandedAroundPositionByCharacters(position, 250);
</ins><span class="cx"> if (!contextRange)
</span><span class="cx"> return nullptr;
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>