<!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>[177972] branches/safari-600.3-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/177972">177972</a></dd>
<dt>Author</dt> <dd>lforschler@apple.com</dd>
<dt>Date</dt> <dd>2015-01-06 11:12:36 -0800 (Tue, 06 Jan 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Rollout <a href="http://trac.webkit.org/projects/webkit/changeset/177936">r177936</a>. rdar://problem/19311017</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#branchessafari6003branchSourceWebCoreChangeLog">branches/safari-600.3-branch/Source/WebCore/ChangeLog</a></li>
<li><a href="#branchessafari6003branchSourceWebCorepageTextIndicatorcpp">branches/safari-600.3-branch/Source/WebCore/page/TextIndicator.cpp</a></li>
<li><a href="#branchessafari6003branchSourceWebCorepageTextIndicatorh">branches/safari-600.3-branch/Source/WebCore/page/TextIndicator.h</a></li>
<li><a href="#branchessafari6003branchSourceWebCorepagemacTextIndicatorWindowmm">branches/safari-600.3-branch/Source/WebCore/page/mac/TextIndicatorWindow.mm</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="branchessafari6003branchSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: branches/safari-600.3-branch/Source/WebCore/ChangeLog (177971 => 177972)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.3-branch/Source/WebCore/ChangeLog 2015-01-06 19:10:52 UTC (rev 177971)
+++ branches/safari-600.3-branch/Source/WebCore/ChangeLog 2015-01-06 19:12:36 UTC (rev 177972)
</span><span class="lines">@@ -1,3 +1,7 @@
</span><ins>+2015-01-06 Lucas Forschler <lforschler@apple.com>
+
+ Rollout r177936. rdar://problem/19311017
+
</ins><span class="cx"> 2015-01-05 Lucas Forschler <lforschler@apple.com>
</span><span class="cx">
</span><span class="cx"> Merge r177656. rdar://problem/19311017
</span></span></pre></div>
<a id="branchessafari6003branchSourceWebCorepageTextIndicatorcpp"></a>
<div class="modfile"><h4>Modified: branches/safari-600.3-branch/Source/WebCore/page/TextIndicator.cpp (177971 => 177972)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.3-branch/Source/WebCore/page/TextIndicator.cpp 2015-01-06 19:10:52 UTC (rev 177971)
+++ branches/safari-600.3-branch/Source/WebCore/page/TextIndicator.cpp 2015-01-06 19:12:36 UTC (rev 177972)
</span><span class="lines">@@ -194,56 +194,5 @@
</span><span class="cx"> TextIndicator::~TextIndicator()
</span><span class="cx"> {
</span><span class="cx"> }
</span><del>-
-bool TextIndicator::wantsBounce() const
-{
- switch (m_data.presentationTransition) {
- case TextIndicatorPresentationTransition::BounceAndCrossfade:
- case TextIndicatorPresentationTransition::Bounce:
- return true;
-
- case TextIndicatorPresentationTransition::FadeIn:
- case TextIndicatorPresentationTransition::Crossfade:
- case TextIndicatorPresentationTransition::None:
- return false;
- }
-
- return false;
-}
</del><span class="cx">
</span><del>-bool TextIndicator::wantsContentCrossfade() const
-{
- if (!m_data.contentImageWithHighlight)
- return false;
-
- switch (m_data.presentationTransition) {
- case TextIndicatorPresentationTransition::BounceAndCrossfade:
- case TextIndicatorPresentationTransition::Crossfade:
- return true;
-
- case TextIndicatorPresentationTransition::Bounce:
- case TextIndicatorPresentationTransition::FadeIn:
- case TextIndicatorPresentationTransition::None:
- return false;
- }
-
- return false;
-}
-
-bool TextIndicator::wantsFadeIn() const
-{
- switch (m_data.presentationTransition) {
- case TextIndicatorPresentationTransition::FadeIn:
- return true;
-
- case TextIndicatorPresentationTransition::Bounce:
- case TextIndicatorPresentationTransition::BounceAndCrossfade:
- case TextIndicatorPresentationTransition::Crossfade:
- case TextIndicatorPresentationTransition::None:
- return false;
- }
-
- return false;
-}
-
</del><span class="cx"> } // namespace WebCore
</span></span></pre></div>
<a id="branchessafari6003branchSourceWebCorepageTextIndicatorh"></a>
<div class="modfile"><h4>Modified: branches/safari-600.3-branch/Source/WebCore/page/TextIndicator.h (177971 => 177972)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.3-branch/Source/WebCore/page/TextIndicator.h 2015-01-06 19:10:52 UTC (rev 177971)
+++ branches/safari-600.3-branch/Source/WebCore/page/TextIndicator.h 2015-01-06 19:12:36 UTC (rev 177972)
</span><span class="lines">@@ -81,10 +81,6 @@
</span><span class="cx"> void setPresentationTransition(TextIndicatorPresentationTransition transition) { m_data.presentationTransition = transition; }
</span><span class="cx">
</span><span class="cx"> TextIndicatorData data() const { return m_data; }
</span><del>-
- bool wantsBounce() const;
- bool wantsContentCrossfade() const;
- bool wantsFadeIn() const;
</del><span class="cx">
</span><span class="cx"> private:
</span><span class="cx"> TextIndicator(const TextIndicatorData&);
</span></span></pre></div>
<a id="branchessafari6003branchSourceWebCorepagemacTextIndicatorWindowmm"></a>
<div class="modfile"><h4>Modified: branches/safari-600.3-branch/Source/WebCore/page/mac/TextIndicatorWindow.mm (177971 => 177972)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.3-branch/Source/WebCore/page/mac/TextIndicatorWindow.mm 2015-01-06 19:10:52 UTC (rev 177971)
+++ branches/safari-600.3-branch/Source/WebCore/page/mac/TextIndicatorWindow.mm 2015-01-06 19:12:36 UTC (rev 177972)
</span><span class="lines">@@ -95,7 +95,7 @@
</span><span class="cx"> self.wantsLayer = YES;
</span><span class="cx"> self.layer.anchorPoint = CGPointZero;
</span><span class="cx">
</span><del>- bool wantsCrossfade = _textIndicator->wantsContentCrossfade();
</del><ins>+ bool wantsCrossfade = [self _textIndicatorWantsContentCrossfade];
</ins><span class="cx">
</span><span class="cx"> FloatSize contentsImageLogicalSize = _textIndicator->contentImage()->size();
</span><span class="cx"> contentsImageLogicalSize.scale(1 / _textIndicator->contentImageScaleFactor());
</span><span class="lines">@@ -240,10 +240,64 @@
</span><span class="cx"> return fadeInAnimation;
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+- (bool)_textIndicatorWantsBounce
+{
+ switch (_textIndicator->presentationTransition()) {
+ case TextIndicatorPresentationTransition::BounceAndCrossfade:
+ case TextIndicatorPresentationTransition::Bounce:
+ return true;
+
+ case TextIndicatorPresentationTransition::FadeIn:
+ case TextIndicatorPresentationTransition::Crossfade:
+ case TextIndicatorPresentationTransition::None:
+ return false;
+ }
+
+ return false;
+}
+
+- (bool)_textIndicatorWantsContentCrossfade
+{
+ if (!_textIndicator->contentImageWithHighlight())
+ return false;
+
+ switch (_textIndicator->presentationTransition()) {
+ case TextIndicatorPresentationTransition::BounceAndCrossfade:
+ case TextIndicatorPresentationTransition::Crossfade:
+ return true;
+
+ case TextIndicatorPresentationTransition::Bounce:
+ case TextIndicatorPresentationTransition::FadeIn:
+ case TextIndicatorPresentationTransition::None:
+ return false;
+ }
+
+ return false;
+}
+
+- (bool)_textIndicatorWantsFadeIn
+{
+ switch (_textIndicator->presentationTransition()) {
+ case TextIndicatorPresentationTransition::FadeIn:
+ return true;
+
+ case TextIndicatorPresentationTransition::Bounce:
+ case TextIndicatorPresentationTransition::BounceAndCrossfade:
+ case TextIndicatorPresentationTransition::Crossfade:
+ case TextIndicatorPresentationTransition::None:
+ return false;
+ }
+
+ return false;
+}
+
</ins><span class="cx"> - (CFTimeInterval)_animationDuration
</span><span class="cx"> {
</span><del>- if (_textIndicator->wantsBounce()) {
- if (_textIndicator->wantsContentCrossfade())
</del><ins>+ bool wantsBounce = [self _textIndicatorWantsBounce];
+ bool wantsCrossfade = [self _textIndicatorWantsContentCrossfade];
+
+ if (wantsBounce) {
+ if (wantsCrossfade)
</ins><span class="cx"> return bounceWithCrossfadeAnimationDuration;
</span><span class="cx"> return bounceAnimationDuration;
</span><span class="cx"> }
</span><span class="lines">@@ -253,9 +307,9 @@
</span><span class="cx">
</span><span class="cx"> - (void)present
</span><span class="cx"> {
</span><del>- bool wantsBounce = _textIndicator->wantsBounce();
- bool wantsCrossfade = _textIndicator->wantsContentCrossfade();
- bool wantsFadeIn = _textIndicator->wantsFadeIn();
</del><ins>+ bool wantsBounce = [self _textIndicatorWantsBounce];
+ bool wantsCrossfade = [self _textIndicatorWantsContentCrossfade];
+ bool wantsFadeIn = [self _textIndicatorWantsFadeIn];
</ins><span class="cx"> CFTimeInterval animationDuration = [self _animationDuration];
</span><span class="cx">
</span><span class="cx"> _hasCompletedAnimation = false;
</span><span class="lines">@@ -383,13 +437,8 @@
</span><span class="cx"> if (!m_textIndicator)
</span><span class="cx"> return;
</span><span class="cx">
</span><del>- CGFloat horizontalMargin = dropShadowBlurRadius * 2 + horizontalBorder;
- CGFloat verticalMargin = dropShadowBlurRadius * 2 + verticalBorder;
-
- if (m_textIndicator->wantsBounce()) {
- horizontalMargin = std::max(horizontalMargin, contentRect.size.width * (midBounceScale - 1) + horizontalMargin);
- verticalMargin = std::max(verticalMargin, contentRect.size.height * (midBounceScale - 1) + verticalMargin);
- }
</del><ins>+ CGFloat horizontalMargin = std::max(dropShadowBlurRadius * 2 + horizontalBorder, contentRect.size.width * 2);
+ CGFloat verticalMargin = std::max(dropShadowBlurRadius * 2 + verticalBorder, contentRect.size.height * 2);
</ins><span class="cx">
</span><span class="cx"> contentRect = CGRectInset(contentRect, -horizontalMargin, -verticalMargin);
</span><span class="cx"> NSRect windowContentRect = [NSWindow contentRectForFrameRect:NSIntegralRect(NSRectFromCGRect(contentRect)) styleMask:NSBorderlessWindowMask];
</span></span></pre>
</div>
</div>
</body>
</html>