<!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>[170969] trunk/Source/WebKit2/ChangeLog</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/170969">170969</a></dd>
<dt>Author</dt> <dd>beidson@apple.com</dd>
<dt>Date</dt> <dd>2014-07-10 11:24:23 -0700 (Thu, 10 Jul 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Fix my mis-merged ChangeLog from <a href="http://trac.webkit.org/projects/webkit/changeset/170966">r170966</a></pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebKit2ChangeLog">trunk/Source/WebKit2/ChangeLog</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/ChangeLog (170968 => 170969)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/ChangeLog 2014-07-10 17:52:19 UTC (rev 170968)
+++ trunk/Source/WebKit2/ChangeLog 2014-07-10 18:24:23 UTC (rev 170969)
</span><span class="lines">@@ -4,6 +4,47 @@
</span><span class="cx">
</span><span class="cx"> * WebProcess/WebPage/ServicesOverlayController.h:
</span><span class="cx">
</span><ins>+2014-07-09 Brady Eidson <beidson@apple.com>
+
+ Phone number highlights should always be visible if the mouse hovers over.
+ <rdar://problem/17527476> and https://bugs.webkit.org/show_bug.cgi?id=134784
+
+ Reviewed by Tim Horton.
+
+ This is a fairly extensive rewrite of ServicesOverlayController.
+ It allows one selection highlight for the entire selection, and as many telephone number highlights as there are numbers.
+ If a telephone number highlight is hovered over, it wins and is painted.
+ If no telephone number highlight is hovered but the selection highlight is, then it is painted.
+
+ The purposes of each method are self evident by their name, and the concepts are mostly the same as they used to be.
+
+ The exception is establishHoveredTelephoneHighlight which gets a more detailed explanation below.
+
+ * Platform/Logging.h: Add a Services logging channel.
+
+ * WebProcess/WebPage/ServicesOverlayController.h:
+ (WebKit::TelephoneNumberData::TelephoneNumberData):
+
+ * WebProcess/WebPage/mac/ServicesOverlayController.mm:
+ (WebKit::ServicesOverlayController::ServicesOverlayController):
+ (WebKit::ServicesOverlayController::selectionRectsDidChange):
+ (WebKit::ServicesOverlayController::selectedTelephoneNumberRangesChanged):
+ (WebKit::ServicesOverlayController::clearHighlightState):
+ (WebKit::ServicesOverlayController::drawRect):
+ (WebKit::ServicesOverlayController::drawSelectionHighlight):
+ (WebKit::ServicesOverlayController::maybeDrawTelephoneNumberHighlight):
+ (WebKit::ServicesOverlayController::drawHighlight):
+ (WebKit::ServicesOverlayController::clearSelectionHighlight):
+ (WebKit::ServicesOverlayController::clearHoveredTelephoneNumberHighlight):
+ (WebKit::ServicesOverlayController::establishHoveredTelephoneHighlight): Starts walking the telephone number ranges and
+ creating a highlight for each one that doesn’t already have a highlight. If that highlight is also being hovered by
+ the mouse, then it is set as the hovered telephone number highlight and the method stops creating new highlights.
+ (WebKit::ServicesOverlayController::maybeCreateSelectionHighlight):
+ (WebKit::ServicesOverlayController::mouseEvent):
+ (WebKit::ServicesOverlayController::handleClick):
+ (WebKit::ServicesOverlayController::drawTelephoneNumberHighlight): Deleted.
+ (WebKit::ServicesOverlayController::drawCurrentHighlight): Deleted.
+
</ins><span class="cx"> 2014-07-10 Timothy Horton <timothy_horton@apple.com>
</span><span class="cx">
</span><span class="cx"> Assertions or crashes under _takeViewSnapshot when restoring windows
</span><span class="lines">@@ -364,49 +405,7 @@
</span><span class="cx"> (-[WKPreferences _setTiledScrollingIndicatorVisible:]):
</span><span class="cx"> * UIProcess/API/Cocoa/WKPreferencesPrivate.h:
</span><span class="cx"> Expose layer borders, repaint counters, and the tiled scrolling indicator on WKPreferences, as SPI.
</span><del>-=======
-2014-07-09 Brady Eidson <beidson@apple.com>
</del><span class="cx">
</span><del>- Phone number highlights should always be visible if the mouse hovers over.
- <rdar://problem/17527476> and https://bugs.webkit.org/show_bug.cgi?id=134784
-
- Reviewed by Tim Horton.
-
- This is a fairly extensive rewrite of ServicesOverlayController.
- It allows one selection highlight for the entire selection, and as many telephone number highlights as there are numbers.
- If a telephone number highlight is hovered over, it wins and is painted.
- If no telephone number highlight is hovered but the selection highlight is, then it is painted.
-
- The purposes of each method are self evident by their name, and the concepts are mostly the same as they used to be.
-
- The exception is establishHoveredTelephoneHighlight which gets a more detailed explanation below.
-
- * Platform/Logging.h: Add a Services logging channel.
-
- * WebProcess/WebPage/ServicesOverlayController.h:
- (WebKit::TelephoneNumberData::TelephoneNumberData):
-
- * WebProcess/WebPage/mac/ServicesOverlayController.mm:
- (WebKit::ServicesOverlayController::ServicesOverlayController):
- (WebKit::ServicesOverlayController::selectionRectsDidChange):
- (WebKit::ServicesOverlayController::selectedTelephoneNumberRangesChanged):
- (WebKit::ServicesOverlayController::clearHighlightState):
- (WebKit::ServicesOverlayController::drawRect):
- (WebKit::ServicesOverlayController::drawSelectionHighlight):
- (WebKit::ServicesOverlayController::maybeDrawTelephoneNumberHighlight):
- (WebKit::ServicesOverlayController::drawHighlight):
- (WebKit::ServicesOverlayController::clearSelectionHighlight):
- (WebKit::ServicesOverlayController::clearHoveredTelephoneNumberHighlight):
- (WebKit::ServicesOverlayController::establishHoveredTelephoneHighlight): Starts walking the telephone number ranges and
- creating a highlight for each one that doesn’t already have a highlight. If that highlight is also being hovered by
- the mouse, then it is set as the hovered telephone number highlight and the method stops creating new highlights.
- (WebKit::ServicesOverlayController::maybeCreateSelectionHighlight):
- (WebKit::ServicesOverlayController::mouseEvent):
- (WebKit::ServicesOverlayController::handleClick):
- (WebKit::ServicesOverlayController::drawTelephoneNumberHighlight): Deleted.
- (WebKit::ServicesOverlayController::drawCurrentHighlight): Deleted.
->>>>>>> Phone number highlights should always be visible if the mouse hovers over.
-
</del><span class="cx"> 2014-07-08 Tim Horton <timothy_horton@apple.com>
</span><span class="cx">
</span><span class="cx"> WKProcessPoolConfigurationPrivate's maximumProcessCount property has no effect
</span></span></pre>
</div>
</div>
</body>
</html>