<!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>[192830] 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/192830">192830</a></dd>
<dt>Author</dt> <dd>timothy_horton@apple.com</dd>
<dt>Date</dt> <dd>2015-11-30 14:19:09 -0800 (Mon, 30 Nov 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Get rid of the legacy TextIndicatorWindow style
https://bugs.webkit.org/show_bug.cgi?id=151674
Reviewed by Anders Carlsson.
* page/TextIndicator.h:
* page/mac/TextIndicatorWindow.mm:
(-[WebTextIndicatorView initWithFrame:textIndicator:margin:offset:]): Deleted.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCorepageTextIndicatorh">trunk/Source/WebCore/page/TextIndicator.h</a></li>
<li><a href="#trunkSourceWebCorepagemacTextIndicatorWindowmm">trunk/Source/WebCore/page/mac/TextIndicatorWindow.mm</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (192829 => 192830)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2015-11-30 22:17:58 UTC (rev 192829)
+++ trunk/Source/WebCore/ChangeLog 2015-11-30 22:19:09 UTC (rev 192830)
</span><span class="lines">@@ -1,3 +1,14 @@
</span><ins>+2015-11-30 Tim Horton <timothy_horton@apple.com>
+
+ Get rid of the legacy TextIndicatorWindow style
+ https://bugs.webkit.org/show_bug.cgi?id=151674
+
+ Reviewed by Anders Carlsson.
+
+ * page/TextIndicator.h:
+ * page/mac/TextIndicatorWindow.mm:
+ (-[WebTextIndicatorView initWithFrame:textIndicator:margin:offset:]): Deleted.
+
</ins><span class="cx"> 2015-11-30 Brady Eidson <beidson@apple.com>
</span><span class="cx">
</span><span class="cx"> Modern IDB: Correct handling of cursors finishing iteration.
</span></span></pre></div>
<a id="trunkSourceWebCorepageTextIndicatorh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/page/TextIndicator.h (192829 => 192830)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/page/TextIndicator.h 2015-11-30 22:17:58 UTC (rev 192829)
+++ trunk/Source/WebCore/page/TextIndicator.h 2015-11-30 22:19:09 UTC (rev 192830)
</span><span class="lines">@@ -32,12 +32,6 @@
</span><span class="cx"> #include <wtf/RefCounted.h>
</span><span class="cx"> #include <wtf/Vector.h>
</span><span class="cx">
</span><del>-#if PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED < 101000
-#define ENABLE_LEGACY_TEXT_INDICATOR_STYLE 1
-#else
-#define ENABLE_LEGACY_TEXT_INDICATOR_STYLE 0
-#endif
-
</del><span class="cx"> namespace WebCore {
</span><span class="cx">
</span><span class="cx"> class Frame;
</span><span class="lines">@@ -107,11 +101,7 @@
</span><span class="cx"> // FIXME: These are fairly Mac-specific, and they don't really belong here.
</span><span class="cx"> // But they're needed at TextIndicator creation time, so they can't go in TextIndicatorWindow.
</span><span class="cx"> // Maybe they can live in some Theme code somewhere?
</span><del>-#if ENABLE(LEGACY_TEXT_INDICATOR_STYLE)
- constexpr static float defaultHorizontalMargin { 3 };
-#else
</del><span class="cx"> constexpr static float defaultHorizontalMargin { 2 };
</span><del>-#endif
</del><span class="cx"> constexpr static float defaultVerticalMargin { 1 };
</span><span class="cx">
</span><span class="cx"> WEBCORE_EXPORT static Ref<TextIndicator> create(const TextIndicatorData&);
</span></span></pre></div>
<a id="trunkSourceWebCorepagemacTextIndicatorWindowmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/page/mac/TextIndicatorWindow.mm (192829 => 192830)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/page/mac/TextIndicatorWindow.mm 2015-11-30 22:17:58 UTC (rev 192829)
+++ trunk/Source/WebCore/page/mac/TextIndicatorWindow.mm 2015-11-30 22:19:09 UTC (rev 192830)
</span><span class="lines">@@ -42,14 +42,6 @@
</span><span class="cx"> const CFTimeInterval timeBeforeFadeStarts = bounceAnimationDuration + 0.2;
</span><span class="cx"> const CFTimeInterval fadeOutAnimationDuration = 0.3;
</span><span class="cx">
</span><del>-#if ENABLE(LEGACY_TEXT_INDICATOR_STYLE)
-const CGFloat midBounceScale = 1.5;
-const CGFloat borderWidth = 1.0;
-const CGFloat cornerRadius = 3;
-const CGFloat dropShadowOffsetX = 0;
-const CGFloat dropShadowOffsetY = 1;
-const CGFloat dropShadowBlurRadius = 1.5;
-#else
</del><span class="cx"> const CGFloat midBounceScale = 1.25;
</span><span class="cx"> const CGFloat borderWidth = 0;
</span><span class="cx"> const CGFloat cornerRadius = 0;
</span><span class="lines">@@ -57,7 +49,6 @@
</span><span class="cx"> const CGFloat dropShadowOffsetY = 1;
</span><span class="cx"> const CGFloat dropShadowBlurRadius = 2;
</span><span class="cx"> const CGFloat rimShadowBlurRadius = 1;
</span><del>-#endif
</del><span class="cx">
</span><span class="cx"> NSString *textLayerKey = @"TextLayer";
</span><span class="cx"> NSString *dropShadowLayerKey = @"DropShadowLayer";
</span><span class="lines">@@ -182,8 +173,6 @@
</span><span class="cx"> RetainPtr<CGColorRef> dropShadowColor = [NSColor colorWithDeviceWhite:0 alpha:0.2].CGColor;
</span><span class="cx">
</span><span class="cx"> RetainPtr<CGColorRef> borderColor = [NSColor colorWithDeviceRed:.96 green:.90 blue:0 alpha:1].CGColor;
</span><del>- RetainPtr<CGColorRef> gradientDarkColor = [NSColor colorWithDeviceRed:.929 green:.8 blue:0 alpha:1].CGColor;
- RetainPtr<CGColorRef> gradientLightColor = [NSColor colorWithDeviceRed:.949 green:.937 blue:0 alpha:1].CGColor;
</del><span class="cx">
</span><span class="cx"> Vector<FloatRect> textRectsInBoundingRectCoordinates = _textIndicator->textRectsInBoundingRectCoordinates();
</span><span class="cx">
</span><span class="lines">@@ -222,7 +211,6 @@
</span><span class="cx"> [bounceLayer addSublayer:dropShadowLayer.get()];
</span><span class="cx"> [bounceLayer setValue:dropShadowLayer.get() forKey:dropShadowLayerKey];
</span><span class="cx">
</span><del>-#if !ENABLE(LEGACY_TEXT_INDICATOR_STYLE)
</del><span class="cx"> RetainPtr<CALayer> rimShadowLayer = adoptNS([[CALayer alloc] init]);
</span><span class="cx"> [rimShadowLayer setDelegate:[WebActionDisablingCALayerDelegate shared]];
</span><span class="cx"> [rimShadowLayer setFrame:yellowHighlightRect];
</span><span class="lines">@@ -234,14 +222,8 @@
</span><span class="cx"> [rimShadowLayer setFrame:yellowHighlightRect];
</span><span class="cx"> [bounceLayer addSublayer:rimShadowLayer.get()];
</span><span class="cx"> [bounceLayer setValue:rimShadowLayer.get() forKey:rimShadowLayerKey];
</span><del>-#endif
</del><span class="cx">
</span><del>-#if ENABLE(LEGACY_TEXT_INDICATOR_STYLE)
- RetainPtr<CAGradientLayer> textLayer = adoptNS([[CAGradientLayer alloc] init]);
- [textLayer setColors:@[ (id)gradientLightColor.get(), (id)gradientDarkColor.get() ]];
-#else
</del><span class="cx"> RetainPtr<CALayer> textLayer = adoptNS([[CALayer alloc] init]);
</span><del>-#endif
</del><span class="cx"> [textLayer setBackgroundColor:highlightColor.get()];
</span><span class="cx"> [textLayer setBorderColor:borderColor.get()];
</span><span class="cx"> [textLayer setBorderWidth:borderWidth];
</span></span></pre>
</div>
</div>
</body>
</html>