Attachment 340448 Details for Bug 185668 – ROLLOUT of r231765

[patch] ROLLOUT of r231765

bug-185668-20180515195703.patch (text/plain), 9.30 KB, created by WebKit Commit Bot on 2018-05-15 16:57:04 PDT

(hide)

Description:

Filename:

MIME Type:

Creator: WebKit Commit Bot

Created: 2018-05-15 16:57:04 PDT

Size: 9.30 KB

patch

obsolete

>Subversion Revision: 231821
>diff --git a/Source/WebCore/ChangeLog b/Source/WebCore/ChangeLog
>index 38451d4f5b7216e91411520ee3799cf6eec4ff3a..e3fe716b92fa3fb2d4cd0626fdc4882f4233722f 100644
>--- a/Source/WebCore/ChangeLog
>+++ b/Source/WebCore/ChangeLog
>@@ -1,3 +1,18 @@
>+2018-05-15  Commit Queue  <commit-queue@webkit.org>
>+
>+        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  <webkit@devinrousso.com>
> 
>         Web Inspector: Add rulers and guides
>diff --git a/Source/WebCore/platform/graphics/ca/GraphicsLayerCA.cpp b/Source/WebCore/platform/graphics/ca/GraphicsLayerCA.cpp
>index 0a02a35feb4af22bef0bf52738e315d88bda82e2..2b35a97ddca24e6e5c66bad33a836433b0c9bc6e 100644
>--- a/Source/WebCore/platform/graphics/ca/GraphicsLayerCA.cpp
>+++ b/Source/WebCore/platform/graphics/ca/GraphicsLayerCA.cpp
>@@ -3015,7 +3015,7 @@ bool GraphicsLayerCA::createAnimationFromKeyframes(const KeyframeValueList& valu
>     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 @@ bool GraphicsLayerCA::appendToUncommittedAnimations(const KeyframeValueList& val
>     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 @@ bool GraphicsLayerCA::appendToUncommittedAnimations(const KeyframeValueList& val
>         
>         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)
>diff --git a/Source/WebCore/platform/graphics/ca/GraphicsLayerCA.h b/Source/WebCore/platform/graphics/ca/GraphicsLayerCA.h
>index ee41cd43d468ad62bc4130ca9b74b62027f29de9..5011ccd71840bd0a6f32530d2c3aad31b9a8675c 100644
>--- a/Source/WebCore/platform/graphics/ca/GraphicsLayerCA.h
>+++ b/Source/WebCore/platform/graphics/ca/GraphicsLayerCA.h
>@@ -459,29 +459,8 @@ private:
>         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 @@ private:
>     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;
>     
>diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog
>index 8990cd74dad2fe64b8013aecb5d0f518eb7837d4..161e28e4e2dbe35064fe9b34f65c8b61db170394 100644
>--- a/LayoutTests/ChangeLog
>+++ b/LayoutTests/ChangeLog
>@@ -1,3 +1,18 @@
>+2018-05-15  Commit Queue  <commit-queue@webkit.org>
>+
>+        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  <tzagallo@apple.com>
> 
>         Update touch event tracking type on every touch
>diff --git a/LayoutTests/transitions/interrupted-transition-hardware-expected.html b/LayoutTests/transitions/interrupted-transition-hardware-expected.html
>deleted file mode 100644
>index ff73df0b5db2e6810464b908d8bc313d5a8fd6dc..0000000000000000000000000000000000000000
>--- a/LayoutTests/transitions/interrupted-transition-hardware-expected.html
>+++ /dev/null
>@@ -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>
>diff --git a/LayoutTests/transitions/interrupted-transition-hardware.html b/LayoutTests/transitions/interrupted-transition-hardware.html
>deleted file mode 100644
>index dc88027a688abeafd8be65cd4b02fb841218d0d9..0000000000000000000000000000000000000000
>--- a/LayoutTests/transitions/interrupted-transition-hardware.html
>+++ /dev/null
>@@ -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>

Actions: View | Formatted Diff | Diff

Attachments on bug 185668: 340448