<!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>[187060] branches/safari-601.1-branch/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/187060">187060</a></dd>
<dt>Author</dt> <dd>matthew_hanson@apple.com</dd>
<dt>Date</dt> <dd>2015-07-20 21:36:45 -0700 (Mon, 20 Jul 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Merge <a href="http://trac.webkit.org/projects/webkit/changeset/186890">r186890</a>. rdar://problem/21643094</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#branchessafari6011branchSourceWebCoreChangeLog">branches/safari-601.1-branch/Source/WebCore/ChangeLog</a></li>
<li><a href="#branchessafari6011branchSourceWebCorepageTextIndicatorcpp">branches/safari-601.1-branch/Source/WebCore/page/TextIndicator.cpp</a></li>
<li><a href="#branchessafari6011branchSourceWebCorepagemacTextIndicatorWindowmm">branches/safari-601.1-branch/Source/WebCore/page/mac/TextIndicatorWindow.mm</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="branchessafari6011branchSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: branches/safari-601.1-branch/Source/WebCore/ChangeLog (187059 => 187060)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601.1-branch/Source/WebCore/ChangeLog 2015-07-21 04:36:42 UTC (rev 187059)
+++ branches/safari-601.1-branch/Source/WebCore/ChangeLog 2015-07-21 04:36:45 UTC (rev 187060)
</span><span class="lines">@@ -1,5 +1,35 @@
</span><span class="cx"> 2015-07-20 Matthew Hanson <matthew_hanson@apple.com>
</span><span class="cx">
</span><ins>+ Merge r186890. rdar://problem/21643094
+
+ 2015-07-15 Tim Horton <timothy_horton@apple.com>
+
+ Move indicator rect uniting code to TextIndicatorWindow instead of TextIndicator
+ https://bugs.webkit.org/show_bug.cgi?id=146992
+ <rdar://problem/21643094>
+
+ Reviewed by Daniel Bates.
+
+ Having to unite all the rects if any overlap is an implementation
+ detail of the Mac TextIndicatorWindow presentation, not a fundamental
+ property of TextIndicator.
+
+ Other TextIndicator presentations might be able to handle overlapping
+ rects more effectively, so we shouldn't lose information unless we need to.
+
+ This also avoids having a second copy of some constants!
+
+ * page/TextIndicator.cpp:
+ (WebCore::outsetIndicatorRectIncludingShadow): Deleted.
+ (WebCore::textIndicatorsForTextRectsOverlap): Deleted.
+ (WebCore::TextIndicator::TextIndicator): Deleted.
+ * page/mac/TextIndicatorWindow.mm:
+ (outsetIndicatorRectIncludingShadow):
+ (textIndicatorsForTextRectsOverlap):
+ (-[WebTextIndicatorView initWithFrame:textIndicator:margin:offset:]):
+
+2015-07-20 Matthew Hanson <matthew_hanson@apple.com>
+
</ins><span class="cx"> Merge r186875. rdar://problem/21643094
</span><span class="cx">
</span><span class="cx"> 2015-07-15 Brent Fulgham <bfulgham@apple.com>
</span></span></pre></div>
<a id="branchessafari6011branchSourceWebCorepageTextIndicatorcpp"></a>
<div class="modfile"><h4>Modified: branches/safari-601.1-branch/Source/WebCore/page/TextIndicator.cpp (187059 => 187060)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601.1-branch/Source/WebCore/page/TextIndicator.cpp 2015-07-21 04:36:42 UTC (rev 187059)
+++ branches/safari-601.1-branch/Source/WebCore/page/TextIndicator.cpp 2015-07-21 04:36:45 UTC (rev 187060)
</span><span class="lines">@@ -40,52 +40,8 @@
</span><span class="cx">
</span><span class="cx"> using namespace WebCore;
</span><span class="cx">
</span><del>-// These should match the values in TextIndicatorWindow.
-// FIXME: Ideally these would only be in one place.
-#if ENABLE(LEGACY_TEXT_INDICATOR_STYLE)
-const float horizontalBorder = 3;
-const float verticalBorder = 1;
-const float dropShadowBlurRadius = 1.5;
-#else
-const float horizontalBorder = 2;
-const float verticalBorder = 1;
-const float dropShadowBlurRadius = 12;
-#endif
-
</del><span class="cx"> namespace WebCore {
</span><span class="cx">
</span><del>-static FloatRect outsetIndicatorRectIncludingShadow(const FloatRect rect)
-{
- FloatRect outsetRect = rect;
- outsetRect.inflateX(dropShadowBlurRadius + horizontalBorder);
- outsetRect.inflateY(dropShadowBlurRadius + verticalBorder);
- return outsetRect;
-}
-
-static bool textIndicatorsForTextRectsOverlap(const Vector<FloatRect>& textRects)
-{
- size_t count = textRects.size();
- if (count <= 1)
- return false;
-
- Vector<FloatRect> indicatorRects;
- indicatorRects.reserveInitialCapacity(count);
-
- for (size_t i = 0; i < count; ++i) {
- FloatRect indicatorRect = outsetIndicatorRectIncludingShadow(textRects[i]);
-
- for (size_t j = indicatorRects.size(); j; ) {
- --j;
- if (indicatorRect.intersects(indicatorRects[j]))
- return true;
- }
-
- indicatorRects.uncheckedAppend(indicatorRect);
- }
-
- return false;
-}
-
</del><span class="cx"> Ref<TextIndicator> TextIndicator::create(const TextIndicatorData& data)
</span><span class="cx"> {
</span><span class="cx"> return adoptRef(*new TextIndicator(data));
</span><span class="lines">@@ -189,11 +145,6 @@
</span><span class="cx"> : m_data(data)
</span><span class="cx"> {
</span><span class="cx"> ASSERT(m_data.contentImageScaleFactor != 1 || m_data.contentImage->size() == enclosingIntRect(m_data.selectionRectInRootViewCoordinates).size());
</span><del>-
- if (textIndicatorsForTextRectsOverlap(m_data.textRectsInBoundingRectCoordinates)) {
- m_data.textRectsInBoundingRectCoordinates[0] = unionRect(m_data.textRectsInBoundingRectCoordinates);
- m_data.textRectsInBoundingRectCoordinates.shrink(1);
- }
</del><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> TextIndicator::~TextIndicator()
</span></span></pre></div>
<a id="branchessafari6011branchSourceWebCorepagemacTextIndicatorWindowmm"></a>
<div class="modfile"><h4>Modified: branches/safari-601.1-branch/Source/WebCore/page/mac/TextIndicatorWindow.mm (187059 => 187060)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601.1-branch/Source/WebCore/page/mac/TextIndicatorWindow.mm 2015-07-21 04:36:42 UTC (rev 187059)
+++ branches/safari-601.1-branch/Source/WebCore/page/mac/TextIndicatorWindow.mm 2015-07-21 04:36:45 UTC (rev 187060)
</span><span class="lines">@@ -29,6 +29,7 @@
</span><span class="cx"> #if PLATFORM(MAC)
</span><span class="cx">
</span><span class="cx"> #import "CoreGraphicsSPI.h"
</span><ins>+#import "GeometryUtilities.h"
</ins><span class="cx"> #import "GraphicsContext.h"
</span><span class="cx"> #import "QuartzCoreSPI.h"
</span><span class="cx"> #import "TextIndicator.h"
</span><span class="lines">@@ -91,6 +92,38 @@
</span><span class="cx">
</span><span class="cx"> @synthesize fadingOut = _fadingOut;
</span><span class="cx">
</span><ins>+static FloatRect outsetIndicatorRectIncludingShadow(const FloatRect rect)
+{
+ FloatRect outsetRect = rect;
+ outsetRect.inflateX(dropShadowBlurRadius + horizontalBorder);
+ outsetRect.inflateY(dropShadowBlurRadius + verticalBorder);
+ return outsetRect;
+}
+
+static bool textIndicatorsForTextRectsOverlap(const Vector<FloatRect>& textRects)
+{
+ size_t count = textRects.size();
+ if (count <= 1)
+ return false;
+
+ Vector<FloatRect> indicatorRects;
+ indicatorRects.reserveInitialCapacity(count);
+
+ for (size_t i = 0; i < count; ++i) {
+ FloatRect indicatorRect = outsetIndicatorRectIncludingShadow(textRects[i]);
+
+ for (size_t j = indicatorRects.size(); j; ) {
+ --j;
+ if (indicatorRect.intersects(indicatorRects[j]))
+ return true;
+ }
+
+ indicatorRects.uncheckedAppend(indicatorRect);
+ }
+
+ return false;
+}
+
</ins><span class="cx"> - (instancetype)initWithFrame:(NSRect)frame textIndicator:(PassRefPtr<TextIndicator>)textIndicator margin:(NSSize)margin offset:(NSPoint)offset
</span><span class="cx"> {
</span><span class="cx"> if (!(self = [super initWithFrame:frame]))
</span><span class="lines">@@ -120,7 +153,13 @@
</span><span class="cx"> RetainPtr<CGColorRef> gradientDarkColor = [NSColor colorWithDeviceRed:.929 green:.8 blue:0 alpha:1].CGColor;
</span><span class="cx"> RetainPtr<CGColorRef> gradientLightColor = [NSColor colorWithDeviceRed:.949 green:.937 blue:0 alpha:1].CGColor;
</span><span class="cx">
</span><del>- for (const auto& textRect : _textIndicator->textRectsInBoundingRectCoordinates()) {
</del><ins>+ Vector<FloatRect> textRectsInBoundingRectCoordinates = _textIndicator->textRectsInBoundingRectCoordinates();
+ if (textIndicatorsForTextRectsOverlap(textRectsInBoundingRectCoordinates)) {
+ textRectsInBoundingRectCoordinates[0] = unionRect(textRectsInBoundingRectCoordinates);
+ textRectsInBoundingRectCoordinates.shrink(1);
+ }
+
+ for (const auto& textRect : textRectsInBoundingRectCoordinates) {
</ins><span class="cx"> FloatRect offsetTextRect = textRect;
</span><span class="cx"> offsetTextRect.move(offset.x, offset.y);
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>