<!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>[182088] trunk/Source/WebCore</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/182088">182088</a></dd>
<dt>Author</dt> <dd>timothy_horton@apple.com</dd>
<dt>Date</dt> <dd>2015-03-27 16:01:37 -0700 (Fri, 27 Mar 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>WebProcess started by editable WKWebView spends 15% of its initialization time loading DataDetectors
https://bugs.webkit.org/show_bug.cgi?id=143142
<rdar://problem/20324495>
Reviewed by Anders Carlsson.
Calling DataDetectorsLibrary() is expensive; we should avoid doing it
until actually necessary. When loading a page that makes a caret selection,
ServicesOverlayController was calling DataDetectorsLibrary() (ignoring the fact
that a caret selection can't have any services associated with it) to avoid
crashing on systems where DataDetectors is not available. Instead, we should
first check if there's anything to do, and then check for the existence
of DataDetectors.
* page/mac/ServicesOverlayController.mm:
(WebCore::ServicesOverlayController::buildPhoneNumberHighlights):
Build the list of phone number ranges, and bail (clearing the potential highlights)
if it is empty, before calling DataDetectorsLibrary().
(WebCore::ServicesOverlayController::buildSelectionHighlight):
Check the list of selection rects, and bail (clearing the potential highlights)
if it is empty, before calling DataDetectorsLibrary().</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCorepagemacServicesOverlayControllermm">trunk/Source/WebCore/page/mac/ServicesOverlayController.mm</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (182087 => 182088)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2015-03-27 22:56:15 UTC (rev 182087)
+++ trunk/Source/WebCore/ChangeLog 2015-03-27 23:01:37 UTC (rev 182088)
</span><span class="lines">@@ -1,3 +1,28 @@
</span><ins>+2015-03-27 Tim Horton <timothy_horton@apple.com>
+
+ WebProcess started by editable WKWebView spends 15% of its initialization time loading DataDetectors
+ https://bugs.webkit.org/show_bug.cgi?id=143142
+ <rdar://problem/20324495>
+
+ Reviewed by Anders Carlsson.
+
+ Calling DataDetectorsLibrary() is expensive; we should avoid doing it
+ until actually necessary. When loading a page that makes a caret selection,
+ ServicesOverlayController was calling DataDetectorsLibrary() (ignoring the fact
+ that a caret selection can't have any services associated with it) to avoid
+ crashing on systems where DataDetectors is not available. Instead, we should
+ first check if there's anything to do, and then check for the existence
+ of DataDetectors.
+
+ * page/mac/ServicesOverlayController.mm:
+ (WebCore::ServicesOverlayController::buildPhoneNumberHighlights):
+ Build the list of phone number ranges, and bail (clearing the potential highlights)
+ if it is empty, before calling DataDetectorsLibrary().
+
+ (WebCore::ServicesOverlayController::buildSelectionHighlight):
+ Check the list of selection rects, and bail (clearing the potential highlights)
+ if it is empty, before calling DataDetectorsLibrary().
+
</ins><span class="cx"> 2015-03-27 Jer Noble <jer.noble@apple.com>
</span><span class="cx">
</span><span class="cx"> [Mac] Safari fails to fire page "load" event with video[preload=none]
</span></span></pre></div>
<a id="trunkSourceWebCorepagemacServicesOverlayControllermm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/page/mac/ServicesOverlayController.mm (182087 => 182088)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/page/mac/ServicesOverlayController.mm 2015-03-27 22:56:15 UTC (rev 182087)
+++ trunk/Source/WebCore/page/mac/ServicesOverlayController.mm 2015-03-27 23:01:37 UTC (rev 182088)
</span><span class="lines">@@ -471,37 +471,44 @@
</span><span class="cx">
</span><span class="cx"> void ServicesOverlayController::buildPhoneNumberHighlights()
</span><span class="cx"> {
</span><del>- if (!DataDetectorsLibrary())
</del><ins>+ if (!m_mainFrame.settings().serviceControlsEnabled())
</ins><span class="cx"> return;
</span><span class="cx">
</span><del>- if (!m_mainFrame.settings().serviceControlsEnabled())
</del><ins>+ Vector<RefPtr<Range>> phoneNumberRanges;
+ for (Frame* frame = &m_mainFrame; frame; frame = frame->tree().traverseNext())
+ phoneNumberRanges.appendVector(frame->editor().detectedTelephoneNumberRanges());
+
+ if (phoneNumberRanges.isEmpty()) {
+ removeAllPotentialHighlightsOfType(Highlight::Type::TelephoneNumber);
+ didRebuildPotentialHighlights();
</ins><span class="cx"> return;
</span><ins>+ }
</ins><span class="cx">
</span><ins>+ if (!DataDetectorsLibrary())
+ return;
+
</ins><span class="cx"> HashSet<RefPtr<Highlight>> newPotentialHighlights;
</span><span class="cx">
</span><span class="cx"> FrameView& mainFrameView = *m_mainFrame.view();
</span><span class="cx">
</span><del>- for (Frame* frame = &m_mainFrame; frame; frame = frame->tree().traverseNext()) {
- auto& ranges = frame->editor().detectedTelephoneNumberRanges();
- for (auto& range : ranges) {
- // FIXME: This will choke if the range wraps around the edge of the view.
- // What should we do in that case?
- IntRect rect = textQuadsToBoundingRectForRange(*range);
</del><ins>+ for (auto& range : phoneNumberRanges) {
+ // FIXME: This will choke if the range wraps around the edge of the view.
+ // What should we do in that case?
+ IntRect rect = textQuadsToBoundingRectForRange(*range);
</ins><span class="cx">
</span><del>- // Convert to the main document's coordinate space.
- // FIXME: It's a little crazy to call contentsToWindow and then windowToContents in order to get the right coordinate space.
- // We should consider adding conversion functions to ScrollView for contentsToDocument(). Right now, contentsToRootView() is
- // not equivalent to what we need when you have a topContentInset or a header banner.
- FrameView* viewForRange = range->ownerDocument().view();
- if (!viewForRange)
- continue;
- rect.setLocation(mainFrameView.windowToContents(viewForRange->contentsToWindow(rect.location())));
</del><ins>+ // Convert to the main document's coordinate space.
+ // FIXME: It's a little crazy to call contentsToWindow and then windowToContents in order to get the right coordinate space.
+ // We should consider adding conversion functions to ScrollView for contentsToDocument(). Right now, contentsToRootView() is
+ // not equivalent to what we need when you have a topContentInset or a header banner.
+ FrameView* viewForRange = range->ownerDocument().view();
+ if (!viewForRange)
+ continue;
+ rect.setLocation(mainFrameView.windowToContents(viewForRange->contentsToWindow(rect.location())));
</ins><span class="cx">
</span><del>- CGRect cgRect = rect;
- RetainPtr<DDHighlightRef> ddHighlight = adoptCF(DDHighlightCreateWithRectsInVisibleRectWithStyleAndDirection(nullptr, &cgRect, 1, mainFrameView.visibleContentRect(), DDHighlightStyleBubbleStandard | DDHighlightStyleStandardIconArrow, YES, NSWritingDirectionNatural, NO, YES));
</del><ins>+ CGRect cgRect = rect;
+ RetainPtr<DDHighlightRef> ddHighlight = adoptCF(DDHighlightCreateWithRectsInVisibleRectWithStyleAndDirection(nullptr, &cgRect, 1, mainFrameView.visibleContentRect(), DDHighlightStyleBubbleStandard | DDHighlightStyleStandardIconArrow, YES, NSWritingDirectionNatural, NO, YES));
</ins><span class="cx">
</span><del>- newPotentialHighlights.add(Highlight::createForTelephoneNumber(*this, ddHighlight, range));
- }
</del><ins>+ newPotentialHighlights.add(Highlight::createForTelephoneNumber(*this, ddHighlight, range));
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> replaceHighlightsOfTypePreservingEquivalentHighlights(newPotentialHighlights, Highlight::Type::TelephoneNumber);
</span><span class="lines">@@ -511,16 +518,22 @@
</span><span class="cx">
</span><span class="cx"> void ServicesOverlayController::buildSelectionHighlight()
</span><span class="cx"> {
</span><del>- if (!DataDetectorsLibrary())
</del><ins>+ if (!m_mainFrame.settings().serviceControlsEnabled())
</ins><span class="cx"> return;
</span><span class="cx">
</span><del>- if (!m_mainFrame.settings().serviceControlsEnabled())
</del><ins>+ if (m_currentSelectionRects.isEmpty()) {
+ removeAllPotentialHighlightsOfType(Highlight::Type::Selection);
+ didRebuildPotentialHighlights();
</ins><span class="cx"> return;
</span><ins>+ }
</ins><span class="cx">
</span><span class="cx"> Page* page = m_mainFrame.page();
</span><span class="cx"> if (!page)
</span><span class="cx"> return;
</span><span class="cx">
</span><ins>+ if (!DataDetectorsLibrary())
+ return;
+
</ins><span class="cx"> HashSet<RefPtr<Highlight>> newPotentialHighlights;
</span><span class="cx">
</span><span class="cx"> Vector<CGRect> cgRects;
</span></span></pre>
</div>
</div>
</body>
</html>