<!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>[172501] 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/172501">172501</a></dd>
<dt>Author</dt> <dd>timothy_horton@apple.com</dd>
<dt>Date</dt> <dd>2014-08-12 15:48:36 -0700 (Tue, 12 Aug 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Small region (~1px tall) where you get the selection button instead of the phone number overlay
https://bugs.webkit.org/show_bug.cgi?id=135852
<rdar://problem/17992795>
Reviewed by Enrica Casucci.
* WebProcess/WebPage/ServicesOverlayController.h:
* WebProcess/WebPage/mac/ServicesOverlayController.mm:
(WebKit::ServicesOverlayController::findTelephoneNumberHighlightContainingSelectionHighlight):
(WebKit::ServicesOverlayController::determineActiveHighlight):
If our new active highlight is a selection highlight that is completely contained
by one of the phone number highlights, we'll make the phone number highlight active
even if it's not hovered. This fixes the case where the selection highlight
(a subset of a telephone number) is slightly taller than the telephone number
highlight, and can be hovered without hovering the phone number highlight
* WebCore.exp.in:</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="#trunkSourceWebKit2WebProcessWebPageServicesOverlayControllerh">trunk/Source/WebKit2/WebProcess/WebPage/ServicesOverlayController.h</a></li>
<li><a href="#trunkSourceWebKit2WebProcessWebPagemacServicesOverlayControllermm">trunk/Source/WebKit2/WebProcess/WebPage/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 (172500 => 172501)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2014-08-12 22:43:27 UTC (rev 172500)
+++ trunk/Source/WebCore/ChangeLog 2014-08-12 22:48:36 UTC (rev 172501)
</span><span class="lines">@@ -1,3 +1,13 @@
</span><ins>+2014-08-12 Tim Horton <timothy_horton@apple.com>
+
+ Small region (~1px tall) where you get the selection button instead of the phone number overlay
+ https://bugs.webkit.org/show_bug.cgi?id=135852
+ <rdar://problem/17992795>
+
+ Reviewed by Enrica Casucci.
+
+ * WebCore.exp.in:
+
</ins><span class="cx"> 2014-08-12 Alex Christensen <achristensen@webkit.org>
</span><span class="cx">
</span><span class="cx"> Generate header detection headers for CMake on Windows.
</span></span></pre></div>
<a id="trunkSourceWebCoreWebCoreexpin"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/WebCore.exp.in (172500 => 172501)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/WebCore.exp.in 2014-08-12 22:43:27 UTC (rev 172500)
+++ trunk/Source/WebCore/WebCore.exp.in 2014-08-12 22:48:36 UTC (rev 172501)
</span><span class="lines">@@ -1896,6 +1896,7 @@
</span><span class="cx"> __ZNK7WebCore4Page34inLowQualityImageInterpolationModeEv
</span><span class="cx"> __ZNK7WebCore4Page9groupNameEv
</span><span class="cx"> __ZNK7WebCore4Page9pageCountEv
</span><ins>+__ZNK7WebCore4Page9selectionEv
</ins><span class="cx"> __ZNK7WebCore4Page9sessionIDEv
</span><span class="cx"> __ZNK7WebCore5Color10serializedEv
</span><span class="cx"> __ZNK7WebCore5Color7getRGBAERdS1_S1_S1_
</span></span></pre></div>
<a id="trunkSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/ChangeLog (172500 => 172501)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/ChangeLog 2014-08-12 22:43:27 UTC (rev 172500)
+++ trunk/Source/WebKit2/ChangeLog 2014-08-12 22:48:36 UTC (rev 172501)
</span><span class="lines">@@ -43,6 +43,24 @@
</span><span class="cx">
</span><span class="cx"> 2014-08-12 Tim Horton <timothy_horton@apple.com>
</span><span class="cx">
</span><ins>+ Small region (~1px tall) where you get the selection button instead of the phone number overlay
+ https://bugs.webkit.org/show_bug.cgi?id=135852
+ <rdar://problem/17992795>
+
+ Reviewed by Enrica Casucci.
+
+ * WebProcess/WebPage/ServicesOverlayController.h:
+ * WebProcess/WebPage/mac/ServicesOverlayController.mm:
+ (WebKit::ServicesOverlayController::findTelephoneNumberHighlightContainingSelectionHighlight):
+ (WebKit::ServicesOverlayController::determineActiveHighlight):
+ If our new active highlight is a selection highlight that is completely contained
+ by one of the phone number highlights, we'll make the phone number highlight active
+ even if it's not hovered. This fixes the case where the selection highlight
+ (a subset of a telephone number) is slightly taller than the telephone number
+ highlight, and can be hovered without hovering the phone number highlight.
+
+2014-08-12 Tim Horton <timothy_horton@apple.com>
+
</ins><span class="cx"> REGRESSION (r172424): Extra menu header in combined telephone number menu when no phone paired
</span><span class="cx"> https://bugs.webkit.org/show_bug.cgi?id=135854
</span><span class="cx"> <rdar://problem/17996339>
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessWebPageServicesOverlayControllerh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/WebPage/ServicesOverlayController.h (172500 => 172501)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/WebPage/ServicesOverlayController.h 2014-08-12 22:43:27 UTC (rev 172500)
+++ trunk/Source/WebKit2/WebProcess/WebPage/ServicesOverlayController.h 2014-08-12 22:48:36 UTC (rev 172501)
</span><span class="lines">@@ -117,6 +117,8 @@
</span><span class="cx"> void clearActiveHighlight();
</span><span class="cx"> Highlight* activeHighlight() const { return m_activeHighlight.get(); }
</span><span class="cx">
</span><ins>+ Highlight* findTelephoneNumberHighlightContainingSelectionHighlight(Highlight&);
+
</ins><span class="cx"> bool hasRelevantSelectionServices();
</span><span class="cx">
</span><span class="cx"> bool mouseIsOverHighlight(Highlight&, bool& mouseIsOverButton) const;
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessWebPagemacServicesOverlayControllermm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/WebPage/mac/ServicesOverlayController.mm (172500 => 172501)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/WebPage/mac/ServicesOverlayController.mm 2014-08-12 22:43:27 UTC (rev 172500)
+++ trunk/Source/WebKit2/WebProcess/WebPage/mac/ServicesOverlayController.mm 2014-08-12 22:48:36 UTC (rev 172501)
</span><span class="lines">@@ -576,6 +576,30 @@
</span><span class="cx"> return false;
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+ServicesOverlayController::Highlight* ServicesOverlayController::findTelephoneNumberHighlightContainingSelectionHighlight(Highlight& selectionHighlight)
+{
+ if (selectionHighlight.type() != Highlight::Type::Selection)
+ return nullptr;
+
+ const VisibleSelection& selection = m_webPage.corePage()->selection();
+ if (!selection.isRange())
+ return nullptr;
+
+ RefPtr<Range> activeSelectionRange = selection.toNormalizedRange();
+ if (!activeSelectionRange)
+ return nullptr;
+
+ for (auto& highlight : m_potentialHighlights) {
+ if (highlight->type() != Highlight::Type::TelephoneNumber)
+ continue;
+
+ if (highlight->range()->contains(*activeSelectionRange))
+ return highlight.get();
+ }
+
+ return nullptr;
+}
+
</ins><span class="cx"> void ServicesOverlayController::determineActiveHighlight(bool& mouseIsOverActiveHighlightButton)
</span><span class="cx"> {
</span><span class="cx"> mouseIsOverActiveHighlightButton = false;
</span><span class="lines">@@ -603,6 +627,18 @@
</span><span class="cx"> mouseIsOverActiveHighlightButton = mouseIsOverButton;
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+ // If our new active highlight is a selection highlight that is completely contained
+ // by one of the phone number highlights, we'll make the phone number highlight active even if it's not hovered.
+ if (newActiveHighlight && newActiveHighlight->type() == Highlight::Type::Selection) {
+ if (Highlight* containedTelephoneNumberHighlight = findTelephoneNumberHighlightContainingSelectionHighlight(*newActiveHighlight)) {
+ newActiveHighlight = containedTelephoneNumberHighlight;
+
+ // We will always initially choose the telephone number highlight over the selection highlight if the
+ // mouse is over the telephone number highlight's button, so we know that it's not hovered if we got here.
+ mouseIsOverActiveHighlightButton = false;
+ }
+ }
+
</ins><span class="cx"> if (!this->highlightsAreEquivalent(m_activeHighlight.get(), newActiveHighlight.get())) {
</span><span class="cx"> // When transitioning to a new highlight, we might end up in determineActiveHighlight multiple times
</span><span class="cx"> // before the new highlight actually becomes active. Keep track of the last next-but-not-yet-active
</span></span></pre>
</div>
</div>
</body>
</html>