Commit 97af3e1c authored by cmarrin@apple.com's avatar cmarrin@apple.com
Browse files

2010-11-05 Chris Marrin <cmarrin@apple.com>

        Reviewed by Simon Fraser.

        suspendAnimations/resumeAnimations not present in WebKit2
        https://bugs.webkit.org/show_bug.cgi?id=49109

        Got 4 tests out of the Skipped list that now pass

        * platform/mac-wk2/Skipped:
2010-11-05  Chris Marrin  <cmarrin@apple.com>

        Reviewed by Simon Fraser.

        suspendAnimations/resumeAnimations not present in WebKit2
        https://bugs.webkit.org/show_bug.cgi?id=49109

        * WebKitTestRunner/InjectedBundle/Bindings/LayoutTestController.idl:
        * WebKitTestRunner/InjectedBundle/LayoutTestController.cpp:
        (WTR::LayoutTestController::suspendAnimations):
        (WTR::LayoutTestController::resumeAnimations):
        * WebKitTestRunner/InjectedBundle/LayoutTestController.h:
2010-11-05  Chris Marrin  <cmarrin@apple.com>

        Reviewed by Simon Fraser.

        suspendAnimations/resumeAnimations not present in WebKit2
        https://bugs.webkit.org/show_bug.cgi?id=49109

        * WebProcess/InjectedBundle/API/c/WKBundleFrame.cpp:
        (WKBundleFrameSuspendAnimations):
        (WKBundleFrameResumeAnimations):
        * WebProcess/InjectedBundle/API/c/WKBundleFramePrivate.h:
        * WebProcess/WebPage/WebFrame.cpp:
        (WebKit::WebFrame::suspendAnimations):
        (WebKit::WebFrame::resumeAnimations):
        * WebProcess/WebPage/WebFrame.h:


git-svn-id: http://svn.webkit.org/repository/webkit/trunk@71458 268f45cc-cd09-0410-ab3c-d52691b4dbfc
parent 7b02fdb7
2010-11-05 Chris Marrin <cmarrin@apple.com>
Reviewed by Simon Fraser.
suspendAnimations/resumeAnimations not present in WebKit2
https://bugs.webkit.org/show_bug.cgi?id=49109
Got 4 tests out of the Skipped list that now pass
* platform/mac-wk2/Skipped:
2010-11-05 Dumitru Daniliuc <dumi@chromium.org>
 
Unreviewed, updating Chromium expectations.
......@@ -1817,12 +1817,6 @@ plugins/get-url-that-the-resource-load-delegate-will-disallow.html
# WebKitTestRunner needs layoutTestController.setSelectTrailingWhitespaceEnabled
editing/selection/doubleclick-inline-first-last-contenteditable.html
# WebKitTestRunner needs layoutTestController.suspendAnimations
animations/suspend-resume-animation.html
animations/suspend-resume-animation-events.html
animations/suspend-transform-animation.html
transitions/suspend-transform-transition.html
# WebKitTestRunner needs layoutTestController.pageProperty
printing/page-rule-selection.html
......
2010-11-05 Chris Marrin <cmarrin@apple.com>
Reviewed by Simon Fraser.
suspendAnimations/resumeAnimations not present in WebKit2
https://bugs.webkit.org/show_bug.cgi?id=49109
* WebProcess/InjectedBundle/API/c/WKBundleFrame.cpp:
(WKBundleFrameSuspendAnimations):
(WKBundleFrameResumeAnimations):
* WebProcess/InjectedBundle/API/c/WKBundleFramePrivate.h:
* WebProcess/WebPage/WebFrame.cpp:
(WebKit::WebFrame::suspendAnimations):
(WebKit::WebFrame::resumeAnimations):
* WebProcess/WebPage/WebFrame.h:
2010-11-05 Anders Carlsson <andersca@apple.com>
 
Reviewed by Darin Adler.
......
......@@ -64,6 +64,16 @@ bool WKBundleFramePauseAnimationOnElementWithId(WKBundleFrameRef frameRef, WKStr
return toImpl(frameRef)->pauseAnimationOnElementWithId(toImpl(name)->string(), toImpl(elementID)->string(), time);
}
void WKBundleFrameSuspendAnimations(WKBundleFrameRef frameRef)
{
toImpl(frameRef)->suspendAnimations();
}
void WKBundleFrameResumeAnimations(WKBundleFrameRef frameRef)
{
toImpl(frameRef)->resumeAnimations();
}
JSGlobalContextRef WKBundleFrameGetJavaScriptContext(WKBundleFrameRef frameRef)
{
return toImpl(frameRef)->jsContext();
......
......@@ -43,6 +43,8 @@ WK_EXPORT WKStringRef WKBundleFrameCopyMarkerText(WKBundleFrameRef frame, JSObje
WK_EXPORT JSValueRef WKBundleFrameGetComputedStyleIncludingVisitedInfo(WKBundleFrameRef frame, JSObjectRef element);
WK_EXPORT unsigned WKBundleFrameGetNumberOfActiveAnimations(WKBundleFrameRef frame);
WK_EXPORT bool WKBundleFramePauseAnimationOnElementWithId(WKBundleFrameRef frame, WKStringRef name, WKStringRef elementID, double time);
WK_EXPORT void WKBundleFrameSuspendAnimations(WKBundleFrameRef frame);
WK_EXPORT void WKBundleFrameResumeAnimations(WKBundleFrameRef frame);
WK_EXPORT unsigned WKBundleFrameGetPendingUnloadCount(WKBundleFrameRef frame);
WK_EXPORT WKStringRef WKBundleFrameCopyLayerTreeAsText(WKBundleFrameRef frame);
......
......@@ -320,6 +320,30 @@ bool WebFrame::pauseAnimationOnElementWithId(const String& animationName, const
return controller->pauseAnimationAtTime(coreNode->renderer(), animationName, time);
}
void WebFrame::suspendAnimations()
{
if (!m_coreFrame)
return;
AnimationController* controller = m_coreFrame->animation();
if (!controller)
return;
controller->suspendAnimations();
}
void WebFrame::resumeAnimations()
{
if (!m_coreFrame)
return;
AnimationController* controller = m_coreFrame->animation();
if (!controller)
return;
controller->resumeAnimations();
}
String WebFrame::layerTreeAsText() const
{
if (!m_coreFrame)
......
......@@ -91,6 +91,8 @@ public:
unsigned numberOfActiveAnimations() const;
bool pauseAnimationOnElementWithId(const String& animationName, const String& elementID, double time);
void suspendAnimations();
void resumeAnimations();
String layerTreeAsText() const;
unsigned pendingUnloadCount() const;
......
2010-11-05 Chris Marrin <cmarrin@apple.com>
Reviewed by Simon Fraser.
suspendAnimations/resumeAnimations not present in WebKit2
https://bugs.webkit.org/show_bug.cgi?id=49109
* WebKitTestRunner/InjectedBundle/Bindings/LayoutTestController.idl:
* WebKitTestRunner/InjectedBundle/LayoutTestController.cpp:
(WTR::LayoutTestController::suspendAnimations):
(WTR::LayoutTestController::resumeAnimations):
* WebKitTestRunner/InjectedBundle/LayoutTestController.h:
2010-11-05 Tony Chang <tony@chromium.org>
 
Reviewed by David Levin.
......
......@@ -64,6 +64,8 @@ module WTR {
// Animation testing.
int numberOfActiveAnimations();
boolean pauseAnimationAtTimeOnElementWithId(in DOMString animationName, in double time, in DOMString elementId);
void suspendAnimations();
void resumeAnimations();
// UserContent testing.
void addUserScript(in DOMString source, in boolean runAtStart, in boolean allFrames);
......
......@@ -150,6 +150,18 @@ bool LayoutTestController::pauseAnimationAtTimeOnElementWithId(JSStringRef anima
return WKBundleFramePauseAnimationOnElementWithId(mainFrame, toWK(animationName).get(), toWK(elementId).get(), time);
}
void LayoutTestController::suspendAnimations()
{
WKBundleFrameRef mainFrame = WKBundlePageGetMainFrame(InjectedBundle::shared().page()->page());
WKBundleFrameSuspendAnimations(mainFrame);
}
void LayoutTestController::resumeAnimations()
{
WKBundleFrameRef mainFrame = WKBundlePageGetMainFrame(InjectedBundle::shared().page()->page());
WKBundleFrameResumeAnimations(mainFrame);
}
JSRetainPtr<JSStringRef> LayoutTestController::layerTreeAsText() const
{
WKBundleFrameRef mainFrame = WKBundlePageGetMainFrame(InjectedBundle::shared().page()->page());
......
......@@ -91,7 +91,9 @@ public:
// Animation testing.
unsigned numberOfActiveAnimations() const;
bool pauseAnimationAtTimeOnElementWithId(JSStringRef animationName, double time, JSStringRef elementId);
void suspendAnimations();
void resumeAnimations();
// Compositing testing.
JSRetainPtr<JSStringRef> layerTreeAsText() const;
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment