Changeset 41361 in webkit

Timestamp:

Mar 2, 2009 10:26:55 AM (15 years ago)

Author:

treat@webkit.org

Message:

2009-03-02 Adam Treat <​adam.treat@torchmobile.com>

Reviewed by Eric Seidel.

Add three new drt helper functions that enable all of the tests in
LayoutTests/animation/* and LayoutTests/transitions/* to now pass.

• Api/qwebframe.cpp: (qt_drt_pauseAnimation): (qt_drt_pauseTransitionOfProperty): (qt_drt_numberOfActiveAnimations):

• DumpRenderTree/qt/jsobjects.cpp: (LayoutTestController::pauseAnimationAtTimeOnElementWithId): (LayoutTestController::pauseTransitionAtTimeOnElementWithId): (LayoutTestController::numberOfActiveAnimations):
• DumpRenderTree/qt/jsobjects.h:

Location:

trunk

Files:

• WebKit/qt/Api/qwebframe.cpp (modified) (1 diff)
• WebKit/qt/ChangeLog (modified) (1 diff)
• WebKitTools/ChangeLog (modified) (1 diff)
• WebKitTools/DumpRenderTree/qt/jsobjects.cpp (modified) (2 diffs)
• WebKitTools/DumpRenderTree/qt/jsobjects.h (modified) (1 diff)

trunk/WebKit/qt/Api/qwebframe.cpp

@@ -105 +105 @@
     else
         controller->disableProfiler();
+}
+
+// Pause a given CSS animation or transition on the target node at a specific time.
+// If the animation or transition is already paused, it will update its pause time.
+// This method is only intended to be used for testing the CSS animation and transition system.
+bool QWEBKIT_EXPORT qt_drt_pauseAnimation(QWebFrame *qframe, const QString &animationName, double time, const QString &elementId)
+{
+    Frame* frame = QWebFramePrivate::core(qframe);
+    if (!frame)
+        return false;
+
+    AnimationController* controller = frame->animation();
+    if (!controller)
+        return false;
+
+    Document* doc = frame->document();
+    Q_ASSERT(doc);
+
+    Node* coreNode = doc->getElementById(elementId);
+    if (!coreNode || !coreNode->renderer())
+        return false;
+
+    return controller->pauseAnimationAtTime(coreNode->renderer(), animationName, time);
+}
+
+bool QWEBKIT_EXPORT qt_drt_pauseTransitionOfProperty(QWebFrame *qframe, const QString &propertyName, double time, const QString &elementId)
+{
+    Frame* frame = QWebFramePrivate::core(qframe);
+    if (!frame)
+        return false;
+
+    AnimationController* controller = frame->animation();
+    if (!controller)
+        return false;
+
+    Document* doc = frame->document();
+    Q_ASSERT(doc);
+
+    Node* coreNode = doc->getElementById(elementId);
+    if (!coreNode || !coreNode->renderer())
+        return false;
+
+    return controller->pauseTransitionAtTime(coreNode->renderer(), propertyName, time);
+}
+
+// Returns the total number of currently running animations (includes both CSS transitions and CSS animations).
+int QWEBKIT_EXPORT qt_drt_numberOfActiveAnimations(QWebFrame *qframe)
+{
+    Frame* frame = QWebFramePrivate::core(qframe);
+    if (!frame)
+        return false;
+
+    AnimationController* controller = frame->animation();
+    if (!controller)
+        return false;
+
+    return controller->numberOfActiveAnimations();
 }
 

trunk/WebKit/qt/ChangeLog

@@ +1 @@
+2009-03-02  Adam Treat  <adam.treat@torchmobile.com>
+
+        Reviewed by Eric Seidel.
+
+        Add three new drt helper functions that enable all of the tests in
+        LayoutTests/animation/* and LayoutTests/transitions/* to now pass.
+
+        * Api/qwebframe.cpp:
+        (qt_drt_pauseAnimation):
+        (qt_drt_pauseTransitionOfProperty):
+        (qt_drt_numberOfActiveAnimations):
+
 2009-03-02  Benjamin C Meyer  <benjamin.meyer@torchmobile.com>
 

trunk/WebKitTools/ChangeLog

@@ +1 @@
+2009-03-02  Adam Treat  <adam.treat@torchmobile.com>
+
+        Reviewed by Eric Seidel.
+
+        Add three new drt helper functions that enable all of the tests in
+        LayoutTests/animation/* and LayoutTests/transitions/* to now pass.
+
+        * DumpRenderTree/qt/jsobjects.cpp:
+        (LayoutTestController::pauseAnimationAtTimeOnElementWithId):
+        (LayoutTestController::pauseTransitionAtTimeOnElementWithId):
+        (LayoutTestController::numberOfActiveAnimations):
+        * DumpRenderTree/qt/jsobjects.h:
+
 2009-03-02  Adam Roben  <aroben@apple.com>
 

trunk/WebKitTools/DumpRenderTree/qt/jsobjects.cpp

@@ -42 +42 @@
 extern void qt_dump_resource_load_callbacks(bool b);
 extern void qt_drt_setJavaScriptProfilingEnabled(QWebFrame*, bool enabled);
+extern bool qt_drt_pauseAnimation(QWebFrame*, const QString &name, double time, const QString &elementId);
+extern bool qt_drt_pauseTransitionOfProperty(QWebFrame*, const QString &name, double time, const QString &elementId);
+extern int qt_drt_numberOfActiveAnimations(QWebFrame*);
 
 QWebFrame *findFrameNamed(const QString &frameName, QWebFrame *frame)
@@ -273 +276 @@
 {
     m_topLoadingFrame->page()->setUseFixedLayout(enable);
+}
+
+bool LayoutTestController::pauseAnimationAtTimeOnElementWithId(const QString &animationName,
+                                                               double time,
+                                                               const QString &elementId)
+{
+    QWebFrame *frame = m_drt->webPage()->mainFrame();
+    Q_ASSERT(frame);
+    return qt_drt_pauseAnimation(frame, animationName, time, elementId);
+}
+
+bool LayoutTestController::pauseTransitionAtTimeOnElementWithId(const QString &propertyName,
+                                                                double time,
+                                                                const QString &elementId)
+{
+    QWebFrame *frame = m_drt->webPage()->mainFrame();
+    Q_ASSERT(frame);
+    return qt_drt_pauseTransitionOfProperty(frame, propertyName, time, elementId);
+}
+
+unsigned LayoutTestController::numberOfActiveAnimations() const
+{
+    QWebFrame *frame = m_drt->webPage()->mainFrame();
+    Q_ASSERT(frame);
+    return qt_drt_numberOfActiveAnimations(frame);
 }
 

trunk/WebKitTools/DumpRenderTree/qt/jsobjects.h

@@ -92 +92 @@
     void setUseFixedLayout(bool enable);
 
+    bool pauseAnimationAtTimeOnElementWithId(const QString &animationName, double time, const QString &elementId);
+    bool pauseTransitionAtTimeOnElementWithId(const QString &propertyName, double time, const QString &elementId);
+    unsigned numberOfActiveAnimations() const;
+
 private slots:
     void processWork();