<!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>[178091] branches/safari-600.4-branch/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/178091">178091</a></dd>
<dt>Author</dt> <dd>matthew_hanson@apple.com</dd>
<dt>Date</dt> <dd>2015-01-07 20:17:44 -0800 (Wed, 07 Jan 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Merged <a href="http://trac.webkit.org/projects/webkit/changeset/177970">r177970</a>. rdar://problems/19383425</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#branchessafari6004branchSourceWebCoreChangeLog">branches/safari-600.4-branch/Source/WebCore/ChangeLog</a></li>
<li><a href="#branchessafari6004branchSourceWebCorepageTextIndicatorcpp">branches/safari-600.4-branch/Source/WebCore/page/TextIndicator.cpp</a></li>
<li><a href="#branchessafari6004branchSourceWebCorepageTextIndicatorh">branches/safari-600.4-branch/Source/WebCore/page/TextIndicator.h</a></li>
<li><a href="#branchessafari6004branchSourceWebCorepagemacTextIndicatorWindowmm">branches/safari-600.4-branch/Source/WebCore/page/mac/TextIndicatorWindow.mm</a></li>
<li><a href="#branchessafari6004branchSourceWebKit2ChangeLog">branches/safari-600.4-branch/Source/WebKit2/ChangeLog</a></li>
<li><a href="#branchessafari6004branchSourceWebKit2UIProcessmacPageClientImplmm">branches/safari-600.4-branch/Source/WebKit2/UIProcess/mac/PageClientImpl.mm</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="branchessafari6004branchSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: branches/safari-600.4-branch/Source/WebCore/ChangeLog (178090 => 178091)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.4-branch/Source/WebCore/ChangeLog 2015-01-08 04:17:41 UTC (rev 178090)
+++ branches/safari-600.4-branch/Source/WebCore/ChangeLog 2015-01-08 04:17:44 UTC (rev 178091)
</span><span class="lines">@@ -1,5 +1,31 @@
</span><span class="cx"> 2015-01-07 Matthew Hanson <matthew_hanson@apple.com>
</span><span class="cx">
</span><ins>+ Merge r177970. rdar://problem/19383425
+
+ 2015-01-06 Timothy Horton <timothy_horton@apple.com>
+
+ Make explicit which TextIndicator animations are driven manually, and which run automatically
+ https://bugs.webkit.org/show_bug.cgi?id=140113
+ <rdar://problem/19383425>
+
+ Reviewed by Darin Adler.
+
+ * page/TextIndicator.cpp:
+ (WebCore::TextIndicator::wantsManualAnimation):
+ Add wantsManualAnimation(). The old transitions (Bounce and BounceAndCrossfade)
+ run automatically, and the new ones (FadeIn and Crossfade) are driven manually.
+
+ * page/TextIndicator.h:
+ Add a comment explaining which animations are manual and which are not.
+
+ * page/mac/TextIndicatorWindow.mm:
+ (-[WebTextIndicatorView present]):
+ Make use of wantsManualAnimation(). The previous (wantsFadeIn || wantsCrossfade)
+ was wrong, because it was true for BounceAndCrossfade, and would cause
+ BounceAndCrossfade animations (which aren't driven manually) to stall at progress=0.
+
+2015-01-07 Matthew Hanson <matthew_hanson@apple.com>
+
</ins><span class="cx"> Merge r177705. rdar://problem/19333076
</span><span class="cx">
</span><span class="cx"> 2014-12-23 Timothy Horton <timothy_horton@apple.com>
</span></span></pre></div>
<a id="branchessafari6004branchSourceWebCorepageTextIndicatorcpp"></a>
<div class="modfile"><h4>Modified: branches/safari-600.4-branch/Source/WebCore/page/TextIndicator.cpp (178090 => 178091)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.4-branch/Source/WebCore/page/TextIndicator.cpp 2015-01-08 04:17:41 UTC (rev 178090)
+++ branches/safari-600.4-branch/Source/WebCore/page/TextIndicator.cpp 2015-01-08 04:17:44 UTC (rev 178091)
</span><span class="lines">@@ -207,7 +207,8 @@
</span><span class="cx"> case TextIndicatorPresentationTransition::None:
</span><span class="cx"> return false;
</span><span class="cx"> }
</span><del>-
</del><ins>+
+ ASSERT_NOT_REACHED();
</ins><span class="cx"> return false;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -226,7 +227,8 @@
</span><span class="cx"> case TextIndicatorPresentationTransition::None:
</span><span class="cx"> return false;
</span><span class="cx"> }
</span><del>-
</del><ins>+
+ ASSERT_NOT_REACHED();
</ins><span class="cx"> return false;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -242,8 +244,26 @@
</span><span class="cx"> case TextIndicatorPresentationTransition::None:
</span><span class="cx"> return false;
</span><span class="cx"> }
</span><del>-
</del><ins>+
+ ASSERT_NOT_REACHED();
</ins><span class="cx"> return false;
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+bool TextIndicator::wantsManualAnimation() const
+{
+ switch (m_data.presentationTransition) {
+ case TextIndicatorPresentationTransition::FadeIn:
+ case TextIndicatorPresentationTransition::Crossfade:
+ return true;
+
+ case TextIndicatorPresentationTransition::Bounce:
+ case TextIndicatorPresentationTransition::BounceAndCrossfade:
+ case TextIndicatorPresentationTransition::None:
+ return false;
+ }
+
+ ASSERT_NOT_REACHED();
+ return false;
+}
+
</ins><span class="cx"> } // namespace WebCore
</span></span></pre></div>
<a id="branchessafari6004branchSourceWebCorepageTextIndicatorh"></a>
<div class="modfile"><h4>Modified: branches/safari-600.4-branch/Source/WebCore/page/TextIndicator.h (178090 => 178091)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.4-branch/Source/WebCore/page/TextIndicator.h 2015-01-08 04:17:41 UTC (rev 178090)
+++ branches/safari-600.4-branch/Source/WebCore/page/TextIndicator.h 2015-01-08 04:17:44 UTC (rev 178091)
</span><span class="lines">@@ -46,8 +46,12 @@
</span><span class="cx">
</span><span class="cx"> enum class TextIndicatorPresentationTransition {
</span><span class="cx"> None,
</span><ins>+
+ // These animations drive themselves.
</ins><span class="cx"> Bounce,
</span><span class="cx"> BounceAndCrossfade,
</span><ins>+
+ // These animations need to be driven manually via TextIndicatorWindow::setAnimationProgress.
</ins><span class="cx"> FadeIn,
</span><span class="cx"> Crossfade
</span><span class="cx"> };
</span><span class="lines">@@ -85,6 +89,7 @@
</span><span class="cx"> bool wantsBounce() const;
</span><span class="cx"> bool wantsContentCrossfade() const;
</span><span class="cx"> bool wantsFadeIn() const;
</span><ins>+ bool wantsManualAnimation() const;
</ins><span class="cx">
</span><span class="cx"> private:
</span><span class="cx"> TextIndicator(const TextIndicatorData&);
</span></span></pre></div>
<a id="branchessafari6004branchSourceWebCorepagemacTextIndicatorWindowmm"></a>
<div class="modfile"><h4>Modified: branches/safari-600.4-branch/Source/WebCore/page/mac/TextIndicatorWindow.mm (178090 => 178091)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.4-branch/Source/WebCore/page/mac/TextIndicatorWindow.mm 2015-01-08 04:17:41 UTC (rev 178090)
+++ branches/safari-600.4-branch/Source/WebCore/page/mac/TextIndicatorWindow.mm 2015-01-08 04:17:44 UTC (rev 178091)
</span><span class="lines">@@ -275,7 +275,7 @@
</span><span class="cx">
</span><span class="cx"> [CATransaction begin];
</span><span class="cx"> for (CALayer *bounceLayer in _bounceLayers.get()) {
</span><del>- if (wantsFadeIn || wantsCrossfade)
</del><ins>+ if (_textIndicator->wantsManualAnimation())
</ins><span class="cx"> bounceLayer.speed = 0;
</span><span class="cx">
</span><span class="cx"> if (!wantsFadeIn)
</span></span></pre></div>
<a id="branchessafari6004branchSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: branches/safari-600.4-branch/Source/WebKit2/ChangeLog (178090 => 178091)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.4-branch/Source/WebKit2/ChangeLog 2015-01-08 04:17:41 UTC (rev 178090)
+++ branches/safari-600.4-branch/Source/WebKit2/ChangeLog 2015-01-08 04:17:44 UTC (rev 178091)
</span><span class="lines">@@ -1,5 +1,21 @@
</span><span class="cx"> 2015-01-07 Matthew Hanson <matthew_hanson@apple.com>
</span><span class="cx">
</span><ins>+ Merge r177970. rdar://problem/19383425
+
+ 2015-01-06 Timothy Horton <timothy_horton@apple.com>
+
+ Make explicit which TextIndicator animations are driven manually, and which run automatically
+ https://bugs.webkit.org/show_bug.cgi?id=140113
+ <rdar://problem/19383425>
+
+ Reviewed by Darin Adler.
+
+ * UIProcess/mac/PageClientImpl.mm:
+ (WebKit::PageClientImpl::didPerformDictionaryLookup):
+ Delete an inaccurate comment.
+
+2015-01-07 Matthew Hanson <matthew_hanson@apple.com>
+
</ins><span class="cx"> Merge r177928. rdar://problem/19298391
</span><span class="cx">
</span><span class="cx"> 2015-01-05 Timothy Horton <timothy_horton@apple.com>
</span></span></pre></div>
<a id="branchessafari6004branchSourceWebKit2UIProcessmacPageClientImplmm"></a>
<div class="modfile"><h4>Modified: branches/safari-600.4-branch/Source/WebKit2/UIProcess/mac/PageClientImpl.mm (178090 => 178091)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.4-branch/Source/WebKit2/UIProcess/mac/PageClientImpl.mm 2015-01-08 04:17:41 UTC (rev 178090)
+++ branches/safari-600.4-branch/Source/WebKit2/UIProcess/mac/PageClientImpl.mm 2015-01-08 04:17:44 UTC (rev 178091)
</span><span class="lines">@@ -562,9 +562,6 @@
</span><span class="cx"> RetainPtr<NSMutableDictionary> mutableOptions = adoptNS([(NSDictionary *)dictionaryPopupInfo.options.get() mutableCopy]);
</span><span class="cx">
</span><span class="cx"> if (canLoadLUTermOptionDisableSearchTermIndicator() && dictionaryPopupInfo.textIndicator.contentImage) {
</span><del>- // Run the animations serially because attaching another subwindow breaks the bounce animation.
- // We could consider making the bounce NSAnimationNonblockingThreaded instead, which seems
- // to work, but need to consider all of the implications.
</del><span class="cx"> [m_wkView _setTextIndicator:TextIndicator::create(dictionaryPopupInfo.textIndicator) fadeOut:NO];
</span><span class="cx"> [mutableOptions setObject:@YES forKey:getLUTermOptionDisableSearchTermIndicator()];
</span><span class="cx"> [getLULookupDefinitionModuleClass() showDefinitionForTerm:dictionaryPopupInfo.attributedString.string.get() atLocation:textBaselineOrigin options:mutableOptions.get()];
</span></span></pre>
</div>
</div>
</body>
</html>