<!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>[187461] 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/187461">187461</a></dd>
<dt>Author</dt> <dd>simon.fraser@apple.com</dd>
<dt>Date</dt> <dd>2015-07-27 16:25:01 -0700 (Mon, 27 Jul 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Rename AnimationBase::isTransformFunctionListValid()
https://bugs.webkit.org/show_bug.cgi?id=147334
Reviewed by Sam Weinig.
isTransformFunctionListValid() was a confusing name for this state. It's true
when the transform function lists for an animation or transition are matched,
so rename it to transformFunctionListsMatch().
No behavior change.
* page/animation/AnimationBase.h:
(WebCore::AnimationBase::transformFunctionListsMatch):
(WebCore::AnimationBase::isTransformFunctionListValid): Deleted.
* page/animation/CSSPropertyAnimation.cpp:
(WebCore::blendFunc):
* page/animation/ImplicitAnimation.cpp:
(WebCore::ImplicitAnimation::computeExtentOfTransformAnimation):
(WebCore::ImplicitAnimation::validateTransformFunctionList):
* page/animation/KeyframeAnimation.cpp:
(WebCore::KeyframeAnimation::computeExtentOfTransformAnimation):
(WebCore::KeyframeAnimation::validateTransformFunctionList):</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCorepageanimationAnimationBaseh">trunk/Source/WebCore/page/animation/AnimationBase.h</a></li>
<li><a href="#trunkSourceWebCorepageanimationCSSPropertyAnimationcpp">trunk/Source/WebCore/page/animation/CSSPropertyAnimation.cpp</a></li>
<li><a href="#trunkSourceWebCorepageanimationImplicitAnimationcpp">trunk/Source/WebCore/page/animation/ImplicitAnimation.cpp</a></li>
<li><a href="#trunkSourceWebCorepageanimationKeyframeAnimationcpp">trunk/Source/WebCore/page/animation/KeyframeAnimation.cpp</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (187460 => 187461)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2015-07-27 23:04:43 UTC (rev 187460)
+++ trunk/Source/WebCore/ChangeLog 2015-07-27 23:25:01 UTC (rev 187461)
</span><span class="lines">@@ -1,3 +1,28 @@
</span><ins>+2015-07-27 Simon Fraser <simon.fraser@apple.com>
+
+ Rename AnimationBase::isTransformFunctionListValid()
+ https://bugs.webkit.org/show_bug.cgi?id=147334
+
+ Reviewed by Sam Weinig.
+
+ isTransformFunctionListValid() was a confusing name for this state. It's true
+ when the transform function lists for an animation or transition are matched,
+ so rename it to transformFunctionListsMatch().
+
+ No behavior change.
+
+ * page/animation/AnimationBase.h:
+ (WebCore::AnimationBase::transformFunctionListsMatch):
+ (WebCore::AnimationBase::isTransformFunctionListValid): Deleted.
+ * page/animation/CSSPropertyAnimation.cpp:
+ (WebCore::blendFunc):
+ * page/animation/ImplicitAnimation.cpp:
+ (WebCore::ImplicitAnimation::computeExtentOfTransformAnimation):
+ (WebCore::ImplicitAnimation::validateTransformFunctionList):
+ * page/animation/KeyframeAnimation.cpp:
+ (WebCore::KeyframeAnimation::computeExtentOfTransformAnimation):
+ (WebCore::KeyframeAnimation::validateTransformFunctionList):
+
</ins><span class="cx"> 2015-07-27 Alex Christensen <achristensen@webkit.org>
</span><span class="cx">
</span><span class="cx"> Progress towards building AppleWin with CMake
</span></span></pre></div>
<a id="trunkSourceWebCorepageanimationAnimationBaseh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/page/animation/AnimationBase.h (187460 => 187461)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/page/animation/AnimationBase.h 2015-07-27 23:04:43 UTC (rev 187460)
+++ trunk/Source/WebCore/page/animation/AnimationBase.h 2015-07-27 23:25:01 UTC (rev 187461)
</span><span class="lines">@@ -185,8 +185,7 @@
</span><span class="cx"> return false;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- // FIXME: rename this using the "lists match" terminology.
- bool isTransformFunctionListValid() const { return m_transformFunctionListValid; }
</del><ins>+ bool transformFunctionListsMatch() const { return m_transformFunctionListsMatch; }
</ins><span class="cx"> bool filterFunctionListsMatch() const { return m_filterFunctionListsMatch; }
</span><span class="cx"> #if ENABLE(FILTERS_LEVEL_2)
</span><span class="cx"> bool backdropFilterFunctionListsMatch() const { return m_backdropFilterFunctionListsMatch; }
</span><span class="lines">@@ -256,7 +255,7 @@
</span><span class="cx">
</span><span class="cx"> AnimationState m_animationState { AnimationState::New };
</span><span class="cx"> bool m_isAccelerated { false };
</span><del>- bool m_transformFunctionListValid { false };
</del><ins>+ bool m_transformFunctionListsMatch { false };
</ins><span class="cx"> bool m_filterFunctionListsMatch { false };
</span><span class="cx"> #if ENABLE(FILTERS_LEVEL_2)
</span><span class="cx"> bool m_backdropFilterFunctionListsMatch { false };
</span></span></pre></div>
<a id="trunkSourceWebCorepageanimationCSSPropertyAnimationcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/page/animation/CSSPropertyAnimation.cpp (187460 => 187461)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/page/animation/CSSPropertyAnimation.cpp 2015-07-27 23:04:43 UTC (rev 187460)
+++ trunk/Source/WebCore/page/animation/CSSPropertyAnimation.cpp 2015-07-27 23:25:01 UTC (rev 187461)
</span><span class="lines">@@ -116,7 +116,7 @@
</span><span class="cx">
</span><span class="cx"> static inline TransformOperations blendFunc(const AnimationBase* animation, const TransformOperations& from, const TransformOperations& to, double progress)
</span><span class="cx"> {
</span><del>- if (animation->isTransformFunctionListValid())
</del><ins>+ if (animation->transformFunctionListsMatch())
</ins><span class="cx"> return to.blendByMatchingOperations(from, progress);
</span><span class="cx"> return to.blendByUsingMatrixInterpolation(from, progress, is<RenderBox>(*animation->renderer()) ? downcast<RenderBox>(*animation->renderer()).borderBoxRect().size() : LayoutSize());
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebCorepageanimationImplicitAnimationcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/page/animation/ImplicitAnimation.cpp (187460 => 187461)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/page/animation/ImplicitAnimation.cpp 2015-07-27 23:04:43 UTC (rev 187460)
+++ trunk/Source/WebCore/page/animation/ImplicitAnimation.cpp 2015-07-27 23:25:01 UTC (rev 187461)
</span><span class="lines">@@ -118,7 +118,7 @@
</span><span class="cx"> LayoutRect startBounds = bounds;
</span><span class="cx"> LayoutRect endBounds = bounds;
</span><span class="cx">
</span><del>- if (isTransformFunctionListValid()) {
</del><ins>+ if (transformFunctionListsMatch()) {
</ins><span class="cx"> if (!computeTransformedExtentViaTransformList(rendererBox, *m_fromStyle, startBounds))
</span><span class="cx"> return false;
</span><span class="cx">
</span><span class="lines">@@ -260,7 +260,7 @@
</span><span class="cx">
</span><span class="cx"> void ImplicitAnimation::validateTransformFunctionList()
</span><span class="cx"> {
</span><del>- m_transformFunctionListValid = false;
</del><ins>+ m_transformFunctionListsMatch = false;
</ins><span class="cx">
</span><span class="cx"> if (!m_fromStyle || !m_toStyle)
</span><span class="cx"> return;
</span><span class="lines">@@ -279,7 +279,7 @@
</span><span class="cx"> return;
</span><span class="cx">
</span><span class="cx"> // Transform lists match.
</span><del>- m_transformFunctionListValid = true;
</del><ins>+ m_transformFunctionListsMatch = true;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> static bool filterOperationsMatch(const FilterOperations* fromOperations, const FilterOperations& toOperations)
</span></span></pre></div>
<a id="trunkSourceWebCorepageanimationKeyframeAnimationcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/page/animation/KeyframeAnimation.cpp (187460 => 187461)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/page/animation/KeyframeAnimation.cpp 2015-07-27 23:04:43 UTC (rev 187460)
+++ trunk/Source/WebCore/page/animation/KeyframeAnimation.cpp 2015-07-27 23:25:01 UTC (rev 187461)
</span><span class="lines">@@ -230,7 +230,7 @@
</span><span class="cx"> LayoutRect keyframeBounds = bounds;
</span><span class="cx">
</span><span class="cx"> bool canCompute;
</span><del>- if (isTransformFunctionListValid())
</del><ins>+ if (transformFunctionListsMatch())
</ins><span class="cx"> canCompute = computeTransformedExtentViaTransformList(rendererBox, *keyframe.style(), keyframeBounds);
</span><span class="cx"> else
</span><span class="cx"> canCompute = computeTransformedExtentViaMatrix(rendererBox, *keyframe.style(), keyframeBounds);
</span><span class="lines">@@ -364,7 +364,7 @@
</span><span class="cx">
</span><span class="cx"> void KeyframeAnimation::validateTransformFunctionList()
</span><span class="cx"> {
</span><del>- m_transformFunctionListValid = false;
</del><ins>+ m_transformFunctionListsMatch = false;
</ins><span class="cx">
</span><span class="cx"> if (m_keyframes.size() < 2 || !m_keyframes.containsProperty(CSSPropertyTransform))
</span><span class="cx"> return;
</span><span class="lines">@@ -399,8 +399,7 @@
</span><span class="cx"> return;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- // Keyframes are valid
- m_transformFunctionListValid = true;
</del><ins>+ m_transformFunctionListsMatch = true;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void KeyframeAnimation::checkForMatchingFilterFunctionLists()
</span></span></pre>
</div>
</div>
</body>
</html>