Changeset 113628 in webkit

Timestamp:

Apr 9, 2012 2:59:05 PM (12 years ago)

Author:

noam.rosenthal@nokia.com

Message:

[Qt][WK2] Accelerated and non-accelerated animations need to be synchronized
​https://bugs.webkit.org/show_bug.cgi?id=75780

Reviewed by Kenneth Rohde Christiansen.

Remove the ui-side animation code, and return false from addAnimation so that web-side
animations kick in.

• Shared/WebLayerTreeInfo.cpp:

(WebKit):

• Shared/WebLayerTreeInfo.h:

(WebLayerInfo):

• UIProcess/WebLayerTreeRenderer.cpp:

(WebKit::WebLayerTreeRenderer::paintToCurrentGLContext):
(WebKit::WebLayerTreeRenderer::setLayerState):

• WebProcess/WebCoreSupport/WebGraphicsLayer.cpp:

(WebCore::WebGraphicsLayer::didChangeGeometry):
(WebCore::WebGraphicsLayer::syncLayerState):
(WebCore::WebGraphicsLayer::computeTransformedVisibleRect):

• WebProcess/WebCoreSupport/WebGraphicsLayer.h:

(WebGraphicsLayer):

Location:

trunk/Source/WebKit2

Files:

• ChangeLog (modified) (1 diff)
• Shared/WebLayerTreeInfo.cpp (modified) (3 diffs)
• Shared/WebLayerTreeInfo.h (modified) (2 diffs)
• UIProcess/WebLayerTreeRenderer.cpp (modified) (2 diffs)
• WebProcess/WebCoreSupport/WebGraphicsLayer.cpp (modified) (6 diffs)
• WebProcess/WebCoreSupport/WebGraphicsLayer.h (modified) (4 diffs)

trunk/Source/WebKit2/ChangeLog

@@ +1 @@
+2012-04-09  No'am Rosenthal  <noam.rosenthal@nokia.com>
+
+        [Qt][WK2] Accelerated and non-accelerated animations need to be synchronized
+        https://bugs.webkit.org/show_bug.cgi?id=75780
+
+        Reviewed by Kenneth Rohde Christiansen.
+
+        Remove the ui-side animation code, and return false from addAnimation so that web-side
+        animations kick in.
+
+        * Shared/WebLayerTreeInfo.cpp:
+        (WebKit):
+        * Shared/WebLayerTreeInfo.h:
+        (WebLayerInfo):
+        * UIProcess/WebLayerTreeRenderer.cpp:
+        (WebKit::WebLayerTreeRenderer::paintToCurrentGLContext):
+        (WebKit::WebLayerTreeRenderer::setLayerState):
+        * WebProcess/WebCoreSupport/WebGraphicsLayer.cpp:
+        (WebCore::WebGraphicsLayer::didChangeGeometry):
+        (WebCore::WebGraphicsLayer::syncLayerState):
+        (WebCore::WebGraphicsLayer::computeTransformedVisibleRect):
+        * WebProcess/WebCoreSupport/WebGraphicsLayer.h:
+        (WebGraphicsLayer):
+
 2012-04-09  No'am Rosenthal  <noam.rosenthal@nokia.com>
 

trunk/Source/WebKit2/Shared/WebLayerTreeInfo.cpp

@@ -35 +35 @@
     // We have to divide it to several lines, because CoreIPC::In/Out takes a maximum of 10 arguments.
     encoder->encode(CoreIPC::In(id, name, parent, children, flags, replica, mask, imageBackingStoreID));
-    encoder->encode(CoreIPC::In(pos, size, transform, opacity, anchorPoint, childrenTransform, contentsRect, animations));
+    encoder->encode(CoreIPC::In(pos, size, transform, opacity, anchorPoint, childrenTransform, contentsRect));
 }
 
@@ -43 +43 @@
     if (!decoder->decode(CoreIPC::Out(info.id, info.name, info.parent, info.children, info.flags, info.replica, info.mask, info.imageBackingStoreID)))
         return false;
-    if (!decoder->decode(CoreIPC::Out(info.pos, info.size, info.transform, info.opacity, info.anchorPoint, info.childrenTransform, info.contentsRect, info.animations)))
+    if (!decoder->decode(CoreIPC::Out(info.pos, info.size, info.transform, info.opacity, info.anchorPoint, info.childrenTransform, info.contentsRect)))
         return false;
 
@@ -68 +68 @@
     return decoder->decode(CoreIPC::Out(info.layerID, info.rect, info.bitmapHandle));
 }
-
-void WebLayerAnimation::encode(CoreIPC::ArgumentEncoder* encoder) const
-{
-    encoder->encodeEnum(operation);
-    encoder->encode(keyframeList);
-    encoder->encode(CoreIPC::In(name, startTime, boxSize));
-
-    if (operation == WebLayerAnimation::AddAnimation)
-        encoder->encode(animation);
-}
-
-bool WebLayerAnimation::decode(CoreIPC::ArgumentDecoder* decoder, WebLayerAnimation& info)
-{
-    if (!decoder->decodeEnum(info.operation))
-        return false;
-    if (!decoder->decode(info.keyframeList))
-        return false;
-    if (!decoder->decode(CoreIPC::Out(info.name, info.startTime, info.boxSize)))
-        return false;
-
-    if (info.operation == WebLayerAnimation::AddAnimation)
-        if (!decoder->decode(info.animation))
-            return false;
-
-    return true;
-}
-
 }
 #endif

trunk/Source/WebKit2/Shared/WebLayerTreeInfo.h

@@ -49 +49 @@
 };
 
-struct WebLayerAnimation {
-    WebLayerAnimation()
-        : operation(InvalidAnimation)
-        , keyframeList(WebCore::AnimatedPropertyInvalid)
-        , startTime(0) { }
-    WebLayerAnimation(const WebCore::KeyframeValueList& valueList)
-        : operation(InvalidAnimation)
-        , keyframeList(valueList)
-        , startTime(0) { }
-
-    String name;
-    enum Operation {
-        AddAnimation,
-        RemoveAnimation,
-        PauseAnimation,
-        InvalidAnimation
-    } operation;
-    WebCore::IntSize boxSize;
-    RefPtr<WebCore::Animation> animation;
-    WebCore::KeyframeValueList keyframeList;
-    double startTime;
-
-    void encode(CoreIPC::ArgumentEncoder*) const;
-    static bool decode(CoreIPC::ArgumentDecoder*, WebLayerAnimation&);
-};
-
 struct WebLayerInfo {
     WebLayerInfo()
@@ -112 +86 @@
     };
     Vector<WebLayerID> children;
-    Vector<WebLayerAnimation> animations;
     RefPtr<ShareableBitmap> imageBackingStore;
 

trunk/Source/WebKit2/UIProcess/WebLayerTreeRenderer.cpp

@@ -122 +122 @@
     m_textureMapper->endClip();
     m_textureMapper->endPainting();
-
-    syncAnimations();
-}
-
-void WebLayerTreeRenderer::syncAnimations()
-{
-    TextureMapperLayer* layer = toTextureMapperLayer(rootLayer());
-    ASSERT(layer);
-
-    layer->syncAnimationsRecursively();
-    if (layer->descendantsOrSelfHaveRunningAnimations())
-        callOnMainThread(bind(&WebLayerTreeRenderer::updateViewport, this));
 }
 
@@ -209 +197 @@
     layer->setChildren(children);
 
-    for (size_t i = 0; i < layerInfo.animations.size(); ++i) {
-        const WebKit::WebLayerAnimation anim = layerInfo.animations[i];
-
-        switch (anim.operation) {
-        case WebKit::WebLayerAnimation::AddAnimation: {
-            const IntSize boxSize = anim.boxSize;
-            layer->addAnimation(anim.keyframeList, boxSize, anim.animation.get(), anim.name, anim.startTime);
-            break;
-        }
-        case WebKit::WebLayerAnimation::RemoveAnimation:
-            layer->removeAnimation(anim.name);
-            break;
-        case WebKit::WebLayerAnimation::PauseAnimation:
-            double offset = WTF::currentTime() - anim.startTime;
-            layer->pauseAnimation(anim.name, offset);
-            break;
-        }
-    }
-
     if (layerInfo.isRootLayer && m_rootLayerID != id)
         setRootLayerID(id);

trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebGraphicsLayer.cpp

@@ -23 +23 @@
 #include "WebGraphicsLayer.h"
 
-#include "Animation.h"
 #include "BackingStore.h"
 #include "FloatQuad.h"
@@ -91 +90 @@
     , m_maskTarget(0)
     , m_modified(true)
-    , m_hasPendingAnimations(false)
     , m_inUpdateMode(false)
     , m_shouldUpdateVisibleRect(true)
@@ -293 +291 @@
 
     GraphicsLayer::setContentsRect(r);
-    notifyChange();
-}
-
-void WebGraphicsLayer::notifyAnimationStarted(double time)
-{
-    if (client())
-        client()->notifyAnimationStarted(this, time);
-}
-
-bool WebGraphicsLayer::addAnimation(const KeyframeValueList& valueList, const IntSize& boxSize, const Animation* anim, const String& keyframesName, double timeOffset)
-{
-    if (!anim || anim->isEmptyOrZeroDuration() || valueList.size() < 2 || (valueList.property() != AnimatedPropertyWebkitTransform && valueList.property() != AnimatedPropertyOpacity))
-        return false;
-
-    WebLayerAnimation webAnimation(valueList);
-    webAnimation.name = keyframesName;
-    webAnimation.operation = WebLayerAnimation::AddAnimation;
-    webAnimation.boxSize = boxSize;
-    webAnimation.animation = Animation::create(anim);
-    webAnimation.startTime = timeOffset;
-    m_layerInfo.animations.append(webAnimation);
-    if (valueList.property() == AnimatedPropertyWebkitTransform)
-        m_transformAnimations.add(keyframesName);
-
-    m_hasPendingAnimations = true;
-    didChangeGeometry();
-
-    return true;
-}
-
-void WebGraphicsLayer::pauseAnimation(const String& animationName, double timeOffset)
-{
-    WebLayerAnimation webAnimation;
-    webAnimation.name = animationName;
-    webAnimation.operation = WebLayerAnimation::PauseAnimation;
-    webAnimation.startTime = WTF::currentTime() - timeOffset;
-    m_layerInfo.animations.append(webAnimation);
-    notifyChange();
-}
-
-void WebGraphicsLayer::removeAnimation(const String& animationName)
-{
-    WebLayerAnimation webAnimation;
-    webAnimation.name = animationName;
-    webAnimation.operation = WebLayerAnimation::RemoveAnimation;
-    m_layerInfo.animations.append(webAnimation);
-    m_transformAnimations.remove(animationName);
     notifyChange();
 }
@@ -480 +431 @@
 
     m_modified = false;
-    if (m_hasPendingAnimations)
-        notifyAnimationStarted(WTF::currentTime());
-    m_layerInfo.animations.clear();
-    m_hasPendingAnimations = false;
 }
 
@@ -570 +517 @@
 IntRect WebGraphicsLayer::tiledBackingStoreVisibleRect()
 {
-    // If this layer is part of an active transform animation, the visible rect might change,
-    // so we rather render the whole layer until some better optimization is available.
     if (!shouldUseTiledBackingStore())
         return tiledBackingStoreContentsRect();
@@ -699 +644 @@
 bool WebGraphicsLayer::selfOrAncestorHaveNonAffineTransforms()
 {
-    if (!m_transformAnimations.isEmpty())
-        return true;
-
     if (!m_layerTransform.combined().isAffine())
         return true;

trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebGraphicsLayer.h

@@ -92 +92 @@
     void setOpacity(float);
     void setContentsRect(const IntRect&);
-    bool addAnimation(const KeyframeValueList&, const IntSize&, const Animation*, const String&, double);
-    void pauseAnimation(const String&, double);
-    void removeAnimation(const String&);
     void setContentsToImage(Image*);
     void setMaskLayer(GraphicsLayer*);
@@ -112 +109 @@
     void didSynchronize();
     Image* image() { return m_image.get(); }
-    void notifyAnimationStarted(double);
 
     GraphicsLayer* maskTarget() const { return m_maskTarget; }
@@ -148 +144 @@
     LayerTransform m_layerTransform;
     bool m_modified : 1;
-    bool m_hasPendingAnimations : 1;
     bool m_inUpdateMode : 1;
     bool m_shouldUpdateVisibleRect: 1;
@@ -155 +150 @@
     void didChangeGeometry();
     void createBackingStore();
-    HashSet<String> m_transformAnimations;
 
     bool selfOrAncestorHaveNonAffineTransforms();