<!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>[165354] trunk/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/165354">165354</a></dd>
<dt>Author</dt> <dd>zalan@apple.com</dd>
<dt>Date</dt> <dd>2014-03-09 13:27:31 -0700 (Sun, 09 Mar 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Subpixel rendering: Pass FloatSize boxsize to transform animations to support device pixel sizing.
https://bugs.webkit.org/show_bug.cgi?id=129985
Reviewed by Simon Fraser.
This is in preparation to stop passing integral positioned boxes to transform animations.
No change in behavior.
Source/WebCore:
* WebCore.exp.in:
* platform/graphics/GraphicsLayer.h:
(WebCore::GraphicsLayer::addAnimation):
* platform/graphics/ca/GraphicsLayerCA.cpp:
(WebCore::getTransformFunctionValue):
(WebCore::GraphicsLayerCA::addAnimation):
(WebCore::GraphicsLayerCA::appendToUncommittedAnimations):
(WebCore::GraphicsLayerCA::createTransformAnimationsFromKeyframes):
(WebCore::GraphicsLayerCA::setTransformAnimationEndpoints):
(WebCore::GraphicsLayerCA::setTransformAnimationKeyframes):
* platform/graphics/ca/GraphicsLayerCA.h:
* rendering/RenderLayerBacking.cpp:
(WebCore::RenderLayerBacking::startTransition):
Source/WebKit2:
* WebProcess/WebPage/mac/GraphicsLayerCARemote.h:</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreWebCoreexpin">trunk/Source/WebCore/WebCore.exp.in</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicsGraphicsLayerh">trunk/Source/WebCore/platform/graphics/GraphicsLayer.h</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicsGraphicsLayerAnimationcpp">trunk/Source/WebCore/platform/graphics/GraphicsLayerAnimation.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicsGraphicsLayerAnimationh">trunk/Source/WebCore/platform/graphics/GraphicsLayerAnimation.h</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicscaGraphicsLayerCAcpp">trunk/Source/WebCore/platform/graphics/ca/GraphicsLayerCA.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicscaGraphicsLayerCAh">trunk/Source/WebCore/platform/graphics/ca/GraphicsLayerCA.h</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicstexmapcoordinatedCoordinatedGraphicsLayercpp">trunk/Source/WebCore/platform/graphics/texmap/coordinated/CoordinatedGraphicsLayer.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicstexmapcoordinatedCoordinatedGraphicsLayerh">trunk/Source/WebCore/platform/graphics/texmap/coordinated/CoordinatedGraphicsLayer.h</a></li>
<li><a href="#trunkSourceWebCorerenderingRenderLayerBackingcpp">trunk/Source/WebCore/rendering/RenderLayerBacking.cpp</a></li>
<li><a href="#trunkSourceWebKit2ChangeLog">trunk/Source/WebKit2/ChangeLog</a></li>
<li><a href="#trunkSourceWebKit2WebProcessWebPagemacGraphicsLayerCARemoteh">trunk/Source/WebKit2/WebProcess/WebPage/mac/GraphicsLayerCARemote.h</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (165353 => 165354)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2014-03-09 19:09:32 UTC (rev 165353)
+++ trunk/Source/WebCore/ChangeLog 2014-03-09 20:27:31 UTC (rev 165354)
</span><span class="lines">@@ -1,3 +1,28 @@
</span><ins>+2014-03-09 Zalan Bujtas <zalan@apple.com>
+
+ Subpixel rendering: Pass FloatSize boxsize to transform animations to support device pixel sizing.
+ https://bugs.webkit.org/show_bug.cgi?id=129985
+
+ Reviewed by Simon Fraser.
+
+ This is in preparation to stop passing integral positioned boxes to transform animations.
+
+ No change in behavior.
+
+ * WebCore.exp.in:
+ * platform/graphics/GraphicsLayer.h:
+ (WebCore::GraphicsLayer::addAnimation):
+ * platform/graphics/ca/GraphicsLayerCA.cpp:
+ (WebCore::getTransformFunctionValue):
+ (WebCore::GraphicsLayerCA::addAnimation):
+ (WebCore::GraphicsLayerCA::appendToUncommittedAnimations):
+ (WebCore::GraphicsLayerCA::createTransformAnimationsFromKeyframes):
+ (WebCore::GraphicsLayerCA::setTransformAnimationEndpoints):
+ (WebCore::GraphicsLayerCA::setTransformAnimationKeyframes):
+ * platform/graphics/ca/GraphicsLayerCA.h:
+ * rendering/RenderLayerBacking.cpp:
+ (WebCore::RenderLayerBacking::startTransition):
+
</ins><span class="cx"> 2014-03-08 Simon Fraser <simon.fraser@apple.com>
</span><span class="cx">
</span><span class="cx"> [iOS Wk2] Can't scroll after going back to page in page cache
</span></span></pre></div>
<a id="trunkSourceWebCoreWebCoreexpin"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/WebCore.exp.in (165353 => 165354)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/WebCore.exp.in 2014-03-09 19:09:32 UTC (rev 165353)
+++ trunk/Source/WebCore/WebCore.exp.in 2014-03-09 20:27:31 UTC (rev 165354)
</span><span class="lines">@@ -521,7 +521,7 @@
</span><span class="cx"> __ZN7WebCore15GraphicsLayerCA10setOpacityEf
</span><span class="cx"> __ZN7WebCore15GraphicsLayerCA11setChildrenERKN3WTF6VectorIPNS_13GraphicsLayerELm0ENS1_15CrashOnOverflowEEE
</span><span class="cx"> __ZN7WebCore15GraphicsLayerCA11setPositionERKNS_10FloatPointE
</span><del>-__ZN7WebCore15GraphicsLayerCA12addAnimationERKNS_17KeyframeValueListERKNS_7IntSizeEPKNS_9AnimationERKN3WTF6StringEd
</del><ins>+__ZN7WebCore15GraphicsLayerCA12addAnimationERKNS_17KeyframeValueListERKNS_9FloatSizeEPKNS_9AnimationERKN3WTF6StringEd
</ins><span class="cx"> __ZN7WebCore15GraphicsLayerCA12replaceChildEPNS_13GraphicsLayerES2_
</span><span class="cx"> __ZN7WebCore15GraphicsLayerCA12setBlendModeENS_9BlendModeE
</span><span class="cx"> __ZN7WebCore15GraphicsLayerCA12setMaskLayerEPNS_13GraphicsLayerE
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicsGraphicsLayerh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/GraphicsLayer.h (165353 => 165354)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/GraphicsLayer.h 2014-03-09 19:09:32 UTC (rev 165353)
+++ trunk/Source/WebCore/platform/graphics/GraphicsLayer.h 2014-03-09 20:27:31 UTC (rev 165354)
</span><span class="lines">@@ -388,7 +388,7 @@
</span><span class="cx"> // Return true if the animation is handled by the compositing system. If this returns
</span><span class="cx"> // false, the animation will be run by AnimationController.
</span><span class="cx"> // These methods handle both transitions and keyframe animations.
</span><del>- virtual bool addAnimation(const KeyframeValueList&, const IntSize& /*boxSize*/, const Animation*, const String& /*animationName*/, double /*timeOffset*/) { return false; }
</del><ins>+ virtual bool addAnimation(const KeyframeValueList&, const FloatSize& /*boxSize*/, const Animation*, const String& /*animationName*/, double /*timeOffset*/) { return false; }
</ins><span class="cx"> virtual void pauseAnimation(const String& /*animationName*/, double /*timeOffset*/) { }
</span><span class="cx"> virtual void removeAnimation(const String& /*animationName*/) { }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicsGraphicsLayerAnimationcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/GraphicsLayerAnimation.cpp (165353 => 165354)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/GraphicsLayerAnimation.cpp 2014-03-09 19:09:32 UTC (rev 165353)
+++ trunk/Source/WebCore/platform/graphics/GraphicsLayerAnimation.cpp 2014-03-09 20:27:31 UTC (rev 165354)
</span><span class="lines">@@ -28,17 +28,17 @@
</span><span class="cx"> namespace WebCore {
</span><span class="cx">
</span><span class="cx"> #if ENABLE(CSS_FILTERS)
</span><del>-static inline PassRefPtr<FilterOperation> blendFunc(FilterOperation* fromOp, FilterOperation* toOp, double progress, const IntSize& size, bool blendToPassthrough = false)
</del><ins>+static inline PassRefPtr<FilterOperation> blendFunc(FilterOperation* fromOp, FilterOperation* toOp, double progress, const FloatSize& size, bool blendToPassthrough = false)
</ins><span class="cx"> {
</span><span class="cx"> ASSERT(toOp);
</span><span class="cx"> if (toOp->blendingNeedsRendererSize())
</span><del>- return toOp->blend(fromOp, progress, LayoutSize(size.width(), size.height()), blendToPassthrough);
</del><ins>+ return toOp->blend(fromOp, progress, LayoutSize(size), blendToPassthrough);
</ins><span class="cx">
</span><span class="cx"> return toOp->blend(fromOp, progress, blendToPassthrough);
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx">
</span><del>-static FilterOperations applyFilterAnimation(const FilterOperations& from, const FilterOperations& to, double progress, const IntSize& boxSize)
</del><ins>+static FilterOperations applyFilterAnimation(const FilterOperations& from, const FilterOperations& to, double progress, const FloatSize& boxSize)
</ins><span class="cx"> {
</span><span class="cx"> // First frame of an animation.
</span><span class="cx"> if (!progress)
</span><span class="lines">@@ -154,7 +154,7 @@
</span><span class="cx"> return progress;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-static TransformationMatrix applyTransformAnimation(const TransformOperations& from, const TransformOperations& to, double progress, const IntSize& boxSize, bool listsMatch)
</del><ins>+static TransformationMatrix applyTransformAnimation(const TransformOperations& from, const TransformOperations& to, double progress, const FloatSize& boxSize, bool listsMatch)
</ins><span class="cx"> {
</span><span class="cx"> TransformationMatrix matrix;
</span><span class="cx">
</span><span class="lines">@@ -212,7 +212,7 @@
</span><span class="cx"> return CubicBezierTimingFunction::defaultTimingFunction();
</span><span class="cx"> }
</span><span class="cx">
</span><del>-GraphicsLayerAnimation::GraphicsLayerAnimation(const String& name, const KeyframeValueList& keyframes, const IntSize& boxSize, const Animation* animation, double startTime, bool listsMatch)
</del><ins>+GraphicsLayerAnimation::GraphicsLayerAnimation(const String& name, const KeyframeValueList& keyframes, const FloatSize& boxSize, const Animation* animation, double startTime, bool listsMatch)
</ins><span class="cx"> : m_keyframes(keyframes)
</span><span class="cx"> , m_boxSize(boxSize)
</span><span class="cx"> , m_animation(Animation::create(*animation))
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicsGraphicsLayerAnimationh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/GraphicsLayerAnimation.h (165353 => 165354)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/GraphicsLayerAnimation.h 2014-03-09 19:09:32 UTC (rev 165353)
+++ trunk/Source/WebCore/platform/graphics/GraphicsLayerAnimation.h 2014-03-09 20:27:31 UTC (rev 165354)
</span><span class="lines">@@ -42,7 +42,7 @@
</span><span class="cx"> GraphicsLayerAnimation()
</span><span class="cx"> : m_keyframes(AnimatedPropertyInvalid)
</span><span class="cx"> { }
</span><del>- GraphicsLayerAnimation(const String&, const KeyframeValueList&, const IntSize&, const Animation*, double, bool);
</del><ins>+ GraphicsLayerAnimation(const String&, const KeyframeValueList&, const FloatSize&, const Animation*, double, bool);
</ins><span class="cx"> void apply(Client*);
</span><span class="cx"> void pause(double);
</span><span class="cx"> void resume();
</span><span class="lines">@@ -56,7 +56,7 @@
</span><span class="cx"> AnimatedPropertyID property() const { return m_keyframes.property(); }
</span><span class="cx"> bool isActive() const;
</span><span class="cx"> String name() const { return m_name; }
</span><del>- IntSize boxSize() const { return m_boxSize; }
</del><ins>+ FloatSize boxSize() const { return m_boxSize; }
</ins><span class="cx"> double startTime() const { return m_startTime; }
</span><span class="cx"> double pauseTime() const { return m_pauseTime; }
</span><span class="cx"> PassRefPtr<Animation> animation() const { return m_animation.get(); }
</span><span class="lines">@@ -66,7 +66,7 @@
</span><span class="cx"> private:
</span><span class="cx"> void applyInternal(Client*, const AnimationValue& from, const AnimationValue& to, float progress);
</span><span class="cx"> KeyframeValueList m_keyframes;
</span><del>- IntSize m_boxSize;
</del><ins>+ FloatSize m_boxSize;
</ins><span class="cx"> RefPtr<Animation> m_animation;
</span><span class="cx"> String m_name;
</span><span class="cx"> bool m_listsMatch;
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicscaGraphicsLayerCAcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/ca/GraphicsLayerCA.cpp (165353 => 165354)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/ca/GraphicsLayerCA.cpp 2014-03-09 19:09:32 UTC (rev 165353)
+++ trunk/Source/WebCore/platform/graphics/ca/GraphicsLayerCA.cpp 2014-03-09 20:27:31 UTC (rev 165354)
</span><span class="lines">@@ -129,7 +129,7 @@
</span><span class="cx"> return !isTransformTypeTransformationMatrix(transformType) && !isTransformTypeFloatPoint3D(transformType);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-static void getTransformFunctionValue(const TransformOperation* transformOp, TransformOperation::OperationType transformType, const IntSize& size, float& value)
</del><ins>+static void getTransformFunctionValue(const TransformOperation* transformOp, TransformOperation::OperationType transformType, const FloatSize& size, float& value)
</ins><span class="cx"> {
</span><span class="cx"> switch (transformType) {
</span><span class="cx"> case TransformOperation::ROTATE:
</span><span class="lines">@@ -160,7 +160,7 @@
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><del>-static void getTransformFunctionValue(const TransformOperation* transformOp, TransformOperation::OperationType transformType, const IntSize& size, FloatPoint3D& value)
</del><ins>+static void getTransformFunctionValue(const TransformOperation* transformOp, TransformOperation::OperationType transformType, const FloatSize& size, FloatPoint3D& value)
</ins><span class="cx"> {
</span><span class="cx"> switch (transformType) {
</span><span class="cx"> case TransformOperation::SCALE:
</span><span class="lines">@@ -180,7 +180,7 @@
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><del>-static void getTransformFunctionValue(const TransformOperation* transformOp, TransformOperation::OperationType transformType, const IntSize& size, TransformationMatrix& value)
</del><ins>+static void getTransformFunctionValue(const TransformOperation* transformOp, TransformOperation::OperationType transformType, const FloatSize& size, TransformationMatrix& value)
</ins><span class="cx"> {
</span><span class="cx"> switch (transformType) {
</span><span class="cx"> case TransformOperation::SKEW_X:
</span><span class="lines">@@ -787,7 +787,7 @@
</span><span class="cx"> return drawsContent() && !tiledBacking();
</span><span class="cx"> }
</span><span class="cx">
</span><del>-bool GraphicsLayerCA::addAnimation(const KeyframeValueList& valueList, const IntSize& boxSize, const Animation* anim, const String& animationName, double timeOffset)
</del><ins>+bool GraphicsLayerCA::addAnimation(const KeyframeValueList& valueList, const FloatSize& boxSize, const Animation* anim, const String& animationName, double timeOffset)
</ins><span class="cx"> {
</span><span class="cx"> ASSERT(!animationName.isEmpty());
</span><span class="cx">
</span><span class="lines">@@ -2378,7 +2378,7 @@
</span><span class="cx"> return true;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-bool GraphicsLayerCA::appendToUncommittedAnimations(const KeyframeValueList& valueList, const TransformOperations* operations, const Animation* animation, const String& animationName, const IntSize& boxSize, int animationIndex, double timeOffset, bool isMatrixAnimation)
</del><ins>+bool GraphicsLayerCA::appendToUncommittedAnimations(const KeyframeValueList& valueList, const TransformOperations* operations, const Animation* animation, const String& animationName, const FloatSize& boxSize, int animationIndex, double timeOffset, bool isMatrixAnimation)
</ins><span class="cx"> {
</span><span class="cx"> TransformOperation::OperationType transformOp = isMatrixAnimation ? TransformOperation::MATRIX_3D : operations->operations().at(animationIndex)->type();
</span><span class="cx"> bool additive = animationIndex > 0;
</span><span class="lines">@@ -2443,7 +2443,7 @@
</span><span class="cx"> return haveTransformAnimation;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-bool GraphicsLayerCA::createTransformAnimationsFromKeyframes(const KeyframeValueList& valueList, const Animation* animation, const String& animationName, double timeOffset, const IntSize& boxSize)
</del><ins>+bool GraphicsLayerCA::createTransformAnimationsFromKeyframes(const KeyframeValueList& valueList, const Animation* animation, const String& animationName, double timeOffset, const FloatSize& boxSize)
</ins><span class="cx"> {
</span><span class="cx"> ASSERT(valueList.property() == AnimatedPropertyWebkitTransform);
</span><span class="cx">
</span><span class="lines">@@ -2679,7 +2679,7 @@
</span><span class="cx"> return true;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-bool GraphicsLayerCA::setTransformAnimationEndpoints(const KeyframeValueList& valueList, const Animation* animation, PlatformCAAnimation* basicAnim, int functionIndex, TransformOperation::OperationType transformOpType, bool isMatrixAnimation, const IntSize& boxSize, Vector<TransformationMatrix>& matrixes)
</del><ins>+bool GraphicsLayerCA::setTransformAnimationEndpoints(const KeyframeValueList& valueList, const Animation* animation, PlatformCAAnimation* basicAnim, int functionIndex, TransformOperation::OperationType transformOpType, bool isMatrixAnimation, const FloatSize& boxSize, Vector<TransformationMatrix>& matrixes)
</ins><span class="cx"> {
</span><span class="cx"> ASSERT(valueList.size() == 2);
</span><span class="cx">
</span><span class="lines">@@ -2745,7 +2745,7 @@
</span><span class="cx"> return true;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-bool GraphicsLayerCA::setTransformAnimationKeyframes(const KeyframeValueList& valueList, const Animation* animation, PlatformCAAnimation* keyframeAnim, int functionIndex, TransformOperation::OperationType transformOpType, bool isMatrixAnimation, const IntSize& boxSize, Vector<TransformationMatrix>& matrixes)
</del><ins>+bool GraphicsLayerCA::setTransformAnimationKeyframes(const KeyframeValueList& valueList, const Animation* animation, PlatformCAAnimation* keyframeAnim, int functionIndex, TransformOperation::OperationType transformOpType, bool isMatrixAnimation, const FloatSize& boxSize, Vector<TransformationMatrix>& matrixes)
</ins><span class="cx"> {
</span><span class="cx"> Vector<float> keyTimes;
</span><span class="cx"> Vector<float> floatValues;
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicscaGraphicsLayerCAh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/ca/GraphicsLayerCA.h (165353 => 165354)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/ca/GraphicsLayerCA.h 2014-03-09 19:09:32 UTC (rev 165353)
+++ trunk/Source/WebCore/platform/graphics/ca/GraphicsLayerCA.h 2014-03-09 20:27:31 UTC (rev 165354)
</span><span class="lines">@@ -117,7 +117,7 @@
</span><span class="cx"> virtual void suspendAnimations(double time);
</span><span class="cx"> virtual void resumeAnimations();
</span><span class="cx">
</span><del>- virtual bool addAnimation(const KeyframeValueList&, const IntSize& boxSize, const Animation*, const String& animationName, double timeOffset);
</del><ins>+ virtual bool addAnimation(const KeyframeValueList&, const FloatSize& boxSize, const Animation*, const String& animationName, double timeOffset);
</ins><span class="cx"> virtual void pauseAnimation(const String& animationName, double timeOffset);
</span><span class="cx"> virtual void removeAnimation(const String& animationName);
</span><span class="cx">
</span><span class="lines">@@ -225,7 +225,7 @@
</span><span class="cx"> LayerMap* animatedLayerClones(AnimatedPropertyID) const;
</span><span class="cx">
</span><span class="cx"> bool createAnimationFromKeyframes(const KeyframeValueList&, const Animation*, const String& animationName, double timeOffset);
</span><del>- bool createTransformAnimationsFromKeyframes(const KeyframeValueList&, const Animation*, const String& animationName, double timeOffset, const IntSize& boxSize);
</del><ins>+ bool createTransformAnimationsFromKeyframes(const KeyframeValueList&, const Animation*, const String& animationName, double timeOffset, const FloatSize& boxSize);
</ins><span class="cx"> #if ENABLE(CSS_FILTERS)
</span><span class="cx"> bool createFilterAnimationsFromKeyframes(const KeyframeValueList&, const Animation*, const String& animationName, double timeOffset);
</span><span class="cx"> #endif
</span><span class="lines">@@ -240,8 +240,8 @@
</span><span class="cx"> bool setAnimationEndpoints(const KeyframeValueList&, const Animation*, PlatformCAAnimation*);
</span><span class="cx"> bool setAnimationKeyframes(const KeyframeValueList&, const Animation*, PlatformCAAnimation*);
</span><span class="cx">
</span><del>- bool setTransformAnimationEndpoints(const KeyframeValueList&, const Animation*, PlatformCAAnimation*, int functionIndex, TransformOperation::OperationType, bool isMatrixAnimation, const IntSize& boxSize, Vector<TransformationMatrix>& matrixes);
- bool setTransformAnimationKeyframes(const KeyframeValueList&, const Animation*, PlatformCAAnimation*, int functionIndex, TransformOperation::OperationType, bool isMatrixAnimation, const IntSize& boxSize, Vector<TransformationMatrix>& matrixes);
</del><ins>+ bool setTransformAnimationEndpoints(const KeyframeValueList&, const Animation*, PlatformCAAnimation*, int functionIndex, TransformOperation::OperationType, bool isMatrixAnimation, const FloatSize& boxSize, Vector<TransformationMatrix>& matrixes);
+ bool setTransformAnimationKeyframes(const KeyframeValueList&, const Animation*, PlatformCAAnimation*, int functionIndex, TransformOperation::OperationType, bool isMatrixAnimation, const FloatSize& boxSize, Vector<TransformationMatrix>& matrixes);
</ins><span class="cx">
</span><span class="cx"> #if ENABLE(CSS_FILTERS)
</span><span class="cx"> bool setFilterAnimationEndpoints(const KeyframeValueList&, const Animation*, PlatformCAAnimation*, int functionIndex, int internalFilterPropertyIndex);
</span><span class="lines">@@ -406,7 +406,7 @@
</span><span class="cx"> static void moveOrCopyLayerAnimation(MoveOrCopy, const String& animationIdentifier, PlatformCALayer *fromLayer, PlatformCALayer *toLayer);
</span><span class="cx"> void moveOrCopyAnimations(MoveOrCopy, PlatformCALayer * fromLayer, PlatformCALayer * toLayer);
</span><span class="cx">
</span><del>- bool appendToUncommittedAnimations(const KeyframeValueList&, const TransformOperations*, const Animation*, const String& animationName, const IntSize& boxSize, int animationIndex, double timeOffset, bool isMatrixAnimation);
</del><ins>+ bool appendToUncommittedAnimations(const KeyframeValueList&, const TransformOperations*, const Animation*, const String& animationName, const FloatSize& boxSize, int animationIndex, double timeOffset, bool isMatrixAnimation);
</ins><span class="cx"> #if ENABLE(CSS_FILTERS)
</span><span class="cx"> bool appendToUncommittedAnimations(const KeyframeValueList&, const FilterOperation*, const Animation*, const String& animationName, int animationIndex, double timeOffset);
</span><span class="cx"> #endif
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicstexmapcoordinatedCoordinatedGraphicsLayercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/texmap/coordinated/CoordinatedGraphicsLayer.cpp (165353 => 165354)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/texmap/coordinated/CoordinatedGraphicsLayer.cpp 2014-03-09 19:09:32 UTC (rev 165353)
+++ trunk/Source/WebCore/platform/graphics/texmap/coordinated/CoordinatedGraphicsLayer.cpp 2014-03-09 20:27:31 UTC (rev 165354)
</span><span class="lines">@@ -1180,7 +1180,7 @@
</span><span class="cx"> return toCoordinatedGraphicsLayer(parent())->selfOrAncestorHaveNonAffineTransforms();
</span><span class="cx"> }
</span><span class="cx">
</span><del>-bool CoordinatedGraphicsLayer::addAnimation(const KeyframeValueList& valueList, const IntSize& boxSize, const Animation* anim, const String& keyframesName, double delayAsNegativeTimeOffset)
</del><ins>+bool CoordinatedGraphicsLayer::addAnimation(const KeyframeValueList& valueList, const FloatSize& boxSize, const Animation* anim, const String& keyframesName, double delayAsNegativeTimeOffset)
</ins><span class="cx"> {
</span><span class="cx"> ASSERT(!keyframesName.isEmpty());
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicstexmapcoordinatedCoordinatedGraphicsLayerh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/texmap/coordinated/CoordinatedGraphicsLayer.h (165353 => 165354)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/texmap/coordinated/CoordinatedGraphicsLayer.h 2014-03-09 19:09:32 UTC (rev 165353)
+++ trunk/Source/WebCore/platform/graphics/texmap/coordinated/CoordinatedGraphicsLayer.h 2014-03-09 20:27:31 UTC (rev 165354)
</span><span class="lines">@@ -104,7 +104,7 @@
</span><span class="cx"> #if ENABLE(CSS_FILTERS)
</span><span class="cx"> virtual bool setFilters(const FilterOperations&) override;
</span><span class="cx"> #endif
</span><del>- virtual bool addAnimation(const KeyframeValueList&, const IntSize&, const Animation*, const String&, double) override;
</del><ins>+ virtual bool addAnimation(const KeyframeValueList&, const FloatSize&, const Animation*, const String&, double) override;
</ins><span class="cx"> virtual void pauseAnimation(const String&, double) override;
</span><span class="cx"> virtual void removeAnimation(const String&) override;
</span><span class="cx"> virtual void suspendAnimations(double time) override;
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderLayerBackingcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderLayerBacking.cpp (165353 => 165354)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderLayerBacking.cpp 2014-03-09 19:09:32 UTC (rev 165353)
+++ trunk/Source/WebCore/rendering/RenderLayerBacking.cpp 2014-03-09 20:27:31 UTC (rev 165354)
</span><span class="lines">@@ -2400,7 +2400,7 @@
</span><span class="cx"> opacityVector.insert(FloatAnimationValue::create(0, compositingOpacity(fromStyle->opacity())));
</span><span class="cx"> opacityVector.insert(FloatAnimationValue::create(1, compositingOpacity(toStyle->opacity())));
</span><span class="cx"> // The boxSize param is only used for transform animations (which can only run on RenderBoxes), so we pass an empty size here.
</span><del>- if (m_graphicsLayer->addAnimation(opacityVector, IntSize(), opacityAnim, GraphicsLayer::animationNameForTransition(AnimatedPropertyOpacity), timeOffset)) {
</del><ins>+ if (m_graphicsLayer->addAnimation(opacityVector, FloatSize(), opacityAnim, GraphicsLayer::animationNameForTransition(AnimatedPropertyOpacity), timeOffset)) {
</ins><span class="cx"> // To ensure that the correct opacity is visible when the animation ends, also set the final opacity.
</span><span class="cx"> updateOpacity(toStyle);
</span><span class="cx"> didAnimate = true;
</span><span class="lines">@@ -2429,7 +2429,7 @@
</span><span class="cx"> KeyframeValueList filterVector(AnimatedPropertyWebkitFilter);
</span><span class="cx"> filterVector.insert(FilterAnimationValue::create(0, fromStyle->filter()));
</span><span class="cx"> filterVector.insert(FilterAnimationValue::create(1, toStyle->filter()));
</span><del>- if (m_graphicsLayer->addAnimation(filterVector, IntSize(), filterAnim, GraphicsLayer::animationNameForTransition(AnimatedPropertyWebkitFilter), timeOffset)) {
</del><ins>+ if (m_graphicsLayer->addAnimation(filterVector, FloatSize(), filterAnim, GraphicsLayer::animationNameForTransition(AnimatedPropertyWebkitFilter), timeOffset)) {
</ins><span class="cx"> // To ensure that the correct filter is visible when the animation ends, also set the final filter.
</span><span class="cx"> updateFilters(toStyle);
</span><span class="cx"> didAnimate = true;
</span></span></pre></div>
<a id="trunkSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/ChangeLog (165353 => 165354)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/ChangeLog 2014-03-09 19:09:32 UTC (rev 165353)
+++ trunk/Source/WebKit2/ChangeLog 2014-03-09 20:27:31 UTC (rev 165354)
</span><span class="lines">@@ -1,3 +1,16 @@
</span><ins>+2014-03-09 Zalan Bujtas <zalan@apple.com>
+
+ Subpixel rendering: Pass FloatSize boxsize to transform animations to support device pixel sizing.
+ https://bugs.webkit.org/show_bug.cgi?id=129985
+
+ Reviewed by Simon Fraser.
+
+ This is in preparation to stop passing integral positioned boxes to transform animations.
+
+ No change in behavior.
+
+ * WebProcess/WebPage/mac/GraphicsLayerCARemote.h:
+
</ins><span class="cx"> 2014-03-08 Simon Fraser <simon.fraser@apple.com>
</span><span class="cx">
</span><span class="cx"> [iOS Wk2] Can't scroll after going back to page in page cache
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessWebPagemacGraphicsLayerCARemoteh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/WebPage/mac/GraphicsLayerCARemote.h (165353 => 165354)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/WebPage/mac/GraphicsLayerCARemote.h 2014-03-09 19:09:32 UTC (rev 165353)
+++ trunk/Source/WebKit2/WebProcess/WebPage/mac/GraphicsLayerCARemote.h 2014-03-09 20:27:31 UTC (rev 165354)
</span><span class="lines">@@ -54,7 +54,7 @@
</span><span class="cx"> virtual PassRefPtr<WebCore::PlatformCALayer> createPlatformCALayer(PlatformLayer*, WebCore::PlatformCALayerClient* owner) override;
</span><span class="cx">
</span><span class="cx"> // No accelerated animations for now.
</span><del>- virtual bool addAnimation(const WebCore::KeyframeValueList&, const WebCore::IntSize&, const WebCore::Animation*, const String&, double) override { return false; }
</del><ins>+ virtual bool addAnimation(const WebCore::KeyframeValueList&, const WebCore::FloatSize&, const WebCore::Animation*, const String&, double) override { return false; }
</ins><span class="cx">
</span><span class="cx"> // PlatformCALayerRemote can't currently proxy directly composited image contents, so opt out of this optimization.
</span><span class="cx"> virtual bool shouldDirectlyCompositeImage(WebCore::Image*) const override { return false; }
</span></span></pre>
</div>
</div>
</body>
</html>