Changeset 176748 in webkit

Timestamp:

Dec 3, 2014, 12:37:54 PM (12 years ago)

Author:

commit-queue@webkit.org

Message:

[TexMap] Redundant method in GraphicsLayerTextureMapper.
​https://bugs.webkit.org/show_bug.cgi?id=138005

Patch by ​peavo@outlook.com <​peavo@outlook.com> on 2014-12-03
Reviewed by Alex Christensen.

The TextureMapperLayer method descendantsOrSelfHaveRunningAnimations() can be used
instead of the GraphicsLayerTextureMapper method startedAnimation().

Source/WebCore:

• platform/graphics/texmap/GraphicsLayerTextureMapper.cpp:

(WebCore::GraphicsLayerTextureMapper::GraphicsLayerTextureMapper):
(WebCore::GraphicsLayerTextureMapper::addAnimation):

• platform/graphics/texmap/GraphicsLayerTextureMapper.h:

Source/WebKit/win:

• WebCoreSupport/AcceleratedCompositingContext.cpp:

(AcceleratedCompositingContext::startedAnimation):

Location:

trunk/Source

Files:

• WebCore/ChangeLog (modified) (1 diff)
• WebCore/platform/graphics/texmap/GraphicsLayerTextureMapper.cpp (modified) (2 diffs)
• WebCore/platform/graphics/texmap/GraphicsLayerTextureMapper.h (modified) (2 diffs)
• WebKit/win/ChangeLog (modified) (1 diff)
• WebKit/win/WebCoreSupport/AcceleratedCompositingContext.cpp (modified) (1 diff)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2014-12-03  peavo@outlook.com  <peavo@outlook.com>
+
+        [TexMap] Redundant method in GraphicsLayerTextureMapper.
+        https://bugs.webkit.org/show_bug.cgi?id=138005
+
+        Reviewed by Alex Christensen.
+
+        The TextureMapperLayer method descendantsOrSelfHaveRunningAnimations() can be used
+        instead of the GraphicsLayerTextureMapper method startedAnimation().
+
+        * platform/graphics/texmap/GraphicsLayerTextureMapper.cpp:
+        (WebCore::GraphicsLayerTextureMapper::GraphicsLayerTextureMapper):
+        (WebCore::GraphicsLayerTextureMapper::addAnimation):
+        * platform/graphics/texmap/GraphicsLayerTextureMapper.h:
+
 2014-12-03  Jeremy Jones  <jeremyj@apple.com>
 

trunk/Source/WebCore/platform/graphics/texmap/GraphicsLayerTextureMapper.cpp

@@ -50 +50 @@
     , m_animationStartTime(0)
     , m_isScrollable(false)
-    , m_startedAnimation(false)
 {
 }
@@ -578 +577 @@
     notifyChange(AnimationChange);
     notifyChange(AnimationStarted);
-    m_startedAnimation = true;
     return true;
 }

trunk/Source/WebCore/platform/graphics/texmap/GraphicsLayerTextureMapper.h

@@ -101 +101 @@
 
     void setAnimations(const GraphicsLayerAnimations&);
-    bool startedAnimation() const { return m_startedAnimation; }
 
 private:
@@ -182 +181 @@
     IntSize m_committedScrollOffset;
     bool m_isScrollable;
-    bool m_startedAnimation;
 };
 

trunk/Source/WebKit/win/ChangeLog

@@ +1 @@
+2014-12-03  peavo@outlook.com  <peavo@outlook.com>
+
+        [TexMap] Redundant method in GraphicsLayerTextureMapper.
+        https://bugs.webkit.org/show_bug.cgi?id=138005
+
+        Reviewed by Alex Christensen.
+
+        The TextureMapperLayer method descendantsOrSelfHaveRunningAnimations() can be used
+        instead of the GraphicsLayerTextureMapper method startedAnimation().
+
+        * WebCoreSupport/AcceleratedCompositingContext.cpp:
+        (AcceleratedCompositingContext::startedAnimation):
+
 2014-12-02  Anders Carlsson  <andersca@apple.com>
 

trunk/Source/WebKit/win/WebCoreSupport/AcceleratedCompositingContext.cpp

@@ -140 +140 @@
 bool AcceleratedCompositingContext::startedAnimation(WebCore::GraphicsLayer* layer)
 {
-    if (!layer)
+    if (!layer || !downcast<GraphicsLayerTextureMapper>(*layer).layer())
         return false;
 
-    if (downcast<GraphicsLayerTextureMapper>(layer)->startedAnimation())
-        return true;
-
-    for (auto childLayer : layer->children()) {
-        if (startedAnimation(childLayer))
-            return true;
-    }
-
-    return false;
+    return downcast<GraphicsLayerTextureMapper>(*layer).layer()->descendantsOrSelfHaveRunningAnimations();
 }