[Texmap] LayoutTests/compositing/animation/state-at-end-event-transform-layer.html...
authorcommit-queue@webkit.org <commit-queue@webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Mon, 25 Feb 2013 18:39:11 +0000 (18:39 +0000)
committercommit-queue@webkit.org <commit-queue@webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Mon, 25 Feb 2013 18:39:11 +0000 (18:39 +0000)
https://bugs.webkit.org/show_bug.cgi?id=110685

Patch by No'am Rosenthal <noam@webkit.org> on 2013-02-25
Reviewed by Martin Robinson.

Removed m_shouldUpdateCurrentTransformFromGraphicsLayer etc., as they don't do
what they're supposed to do. No flickers observed.

LayoutTests/compositing/animation/state-at-end-event-transform-layer.html now works correctly.

* platform/graphics/texmap/TextureMapperLayer.cpp:
(WebCore::TextureMapperLayer::setAnimatedTransform):
(WebCore::TextureMapperLayer::setAnimatedOpacity):
(WebCore::TextureMapperLayer::setAnimatedFilters):
(WebCore::TextureMapperLayer::syncAnimations):
* platform/graphics/texmap/TextureMapperLayer.h:
(WebCore::TextureMapperLayer::TextureMapperLayer):
(TextureMapperLayer):

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@143947 268f45cc-cd09-0410-ab3c-d52691b4dbfc

Source/WebCore/ChangeLog
Source/WebCore/platform/graphics/texmap/TextureMapperLayer.cpp
Source/WebCore/platform/graphics/texmap/TextureMapperLayer.h

index 047053b..ec32013 100644 (file)
@@ -1,3 +1,24 @@
+2013-02-25  No'am Rosenthal  <noam@webkit.org>
+
+        [Texmap] LayoutTests/compositing/animation/state-at-end-event-transform-layer.html shows a red square where it shouldn't
+        https://bugs.webkit.org/show_bug.cgi?id=110685
+
+        Reviewed by Martin Robinson.
+
+        Removed m_shouldUpdateCurrentTransformFromGraphicsLayer etc., as they don't do
+        what they're supposed to do. No flickers observed.
+
+        LayoutTests/compositing/animation/state-at-end-event-transform-layer.html now works correctly.
+
+        * platform/graphics/texmap/TextureMapperLayer.cpp:
+        (WebCore::TextureMapperLayer::setAnimatedTransform):
+        (WebCore::TextureMapperLayer::setAnimatedOpacity):
+        (WebCore::TextureMapperLayer::setAnimatedFilters):
+        (WebCore::TextureMapperLayer::syncAnimations):
+        * platform/graphics/texmap/TextureMapperLayer.h:
+        (WebCore::TextureMapperLayer::TextureMapperLayer):
+        (TextureMapperLayer):
+
 2013-02-25  Jer Noble  <jer.noble@apple.com>
 
         AVFoundation.framework and QTKit.framework are lazy-loaded on every WebProcess launch
 2013-02-25  Jer Noble  <jer.noble@apple.com>
 
         AVFoundation.framework and QTKit.framework are lazy-loaded on every WebProcess launch
index 88eb3cd..8a2cc99 100644 (file)
@@ -277,20 +277,17 @@ void TextureMapperLayer::paintSelfAndChildrenWithReplica(const TextureMapperPain
 
 void TextureMapperLayer::setAnimatedTransform(const TransformationMatrix& matrix)
 {
 
 void TextureMapperLayer::setAnimatedTransform(const TransformationMatrix& matrix)
 {
-    m_shouldUpdateCurrentTransformFromGraphicsLayer = false;
     m_currentTransform.setLocalTransform(matrix);
 }
 
 void TextureMapperLayer::setAnimatedOpacity(float opacity)
 {
     m_currentTransform.setLocalTransform(matrix);
 }
 
 void TextureMapperLayer::setAnimatedOpacity(float opacity)
 {
-    m_shouldUpdateCurrentOpacityFromGraphicsLayer = false;
     m_currentOpacity = opacity;
 }
 
 #if ENABLE(CSS_FILTERS)
 void TextureMapperLayer::setAnimatedFilters(const FilterOperations& filters)
 {
     m_currentOpacity = opacity;
 }
 
 #if ENABLE(CSS_FILTERS)
 void TextureMapperLayer::setAnimatedFilters(const FilterOperations& filters)
 {
-    m_shouldUpdateCurrentFiltersFromGraphicsLayer = false;
     m_currentFilters = filters;
 }
 
     m_currentFilters = filters;
 }
 
@@ -576,13 +573,13 @@ void TextureMapperLayer::applyAnimationsRecursively()
 void TextureMapperLayer::syncAnimations()
 {
     m_animations.apply(this);
 void TextureMapperLayer::syncAnimations()
 {
     m_animations.apply(this);
-    if (!m_animations.hasActiveAnimationsOfType(AnimatedPropertyWebkitTransform) && m_shouldUpdateCurrentTransformFromGraphicsLayer)
+    if (!m_animations.hasActiveAnimationsOfType(AnimatedPropertyWebkitTransform))
         m_currentTransform.setLocalTransform(m_state.transform);
         m_currentTransform.setLocalTransform(m_state.transform);
-    if (!m_animations.hasActiveAnimationsOfType(AnimatedPropertyOpacity) && m_shouldUpdateCurrentOpacityFromGraphicsLayer)
+    if (!m_animations.hasActiveAnimationsOfType(AnimatedPropertyOpacity))
         m_currentOpacity = m_state.opacity;
 
 #if ENABLE(CSS_FILTERS)
         m_currentOpacity = m_state.opacity;
 
 #if ENABLE(CSS_FILTERS)
-    if (!m_animations.hasActiveAnimationsOfType(AnimatedPropertyWebkitFilter) && m_shouldUpdateCurrentFiltersFromGraphicsLayer)
+    if (!m_animations.hasActiveAnimationsOfType(AnimatedPropertyWebkitFilter))
         m_currentFilters = m_state.filters;
 #endif
 }
         m_currentFilters = m_state.filters;
 #endif
 }
index f6b72a3..61fb827 100644 (file)
@@ -44,11 +44,6 @@ public:
         , m_contentsLayer(0)
         , m_currentOpacity(1)
         , m_centerZ(0)
         , m_contentsLayer(0)
         , m_currentOpacity(1)
         , m_centerZ(0)
-        , m_shouldUpdateCurrentTransformFromGraphicsLayer(true)
-        , m_shouldUpdateCurrentOpacityFromGraphicsLayer(true)
-#if ENABLE(CSS_FILTERS)
-        , m_shouldUpdateCurrentFiltersFromGraphicsLayer(true)
-#endif
         , m_textureMapper(0)
         , m_fixedToViewport(false)
     { }
         , m_textureMapper(0)
         , m_fixedToViewport(false)
     { }
@@ -149,12 +144,6 @@ private:
     FilterOperations m_currentFilters;
 #endif
     float m_centerZ;
     FilterOperations m_currentFilters;
 #endif
     float m_centerZ;
-    
-    bool m_shouldUpdateCurrentTransformFromGraphicsLayer;
-    bool m_shouldUpdateCurrentOpacityFromGraphicsLayer;
-#if ENABLE(CSS_FILTERS)
-    bool m_shouldUpdateCurrentFiltersFromGraphicsLayer;
-#endif
 
     struct State {
         FloatPoint pos;
 
     struct State {
         FloatPoint pos;