webkit-efl-contributions/patch-[20121203]-[hurnjoo.lee@samsung.com]-[Coordinated Graphics: Animation is not working properly].patch

   1 diff --git a/Source/WebCore/ChangeLog b/Source/WebCore/ChangeLog
   2 index 04bb96a..3d79356 100644
   3 --- a/Source/WebCore/ChangeLog
   4 +++ b/Source/WebCore/ChangeLog
   5 @@ -1,3 +1,21 @@
   6 +2012-12-02  Hurnjoo Lee  <hurnjoo.lee@samsung.com>
   7 +
   8 +        Coordinated Graphics: Animation is not working properly
   9 +        https://bugs.webkit.org/show_bug.cgi?id=XXXXX
  10 +
  11 +        Reviewed by NOBODY (OOPS!).
  12 +
  13 +        The animation that keyframe has two or more styles is not working
  14 +        properly. Because the first animation is removed when add the second
  15 +        animation to m_animations.
  16 +
  17 +        Tests: animations/opacity-transform-animation.html
  18 +
  19 +        * platform/graphics/GraphicsLayerAnimation.cpp:
  20 +        (WebCore::GraphicsLayerAnimations::add): Check whether the property of
  21 +        animation is same as the property of existing animation when removing
  22 +        the existing animation.
  23 +
  24  2012-12-02  Otto Derek Cheung  <otcheung@rim.com>
  25
  26          [BlackBerry] Adding checks for null when checking cookie status in CookieJarBlackBerry
  27 diff --git a/Source/WebCore/platform/graphics/GraphicsLayerAnimation.cpp b/Source/WebCore/platform/graphics/GraphicsLayerAnimation.cpp
  28 index 706158d..bd8e594 100644
  29 --- a/Source/WebCore/platform/graphics/GraphicsLayerAnimation.cpp
  30 +++ b/Source/WebCore/platform/graphics/GraphicsLayerAnimation.cpp
  31 @@ -344,7 +344,10 @@ void GraphicsLayerAnimation::resume()
  32  void GraphicsLayerAnimations::add(const GraphicsLayerAnimation& animation)
  33  {
  34      // Remove the old state if we are resuming a paused animation.
  35 -    remove(animation.name());
  36 +    for (int i = m_animations.size() - 1; i >= 0; --i) {
  37 +        if (m_animations[i].name() == animation.name() && m_animations[i].property() == animation.property())
  38 +            m_animations.remove(i);
  39 +    }
  40
  41      m_animations.append(animation);
  42  }