Diff
Modified: trunk/LayoutTests/ChangeLog (231822 => 231823)
--- trunk/LayoutTests/ChangeLog 2018-05-15 23:51:21 UTC (rev 231822)
+++ trunk/LayoutTests/ChangeLog 2018-05-16 00:01:17 UTC (rev 231823)
@@ -1,3 +1,18 @@
+2018-05-15 Commit Queue <[email protected]>
+
+ Unreviewed, rolling out r231765.
+ https://bugs.webkit.org/show_bug.cgi?id=185668
+
+ the layout test added with this change is very flaky
+ (Requested by realdawei on #webkit).
+
+ Reverted changeset:
+
+ "REGRESSION (r230574): Interrupted hardware transitions don't
+ behave correctly"
+ https://bugs.webkit.org/show_bug.cgi?id=185299
+ https://trac.webkit.org/changeset/231765
+
2018-05-15 Tadeu Zagallo <[email protected]>
Update touch event tracking type on every touch
Deleted: trunk/LayoutTests/transitions/interrupted-transition-hardware-expected.html (231822 => 231823)
--- trunk/LayoutTests/transitions/interrupted-transition-hardware-expected.html 2018-05-15 23:51:21 UTC (rev 231822)
+++ trunk/LayoutTests/transitions/interrupted-transition-hardware-expected.html 2018-05-16 00:01:17 UTC (rev 231823)
@@ -1,22 +0,0 @@
-<!DOCTYPE html>
-
-<html>
-<head>
- <style>
-
- div {
- position: absolute;
- left: 0;
- top: 0;
- height: 100px;
- width: 100px;
- transform: translateX(25px);
- background-color: green;
- }
-
- </style>
-</head>
-<body>
- <div id="cover"></div>
-</body>
-</html>
Deleted: trunk/LayoutTests/transitions/interrupted-transition-hardware.html (231822 => 231823)
--- trunk/LayoutTests/transitions/interrupted-transition-hardware.html 2018-05-15 23:51:21 UTC (rev 231822)
+++ trunk/LayoutTests/transitions/interrupted-transition-hardware.html 2018-05-16 00:01:17 UTC (rev 231823)
@@ -1,59 +0,0 @@
-<!DOCTYPE html>
-
-<html>
-<head>
- <style>
-
- div {
- position: absolute;
- left: 0;
- top: 0;
- height: 100px;
- width: 100px;
- }
-
- #test {
- background-color: red;
- transition: transform 4000s linear;
- transition-delay: -2000s;
- transform: none;
- }
-
- #test.transitions {
- transform: translateX(100px);
- }
-
- #cover {
- transform: translateX(25px);
- background-color: green;
- }
-
- </style>
-</head>
-<body>
-
- <div id="test"></div>
- <div id="cover"></div>
-
- <script type="text/_javascript_">
-
- if (window.testRunner)
- testRunner.waitUntilDone();
-
- const test = document.getElementById("test");
-
- requestAnimationFrame(() => {
- test.classList.add("transitions");
- requestAnimationFrame(() => {
- test.classList.remove("transitions");
- requestAnimationFrame(() => {
- if (window.testRunner)
- testRunner.notifyDone();
- });
- });
- });
-
- </script>
-
-</body>
-</html>
Modified: trunk/Source/WebCore/ChangeLog (231822 => 231823)
--- trunk/Source/WebCore/ChangeLog 2018-05-15 23:51:21 UTC (rev 231822)
+++ trunk/Source/WebCore/ChangeLog 2018-05-16 00:01:17 UTC (rev 231823)
@@ -1,3 +1,18 @@
+2018-05-15 Commit Queue <[email protected]>
+
+ Unreviewed, rolling out r231765.
+ https://bugs.webkit.org/show_bug.cgi?id=185668
+
+ the layout test added with this change is very flaky
+ (Requested by realdawei on #webkit).
+
+ Reverted changeset:
+
+ "REGRESSION (r230574): Interrupted hardware transitions don't
+ behave correctly"
+ https://bugs.webkit.org/show_bug.cgi?id=185299
+ https://trac.webkit.org/changeset/231765
+
2018-05-15 Devin Rousso <[email protected]>
Web Inspector: Add rulers and guides
Modified: trunk/Source/WebCore/platform/graphics/ca/GraphicsLayerCA.cpp (231822 => 231823)
--- trunk/Source/WebCore/platform/graphics/ca/GraphicsLayerCA.cpp 2018-05-15 23:51:21 UTC (rev 231822)
+++ trunk/Source/WebCore/platform/graphics/ca/GraphicsLayerCA.cpp 2018-05-16 00:01:17 UTC (rev 231823)
@@ -3015,7 +3015,7 @@
if (!valuesOK)
return false;
- appendToUncommittedAnimations(LayerPropertyAnimation(caAnimation.releaseNonNull(), animationName, valueList.property(), animationIndex, 0, timeOffset));
+ m_uncomittedAnimations.append(LayerPropertyAnimation(caAnimation.releaseNonNull(), animationName, valueList.property(), animationIndex, 0, timeOffset));
return true;
}
@@ -3042,7 +3042,7 @@
if (!validMatrices)
return false;
- appendToUncommittedAnimations(LayerPropertyAnimation(caAnimation.releaseNonNull(), animationName, valueList.property(), animationIndex, 0, timeOffset));
+ m_uncomittedAnimations.append(LayerPropertyAnimation(caAnimation.releaseNonNull(), animationName, valueList.property(), animationIndex, 0, timeOffset));
return true;
}
@@ -3104,21 +3104,12 @@
ASSERT(valuesOK);
- appendToUncommittedAnimations(LayerPropertyAnimation(caAnimation.releaseNonNull(), animationName, valueList.property(), animationIndex, internalFilterPropertyIndex, timeOffset));
+ m_uncomittedAnimations.append(LayerPropertyAnimation(caAnimation.releaseNonNull(), animationName, valueList.property(), animationIndex, internalFilterPropertyIndex, timeOffset));
}
return true;
}
-void GraphicsLayerCA::appendToUncommittedAnimations(LayerPropertyAnimation&& animation)
-{
- // Since we're adding a new animation, make sure we clear any pending AnimationProcessingAction for this animation
- // as these are applied after we've committed new animations.
- m_animationsToProcess.remove(animation.m_name);
-
- m_uncomittedAnimations.append(WTFMove(animation));
-}
-
bool GraphicsLayerCA::createFilterAnimationsFromKeyframes(const KeyframeValueList& valueList, const Animation* animation, const String& animationName, Seconds timeOffset)
{
#if ENABLE(FILTERS_LEVEL_2)
Modified: trunk/Source/WebCore/platform/graphics/ca/GraphicsLayerCA.h (231822 => 231823)
--- trunk/Source/WebCore/platform/graphics/ca/GraphicsLayerCA.h 2018-05-15 23:51:21 UTC (rev 231822)
+++ trunk/Source/WebCore/platform/graphics/ca/GraphicsLayerCA.h 2018-05-16 00:01:17 UTC (rev 231823)
@@ -459,29 +459,8 @@
moveOrCopyAnimations(Copy, fromLayer, toLayer);
}
- // This represents the animation of a single property. There may be multiple transform animations for
- // a single transition or keyframe animation, so index is used to distinguish these.
- struct LayerPropertyAnimation {
- LayerPropertyAnimation(Ref<PlatformCAAnimation>&& caAnimation, const String& animationName, AnimatedPropertyID property, int index, int subIndex, Seconds timeOffset)
- : m_animation(WTFMove(caAnimation))
- , m_name(animationName)
- , m_property(property)
- , m_index(index)
- , m_subIndex(subIndex)
- , m_timeOffset(timeOffset)
- { }
-
- RefPtr<PlatformCAAnimation> m_animation;
- String m_name;
- AnimatedPropertyID m_property;
- int m_index;
- int m_subIndex;
- Seconds m_timeOffset;
- };
-
bool appendToUncommittedAnimations(const KeyframeValueList&, const TransformOperations*, const Animation*, const String& animationName, const FloatSize& boxSize, int animationIndex, Seconds timeOffset, bool isMatrixAnimation);
bool appendToUncommittedAnimations(const KeyframeValueList&, const FilterOperation*, const Animation*, const String& animationName, int animationIndex, Seconds timeOffset);
- void appendToUncommittedAnimations(LayerPropertyAnimation&&);
enum LayerChange : uint64_t {
NoChange = 0,
@@ -593,6 +572,26 @@
RetainPtr<CGImageRef> m_uncorrectedContentsImage;
RetainPtr<CGImageRef> m_pendingContentsImage;
+ // This represents the animation of a single property. There may be multiple transform animations for
+ // a single transition or keyframe animation, so index is used to distinguish these.
+ struct LayerPropertyAnimation {
+ LayerPropertyAnimation(Ref<PlatformCAAnimation>&& caAnimation, const String& animationName, AnimatedPropertyID property, int index, int subIndex, Seconds timeOffset)
+ : m_animation(WTFMove(caAnimation))
+ , m_name(animationName)
+ , m_property(property)
+ , m_index(index)
+ , m_subIndex(subIndex)
+ , m_timeOffset(timeOffset)
+ { }
+
+ RefPtr<PlatformCAAnimation> m_animation;
+ String m_name;
+ AnimatedPropertyID m_property;
+ int m_index;
+ int m_subIndex;
+ Seconds m_timeOffset;
+ };
+
// Uncommitted transitions and animations.
Vector<LayerPropertyAnimation> m_uncomittedAnimations;
