Move resumeAnimations to use Internals interface
authorgyuyoung.kim@samsung.com <gyuyoung.kim@samsung.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Fri, 11 May 2012 05:31:35 +0000 (05:31 +0000)
committergyuyoung.kim@samsung.com <gyuyoung.kim@samsung.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Fri, 11 May 2012 05:31:35 +0000 (05:31 +0000)
https://bugs.webkit.org/show_bug.cgi?id=86063

Reviewed by Alexey Proskuryakov.

.:

* Source/autotools/symbols.filter: Add a symbol filter for resumeAnimations.

Source/WebCore:

Add resumeAnimations functions, because it is able to work in the
cross-port way through the Internals interface.

No new tests, since we are improving here the infra-structure for testing
a specific method.

* testing/Internals.cpp:
(WebCore::Internals::resumeAnimations):
(WebCore):
* testing/Internals.h:
(Internals):
* testing/Internals.idl:

Source/WebKit/efl:

Remove resumeAnimations functions, because it is able to work in the
cross-port way through the Internals interface.

* WebCoreSupport/DumpRenderTreeSupportEfl.cpp:
* WebCoreSupport/DumpRenderTreeSupportEfl.h:

Source/WebKit/gtk:

Remove resumeAnimations functions, because it is able to work in the
cross-port way through the Internals interface.

* WebCoreSupport/DumpRenderTreeSupportGtk.cpp:
* WebCoreSupport/DumpRenderTreeSupportGtk.h:
(DumpRenderTreeSupportGtk):

Source/WebKit/mac:

Remove resumeAnimations functions, because it is able to work in the
cross-port way through the Internals interface.

* WebKit.order:
* WebView/WebFrame.mm:
* WebView/WebFramePrivate.h:

Source/WebKit/qt:

Remove resumeAnimations functions, because it is able to work in the
cross-port way through the Internals interface.

* WebCoreSupport/DumpRenderTreeSupportQt.cpp:
* WebCoreSupport/DumpRenderTreeSupportQt.h:

Source/WebKit/win:

Remove resumeAnimations functions, because it is able to work in the
cross-port way through the Internals interface.

* Interfaces/IWebFramePrivate.idl:
* WebFrame.cpp:
* WebFrame.h:

Source/WebKit2:

* win/WebKit2.def: Add a symbol filter for resumeAnimations.

Tools:

Remove resumeAnimations functions, because it is able to work in the
cross-port way through the Internals interface.

* DumpRenderTree/LayoutTestController.cpp:
(LayoutTestController::staticFunctions):
* DumpRenderTree/LayoutTestController.h:
(LayoutTestController):
* DumpRenderTree/blackberry/LayoutTestControllerBlackBerry.cpp:
* DumpRenderTree/chromium/LayoutTestController.cpp:
(LayoutTestController::LayoutTestController):
* DumpRenderTree/chromium/LayoutTestController.h:
(LayoutTestController):
* DumpRenderTree/efl/LayoutTestControllerEfl.cpp:
* DumpRenderTree/gtk/LayoutTestControllerGtk.cpp:
* DumpRenderTree/mac/LayoutTestControllerMac.mm:
* DumpRenderTree/qt/LayoutTestControllerQt.cpp:
* DumpRenderTree/qt/LayoutTestControllerQt.h:
(LayoutTestController):
* DumpRenderTree/win/LayoutTestControllerWin.cpp:
* DumpRenderTree/wx/LayoutTestControllerWx.cpp:
* WebKitTestRunner/InjectedBundle/Bindings/LayoutTestController.idl:
* WebKitTestRunner/InjectedBundle/LayoutTestController.cpp:
* WebKitTestRunner/InjectedBundle/LayoutTestController.h:
(LayoutTestController):

LayoutTests:

Call resumeAnimations functions from internals, because it is able to work in the
cross-port way through the Internals interface.

* animations/play-state-suspend.html:
* animations/stop-animation-on-suspend.html:
* animations/suspend-resume-animation-events.html:
* animations/suspend-resume-animation.html:

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@116729 268f45cc-cd09-0410-ab3c-d52691b4dbfc

46 files changed:
ChangeLog
LayoutTests/ChangeLog
LayoutTests/animations/play-state-suspend.html
LayoutTests/animations/stop-animation-on-suspend.html
LayoutTests/animations/suspend-resume-animation-events.html
LayoutTests/animations/suspend-resume-animation.html
Source/WebCore/ChangeLog
Source/WebCore/testing/Internals.cpp
Source/WebCore/testing/Internals.h
Source/WebCore/testing/Internals.idl
Source/WebKit/efl/ChangeLog
Source/WebKit/efl/WebCoreSupport/DumpRenderTreeSupportEfl.cpp
Source/WebKit/efl/WebCoreSupport/DumpRenderTreeSupportEfl.h
Source/WebKit/gtk/ChangeLog
Source/WebKit/gtk/WebCoreSupport/DumpRenderTreeSupportGtk.cpp
Source/WebKit/gtk/WebCoreSupport/DumpRenderTreeSupportGtk.h
Source/WebKit/mac/ChangeLog
Source/WebKit/mac/WebKit.order
Source/WebKit/mac/WebView/WebFrame.mm
Source/WebKit/mac/WebView/WebFramePrivate.h
Source/WebKit/qt/ChangeLog
Source/WebKit/qt/WebCoreSupport/DumpRenderTreeSupportQt.cpp
Source/WebKit/qt/WebCoreSupport/DumpRenderTreeSupportQt.h
Source/WebKit/win/ChangeLog
Source/WebKit/win/Interfaces/IWebFramePrivate.idl
Source/WebKit/win/WebFrame.cpp
Source/WebKit/win/WebFrame.h
Source/WebKit2/ChangeLog
Source/WebKit2/win/WebKit2.def
Source/autotools/symbols.filter
Tools/ChangeLog
Tools/DumpRenderTree/LayoutTestController.cpp
Tools/DumpRenderTree/LayoutTestController.h
Tools/DumpRenderTree/blackberry/LayoutTestControllerBlackBerry.cpp
Tools/DumpRenderTree/chromium/LayoutTestController.cpp
Tools/DumpRenderTree/chromium/LayoutTestController.h
Tools/DumpRenderTree/efl/LayoutTestControllerEfl.cpp
Tools/DumpRenderTree/gtk/LayoutTestControllerGtk.cpp
Tools/DumpRenderTree/mac/LayoutTestControllerMac.mm
Tools/DumpRenderTree/qt/LayoutTestControllerQt.cpp
Tools/DumpRenderTree/qt/LayoutTestControllerQt.h
Tools/DumpRenderTree/win/LayoutTestControllerWin.cpp
Tools/DumpRenderTree/wx/LayoutTestControllerWx.cpp
Tools/WebKitTestRunner/InjectedBundle/Bindings/LayoutTestController.idl
Tools/WebKitTestRunner/InjectedBundle/LayoutTestController.cpp
Tools/WebKitTestRunner/InjectedBundle/LayoutTestController.h

index 6919dad..1925e01 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2012-05-10  Gyuyoung Kim  <gyuyoung.kim@samsung.com>
+
+        Move resumeAnimations to use Internals interface
+        https://bugs.webkit.org/show_bug.cgi?id=86063
+
+        Reviewed by Alexey Proskuryakov.
+
+        * Source/autotools/symbols.filter: Add a symbol filter for resumeAnimations. 
+
 2012-05-10  Zan Dobersek  <zandobersek@gmail.com>
 
         [GTK] ENABLE_IFRAME_SEAMLESS support
index 8252f45..71a3318 100644 (file)
@@ -1,3 +1,18 @@
+2012-05-10  Gyuyoung Kim  <gyuyoung.kim@samsung.com>
+
+        Move resumeAnimations to use Internals interface
+        https://bugs.webkit.org/show_bug.cgi?id=86063
+
+        Reviewed by Alexey Proskuryakov.
+
+        Call resumeAnimations functions from internals, because it is able to work in the
+        cross-port way through the Internals interface.
+
+        * animations/play-state-suspend.html:
+        * animations/stop-animation-on-suspend.html:
+        * animations/suspend-resume-animation-events.html:
+        * animations/suspend-resume-animation.html:
+
 2012-05-10  Kent Tamura  <tkent@chromium.org>
 
         [Chromium] Test expectation update
index c094993..e25f91f 100644 (file)
@@ -68,8 +68,8 @@
 
     function resume()
     {
-        if (window.layoutTestController)
-            layoutTestController.resumeAnimations();
+        if (window.internals)
+            internals.resumeAnimations(document);
     }
 
     function setTimers()
index 004a2e3..478cdb4 100644 (file)
@@ -46,8 +46,8 @@
     
     function resume()
     {
-        if (window.layoutTestController)
-            layoutTestController.resumeAnimations();
+        if (window.internals)
+            internals.resumeAnimations(document);
     }
     
     function setTimers()
index fa9f00b..c1abe56 100644 (file)
@@ -36,8 +36,8 @@
     
     function resume()
     {
-        if (window.layoutTestController)
-            layoutTestController.resumeAnimations();
+        if (window.internals)
+            internals.resumeAnimations(document);
     }
     
     function startTest()
index ad6622d..56ca960 100644 (file)
@@ -35,8 +35,8 @@
     
     function resume()
     {
-        if (window.layoutTestController)
-            layoutTestController.resumeAnimations();
+        if (window.internals)
+            internals.resumeAnimations(document);
     }
     
     function setTimers()
index d41312e..b3b7459 100644 (file)
@@ -1,3 +1,23 @@
+2012-05-10  Gyuyoung Kim  <gyuyoung.kim@samsung.com>
+
+        Move resumeAnimations to use Internals interface
+        https://bugs.webkit.org/show_bug.cgi?id=86063
+
+        Reviewed by Alexey Proskuryakov.
+
+        Add resumeAnimations functions, because it is able to work in the
+        cross-port way through the Internals interface.
+
+        No new tests, since we are improving here the infra-structure for testing
+        a specific method.
+
+        * testing/Internals.cpp:
+        (WebCore::Internals::resumeAnimations):
+        (WebCore):
+        * testing/Internals.h:
+        (Internals):
+        * testing/Internals.idl:
+
 2012-05-10  Min Qin  <qinmin@google.com>
 
         split MediaPlayer::enterFullscreen into 2 seperate functions
index 7dccea3..fe53e88 100644 (file)
@@ -1020,6 +1020,21 @@ void Internals::suspendAnimations(Document* document, ExceptionCode& ec) const
     controller->suspendAnimations();
 }
 
+void Internals::resumeAnimations(Document* document, ExceptionCode& ec) const
+{
+    if (!document || !document->frame()) {
+        ec = INVALID_ACCESS_ERR;
+        return;
+    }
+
+    AnimationController* controller = document->frame()->animation();
+    if (!controller)
+        return;
+
+    controller->resumeAnimations();
+}
+
+
 #if ENABLE(FULLSCREEN_API)
 void Internals::webkitWillEnterFullScreenForElement(Document* document, Element* element)
 {
index e07f4bc..baefba6 100644 (file)
@@ -164,6 +164,7 @@ public:
     void setNetworkInformation(Document*, const String& eventType, long bandwidth, bool metered, ExceptionCode&);
 
     void suspendAnimations(Document*, ExceptionCode&) const;
+    void resumeAnimations(Document*, ExceptionCode&) const;
 
 #if ENABLE(INSPECTOR)
     unsigned numberOfLiveNodes() const;
index 3476571..1fa6fae 100644 (file)
@@ -133,6 +133,7 @@ module window {
         readonly attribute InternalSettings settings;
 
         void suspendAnimations(in Document document) raises (DOMException);
+        void resumeAnimations(in Document document) raises (DOMException);
 
 #if defined(ENABLE_BATTERY_STATUS) && ENABLE_BATTERY_STATUS
         void setBatteryStatus(in Document document, in DOMString eventType, in boolean charging, in double chargingTime, in double dischargingTime, in double level) raises (DOMException);
index 02ea5f5..c7d6d8c 100644 (file)
@@ -1,3 +1,16 @@
+2012-05-10  Gyuyoung Kim  <gyuyoung.kim@samsung.com>
+
+        Move resumeAnimations to use Internals interface
+        https://bugs.webkit.org/show_bug.cgi?id=86063
+
+        Reviewed by Alexey Proskuryakov.
+
+        Remove resumeAnimations functions, because it is able to work in the 
+        cross-port way through the Internals interface.
+
+        * WebCoreSupport/DumpRenderTreeSupportEfl.cpp:
+        * WebCoreSupport/DumpRenderTreeSupportEfl.h:
+
 2012-05-10  Kangil Han  <kangil.han@samsung.com>
 
         [EFL][DRT] Editor doesn't cancel composition as change of value
index 8bd8909..1486cbc 100644 (file)
@@ -278,18 +278,6 @@ String DumpRenderTreeSupportEfl::responseMimeType(const Evas_Object* ewkFrame)
     return documentLoader->responseMIMEType();
 }
 
-void DumpRenderTreeSupportEfl::resumeAnimations(Evas_Object* ewkFrame)
-{
-    WebCore::Frame* frame = EWKPrivate::coreFrame(ewkFrame);
-
-    if (!frame)
-        return;
-
-    WebCore::AnimationController *animationController = frame->animation();
-    if (animationController)
-        animationController->resumeAnimations();
-}
-
 WebCore::IntRect DumpRenderTreeSupportEfl::selectionRectangle(const Evas_Object* ewkFrame)
 {
     WebCore::Frame* frame = EWKPrivate::coreFrame(ewkFrame);
index fd07762..5328f67 100644 (file)
@@ -62,7 +62,6 @@ public:
     static unsigned pendingUnloadEventCount(const Evas_Object* ewkFrame);
     static String renderTreeDump(Evas_Object* ewkFrame);
     static String responseMimeType(const Evas_Object* ewkFrame);
-    static void resumeAnimations(Evas_Object* ewkFrame);
     static WebCore::IntRect selectionRectangle(const Evas_Object* ewkFrame);
     static String suitableDRTFrameName(const Evas_Object* ewkFrame);
     static void setValueForUser(JSContextRef, JSValueRef nodeObject, const String& value);
index 75c2490..d9d0eb5 100644 (file)
@@ -1,3 +1,17 @@
+2012-05-10  Gyuyoung Kim  <gyuyoung.kim@samsung.com>
+
+        Move resumeAnimations to use Internals interface
+        https://bugs.webkit.org/show_bug.cgi?id=86063
+
+        Reviewed by Alexey Proskuryakov.
+
+        Remove resumeAnimations functions, because it is able to work in the 
+        cross-port way through the Internals interface.
+
+        * WebCoreSupport/DumpRenderTreeSupportGtk.cpp:
+        * WebCoreSupport/DumpRenderTreeSupportGtk.h:
+        (DumpRenderTreeSupportGtk):
+
 2012-05-09  Gyuyoung Kim  <gyuyoung.kim@samsung.com>
 
         Move suspendAnimations to use Internals interface.
index 5eb5e4f..03827b4 100644 (file)
@@ -363,15 +363,6 @@ unsigned int DumpRenderTreeSupportGtk::numberOfActiveAnimations(WebKitWebFrame*
     return coreFrame->animation()->numberOfActiveAnimations(coreFrame->document());
 }
 
-void DumpRenderTreeSupportGtk::resumeAnimations(WebKitWebFrame* frame)
-{
-    Frame* coreFrame = core(frame);
-    if (!coreFrame)
-        return;
-
-    return coreFrame->animation()->resumeAnimations();
-}
-
 void DumpRenderTreeSupportGtk::clearMainFrameName(WebKitWebFrame* frame)
 {
     g_return_if_fail(WEBKIT_IS_WEB_FRAME(frame));
index 20d837e..a0fd1a5 100644 (file)
@@ -72,7 +72,6 @@ public:
     static bool pauseTransition(WebKitWebFrame*, const char* name, double time, const char* element);
     static WTF::CString markerTextForListItem(WebKitWebFrame*, JSContextRef, JSValueRef nodeObject);
     static unsigned int numberOfActiveAnimations(WebKitWebFrame*);
-    static void resumeAnimations(WebKitWebFrame*);
     static void clearMainFrameName(WebKitWebFrame*);
     static AtkObject* getFocusedAccessibleElement(WebKitWebFrame*);
     static AtkObject* getRootAccessibleElement(WebKitWebFrame*);
index d234ade..f35e19a 100644 (file)
@@ -1,3 +1,17 @@
+2012-05-10  Gyuyoung Kim  <gyuyoung.kim@samsung.com>
+
+        Move resumeAnimations to use Internals interface
+        https://bugs.webkit.org/show_bug.cgi?id=86063
+
+        Reviewed by Alexey Proskuryakov.
+
+        Remove resumeAnimations functions, because it is able to work in the 
+        cross-port way through the Internals interface.
+
+        * WebKit.order:
+        * WebView/WebFrame.mm:
+        * WebView/WebFramePrivate.h:
+
 2012-05-10  Anders Carlsson  <andersca@apple.com>
 
         WebKit1: Add a way to blacklist specific plug-ins/plug-in versions
index 21d96d8..1a1eb0c 100644 (file)
@@ -1221,7 +1221,6 @@ _WKExecutableWasLinkedOnOrBeforeSnowLeopard
 __ZNK7WebCore12ChromeClient29dispatchViewportDataDidChangeERKNS_17ViewportArgumentsE
 -[WebView(WebPrivate) setFrameSize:]
 -[WebFrame(WebKitDebug) renderTreeAsExternalRepresentationForPrinting:]
--[WebFrame(WebPrivate) _resumeAnimations]
 +[WebView(WebPrivate) _pointingHandCursor]
 _WKGetCFURLResponseURL
 _WKGetCFURLResponseHTTPResponse
index ad43643..416bd7d 100644 (file)
@@ -998,15 +998,6 @@ static inline WebDataSource *dataSource(DocumentLoader* loader)
     return controller->numberOfActiveAnimations(frame->document());
 }
 
-- (void) _resumeAnimations
-{
-    Frame* frame = core(self);
-    if (!frame)
-        return;
-
-    frame->animation()->resumeAnimations();
-}
-
 - (void)_replaceSelectionWithFragment:(DOMDocumentFragment *)fragment selectReplacement:(BOOL)selectReplacement smartReplace:(BOOL)smartReplace matchStyle:(BOOL)matchStyle
 {
     if (_private->coreFrame->selection()->isNone() || !fragment)
index 4b7c759..9dea7e1 100644 (file)
@@ -107,9 +107,6 @@ typedef enum {
 // Returns the total number of currently running animations (includes both CSS transitions and CSS animations).
 - (unsigned)_numberOfActiveAnimations;
 
-// Suspend and resume animations (includes both CSS transitions and CSS animations).
-- (void)_resumeAnimations;
-
 - (void)_replaceSelectionWithFragment:(DOMDocumentFragment *)fragment selectReplacement:(BOOL)selectReplacement smartReplace:(BOOL)smartReplace matchStyle:(BOOL)matchStyle;
 - (void)_replaceSelectionWithText:(NSString *)text selectReplacement:(BOOL)selectReplacement smartReplace:(BOOL)smartReplace;
 - (void)_replaceSelectionWithMarkupString:(NSString *)markupString baseURLString:(NSString *)baseURLString selectReplacement:(BOOL)selectReplacement smartReplace:(BOOL)smartReplace;
index 349e85f..6881af4 100644 (file)
@@ -1,3 +1,16 @@
+2012-05-10  Gyuyoung Kim  <gyuyoung.kim@samsung.com>
+
+        Move resumeAnimations to use Internals interface
+        https://bugs.webkit.org/show_bug.cgi?id=86063
+
+        Reviewed by Alexey Proskuryakov.
+
+        Remove resumeAnimations functions, because it is able to work in the 
+        cross-port way through the Internals interface.
+
+        * WebCoreSupport/DumpRenderTreeSupportQt.cpp:
+        * WebCoreSupport/DumpRenderTreeSupportQt.h:
+
 2012-05-10  Marius Storm-Olsen  <marius.storm-olsen@nokia.com>
 
         [Qt] Fix \sa usage in documentation
index 445e684..2d4fb50 100644 (file)
@@ -384,19 +384,6 @@ int DumpRenderTreeSupportQt::numberOfActiveAnimations(QWebFrame *frame)
     return controller->numberOfActiveAnimations(coreFrame->document());
 }
 
-void DumpRenderTreeSupportQt::resumeAnimations(QWebFrame *frame)
-{
-    Frame* coreFrame = QWebFramePrivate::core(frame);
-    if (!coreFrame)
-        return;
-
-    AnimationController* controller = coreFrame->animation();
-    if (!controller)
-        return;
-
-    controller->resumeAnimations();
-}
-
 void DumpRenderTreeSupportQt::clearFrameName(QWebFrame* frame)
 {
     Frame* coreFrame = QWebFramePrivate::core(frame);
index d85a336..373f60e 100644 (file)
@@ -141,7 +141,6 @@ public:
     static void clearFrameName(QWebFrame* frame);
     static void overwritePluginDirectories();
     static int numberOfActiveAnimations(QWebFrame*);
-    static void resumeAnimations(QWebFrame*);
     static int numberOfPages(QWebFrame* frame, float width, float height);
     static int pageNumberForElementById(QWebFrame* frame, const QString& id, float width, float height);
     static bool hasDocumentElement(QWebFrame* frame);
index a10bd14..c2a96b0 100644 (file)
@@ -1,3 +1,17 @@
+2012-05-10  Gyuyoung Kim  <gyuyoung.kim@samsung.com>
+
+        Move resumeAnimations to use Internals interface
+        https://bugs.webkit.org/show_bug.cgi?id=86063
+
+        Reviewed by Alexey Proskuryakov.
+
+        Remove resumeAnimations functions, because it is able to work in the 
+        cross-port way through the Internals interface.
+
+        * Interfaces/IWebFramePrivate.idl:
+        * WebFrame.cpp:
+        * WebFrame.h:
+
 2012-05-10  Anders Carlsson  <andersca@apple.com>
 
         Rename the missing plug-in indicator to the unavailable plug-in indicator
index bca65e4..dea1123 100644 (file)
@@ -110,8 +110,6 @@ interface IWebFramePrivate : IUnknown
 
     HRESULT renderTreeAsExternalRepresentation([in] BOOL forPrinting, [out, retval] BSTR* result);
 
-    HRESULT resumeAnimations();
-
     HRESULT loadPlainTextString([in] BSTR string, [in] BSTR url);
 
     HRESULT clearOpener();
index c0ea533..3a3715b 100644 (file)
@@ -1311,16 +1311,6 @@ HRESULT WebFrame::numberOfActiveAnimations(UINT* number)
     return S_OK;
 }
 
-HRESULT WebFrame::resumeAnimations()
-{
-    Frame* frame = core(this);
-    if (!frame)
-        return E_FAIL;
-
-    frame->animation()->resumeAnimations();
-    return S_OK;
-}
-
 HRESULT WebFrame::isDisplayingStandaloneImage(BOOL* result)
 {
     if (!result)
index fae2ac3..b63438b 100644 (file)
@@ -260,7 +260,6 @@ public:
     virtual HRESULT STDMETHODCALLTYPE pauseAnimation(BSTR animationName, IDOMNode*, double secondsFromNow, BOOL* animationWasRunning);
     virtual HRESULT STDMETHODCALLTYPE pauseTransition(BSTR propertyName, IDOMNode*, double secondsFromNow, BOOL* transitionWasRunning);
     virtual HRESULT STDMETHODCALLTYPE numberOfActiveAnimations(UINT*);
-    virtual HRESULT STDMETHODCALLTYPE resumeAnimations();
     virtual HRESULT STDMETHODCALLTYPE loadPlainTextString(BSTR string, BSTR url);
 
     virtual HRESULT STDMETHODCALLTYPE isDisplayingStandaloneImage(BOOL*);
index 179daac..b4dba9e 100644 (file)
@@ -1,3 +1,12 @@
+2012-05-10  Gyuyoung Kim  <gyuyoung.kim@samsung.com>
+
+        Move resumeAnimations to use Internals interface
+        https://bugs.webkit.org/show_bug.cgi?id=86063
+
+        Reviewed by Alexey Proskuryakov.
+
+        * win/WebKit2.def: Add a symbol filter for resumeAnimations.
+
 2012-05-10  Anders Carlsson  <andersca@apple.com>
 
         PDF files won't scroll in Safari when using Adobe plug-in
index 6e1c52c..a03fb80 100644 (file)
@@ -256,3 +256,4 @@ EXPORTS
         ?webkitDidExitFullScreenForElement@Document@WebCore@@QAEXPAVElement@2@@Z
         ?isPageBoxVisible@Document@WebCore@@QAE_NH@Z
         ?suspendAnimations@AnimationController@WebCore@@QAEXXZ
+        ?resumeAnimations@AnimationController@WebCore@@QAEXXZ
index 4548ae0..bd9102d 100644 (file)
@@ -108,6 +108,7 @@ _ZNK7WebCore9TreeScope14getElementByIdERKN3WTF12AtomicStringE;
 _ZNK7WebCore14DocumentMarker11descriptionEv;
 _ZN7WebCore8Document16isPageBoxVisibleEi;
 _ZN7WebCore19AnimationController17suspendAnimationsEv;
+_ZN7WebCore19AnimationController16resumeAnimationsEv;
 _ZNK7WebCore19InspectorController12getHighlightEPNS_9HighlightE;
 _ZN7WebCore24InspectorInstrumentation26instrumentingAgentsForPageEPNS_4PageE;
 _ZN7WebCore24InspectorInstrumentation17s_frontendCounterE;
index 0ded7a1..dced9f2 100644 (file)
@@ -1,3 +1,35 @@
+2012-05-10  Gyuyoung Kim  <gyuyoung.kim@samsung.com>
+
+        Move resumeAnimations to use Internals interface
+        https://bugs.webkit.org/show_bug.cgi?id=86063
+
+        Reviewed by Alexey Proskuryakov.
+
+        Remove resumeAnimations functions, because it is able to work in the 
+        cross-port way through the Internals interface.
+
+        * DumpRenderTree/LayoutTestController.cpp:
+        (LayoutTestController::staticFunctions):
+        * DumpRenderTree/LayoutTestController.h:
+        (LayoutTestController):
+        * DumpRenderTree/blackberry/LayoutTestControllerBlackBerry.cpp:
+        * DumpRenderTree/chromium/LayoutTestController.cpp:
+        (LayoutTestController::LayoutTestController):
+        * DumpRenderTree/chromium/LayoutTestController.h:
+        (LayoutTestController):
+        * DumpRenderTree/efl/LayoutTestControllerEfl.cpp:
+        * DumpRenderTree/gtk/LayoutTestControllerGtk.cpp:
+        * DumpRenderTree/mac/LayoutTestControllerMac.mm:
+        * DumpRenderTree/qt/LayoutTestControllerQt.cpp:
+        * DumpRenderTree/qt/LayoutTestControllerQt.h:
+        (LayoutTestController):
+        * DumpRenderTree/win/LayoutTestControllerWin.cpp:
+        * DumpRenderTree/wx/LayoutTestControllerWx.cpp:
+        * WebKitTestRunner/InjectedBundle/Bindings/LayoutTestController.idl:
+        * WebKitTestRunner/InjectedBundle/LayoutTestController.cpp:
+        * WebKitTestRunner/InjectedBundle/LayoutTestController.h:
+        (LayoutTestController):
+
 2012-05-10  Alexey Proskuryakov  <ap@apple.com>
 
         Crash in 3rd party WebKit apps that disable cache at a wrong time
index 5378f07..836ddef 100644 (file)
@@ -1861,13 +1861,6 @@ static JSValueRef numberOfActiveAnimationsCallback(JSContextRef context, JSObjec
     return JSValueMakeNumber(context, controller->numberOfActiveAnimations());
 }
 
-static JSValueRef resumeAnimationsCallback(JSContextRef context, JSObjectRef function, JSObjectRef thisObject, size_t argumentCount, const JSValueRef arguments[], JSValueRef* exception)
-{
-    LayoutTestController* controller = static_cast<LayoutTestController*>(JSObjectGetPrivate(thisObject));
-    controller->resumeAnimations();
-    return JSValueMakeUndefined(context);
-}
-
 static JSValueRef waitForPolicyDelegateCallback(JSContextRef context, JSObjectRef, JSObjectRef thisObject, size_t, const JSValueRef[], JSValueRef*)
 {
     LayoutTestController* controller = static_cast<LayoutTestController*>(JSObjectGetPrivate(thisObject));
@@ -2343,7 +2336,6 @@ JSStaticFunction* LayoutTestController::staticFunctions()
         { "markerTextForListItem", markerTextForListItemCallback, kJSPropertyAttributeReadOnly | kJSPropertyAttributeDontDelete },
         { "notifyDone", notifyDoneCallback, kJSPropertyAttributeReadOnly | kJSPropertyAttributeDontDelete },
         { "numberOfActiveAnimations", numberOfActiveAnimationsCallback, kJSPropertyAttributeReadOnly | kJSPropertyAttributeDontDelete },
-        { "resumeAnimations", resumeAnimationsCallback, kJSPropertyAttributeReadOnly | kJSPropertyAttributeDontDelete },
         { "overridePreference", overridePreferenceCallback, kJSPropertyAttributeReadOnly | kJSPropertyAttributeDontDelete },
         { "pageNumberForElementById", pageNumberForElementByIdCallback, kJSPropertyAttributeReadOnly | kJSPropertyAttributeDontDelete },
         { "pageSizeAndMarginsInPixels", pageSizeAndMarginsInPixelsCallback, kJSPropertyAttributeReadOnly | kJSPropertyAttributeDontDelete },
index 38784fd..e3d3182 100644 (file)
@@ -290,7 +290,6 @@ public:
     bool pauseAnimationAtTimeOnElementWithId(JSStringRef animationName, double time, JSStringRef elementId);
     bool pauseTransitionAtTimeOnElementWithId(JSStringRef propertyName, double time, JSStringRef elementId);
     unsigned numberOfActiveAnimations() const;
-    void resumeAnimations() const;
 
     void addOriginAccessWhitelistEntry(JSStringRef sourceOrigin, JSStringRef destinationProtocol, JSStringRef destinationHost, bool allowDestinationSubdomains);
     void removeOriginAccessWhitelistEntry(JSStringRef sourceOrigin, JSStringRef destinationProtocol, JSStringRef destinationHost, bool allowDestinationSubdomains);
index eb86bde..a799b04 100644 (file)
@@ -705,12 +705,6 @@ void LayoutTestController::setViewModeMediaFeature(const JSStringRef mode)
     notImplemented();
 }
 
-void LayoutTestController::resumeAnimations() const
-{
-    if (mainFrame && mainFrame->animation())
-        mainFrame->animation()->resumeAnimations();
-}
-
 void LayoutTestController::setSerializeHTTPLoads(bool)
 {
     // FIXME: Implement if needed for https://bugs.webkit.org/show_bug.cgi?id=50758.
index 933228e..a56f4c3 100644 (file)
@@ -165,7 +165,6 @@ LayoutTestController::LayoutTestController(TestShell* shell)
     bindMethod("removeOriginAccessWhitelistEntry", &LayoutTestController::removeOriginAccessWhitelistEntry);
     bindMethod("repaintSweepHorizontally", &LayoutTestController::repaintSweepHorizontally);
     bindMethod("resetPageVisibility", &LayoutTestController::resetPageVisibility);
-    bindMethod("resumeAnimations", &LayoutTestController::resumeAnimations);
     bindMethod("setAcceptsEditing", &LayoutTestController::setAcceptsEditing);
     bindMethod("setAllowDisplayOfInsecureContent", &LayoutTestController::setAllowDisplayOfInsecureContent);
     bindMethod("setAllowFileAccessFromFileURLs", &LayoutTestController::setAllowFileAccessFromFileURLs);
@@ -1064,19 +1063,6 @@ int LayoutTestController::numberOfActiveAnimations()
     return controller->numberOfActiveAnimations();
 }
 
-void LayoutTestController::resumeAnimations()
-{
-    WebFrame* webFrame = m_shell->webView()->mainFrame();
-    if (!webFrame)
-        return;
-
-    WebAnimationController* controller = webFrame->animationController();
-    if (!controller)
-        return;
-
-    controller->resumeAnimations();
-}
-
 void LayoutTestController::pauseAnimationAtTimeOnElementWithId(const CppArgumentList& arguments, CppVariant* result)
 {
     result->set(false);
@@ -1148,12 +1134,6 @@ void LayoutTestController::numberOfActiveAnimations(const CppArgumentList&, CppV
     result->set(numberOfActiveAnimations());
 }
 
-void LayoutTestController::resumeAnimations(const CppArgumentList&, CppVariant* result)
-{
-    resumeAnimations();
-    result->setNull();
-}
-
 void LayoutTestController::disableImageLoading(const CppArgumentList&, CppVariant* result)
 {
     m_shell->preferences()->loadsImagesAutomatically = false;
index e4931c9..7bdb4e1 100644 (file)
@@ -243,7 +243,6 @@ public:
     void enableAutoResizeMode(const CppArgumentList&, CppVariant*);
     void disableAutoResizeMode(const CppArgumentList&, CppVariant*);
     void numberOfActiveAnimations(const CppArgumentList&, CppVariant*);
-    void resumeAnimations(const CppArgumentList&, CppVariant*);
     void disableImageLoading(const CppArgumentList&, CppVariant*);
     void setIconDatabaseEnabled(const CppArgumentList&, CppVariant*);
     void dumpSelectionRect(const CppArgumentList&, CppVariant*);
@@ -573,7 +572,6 @@ private:
     bool pauseTransitionAtTimeOnElementWithId(const WebKit::WebString& propertyName, double time, const WebKit::WebString& elementId);
     bool elementDoesAutoCompleteForElementWithId(const WebKit::WebString&);
     int numberOfActiveAnimations();
-    void resumeAnimations();
 
     // Used for test timeouts.
     TaskList m_taskList;
index a4532f3..29838bf 100644 (file)
@@ -648,11 +648,6 @@ unsigned LayoutTestController::numberOfActiveAnimations() const
     return DumpRenderTreeSupportEfl::activeAnimationsCount(browser->mainFrame());
 }
 
-void LayoutTestController::resumeAnimations() const
-{
-    DumpRenderTreeSupportEfl::resumeAnimations(browser->mainFrame());
-}
-
 static inline bool toBool(JSStringRef value)
 {
     return equals(value, "true") || equals(value, "1");
index 9f55314..5eb7fbe 100644 (file)
@@ -787,11 +787,6 @@ unsigned LayoutTestController::numberOfActiveAnimations() const
     return DumpRenderTreeSupportGtk::numberOfActiveAnimations(mainFrame);
 }
 
-void LayoutTestController::resumeAnimations() const
-{
-    DumpRenderTreeSupportGtk::resumeAnimations(mainFrame);
-}
-
 static gboolean booleanFromValue(gchar* value)
 {
     return !g_ascii_strcasecmp(value, "true") || !g_ascii_strcasecmp(value, "1");
index 67e7be1..b8356c9 100644 (file)
@@ -844,11 +844,6 @@ unsigned LayoutTestController::numberOfActiveAnimations() const
     return [mainFrame _numberOfActiveAnimations];
 }
 
-void LayoutTestController::resumeAnimations() const
-{
-    return [mainFrame _resumeAnimations];
-}
-
 void LayoutTestController::waitForPolicyDelegate()
 {
     setWaitToDump(true);
index 6b9114b..3e875d1 100644 (file)
@@ -569,13 +569,6 @@ unsigned LayoutTestController::numberOfActiveAnimations() const
     return DumpRenderTreeSupportQt::numberOfActiveAnimations(frame);
 }
 
-void LayoutTestController::resumeAnimations() const
-{
-    QWebFrame* frame = m_drt->webPage()->mainFrame();
-    Q_ASSERT(frame);
-    DumpRenderTreeSupportQt::resumeAnimations(frame);
-}
-
 void LayoutTestController::disableImageLoading()
 {
     m_drt->webPage()->settings()->setAttribute(QWebSettings::AutoLoadImages, false);
index 56a8819..24ab097 100644 (file)
@@ -187,7 +187,6 @@ public slots:
     bool elementDoesAutoCompleteForElementWithId(const QString& elementId);
 
     unsigned numberOfActiveAnimations() const;
-    void resumeAnimations() const;
 
     void addOriginAccessWhitelistEntry(const QString& sourceOrigin, const QString& destinationProtocol, const QString& destinationHost, bool allowDestinationSubdomains);
     void removeOriginAccessWhitelistEntry(const QString& sourceOrigin, const QString& destinationProtocol, const QString& destinationHost, bool allowDestinationSubdomains);
index 67bc4a7..fb237b1 100644 (file)
@@ -1122,15 +1122,6 @@ unsigned LayoutTestController::numberOfActiveAnimations() const
     return number;
 }
 
-void LayoutTestController::resumeAnimations() const
-{
-    COMPtr<IWebFramePrivate> framePrivate(Query, frame);
-    if (!framePrivate)
-        return;
-
-    framePrivate->resumeAnimations();
-}
-
 static _bstr_t bstrT(JSStringRef jsString)
 {
     // The false parameter tells the _bstr_t constructor to adopt the BSTR we pass it.
index 0ab885d..2139e7c 100644 (file)
@@ -313,11 +313,6 @@ unsigned LayoutTestController::numberOfActiveAnimations() const
     return 0;
 }
 
-void LayoutTestController::resumeAnimations() const
-{
-    // FIXME: implement
-}
-
 unsigned LayoutTestController::workerThreadCount() const
 {
     // FIXME: implement
index 0decd1f..c7ac269 100644 (file)
@@ -91,7 +91,6 @@ module WTR {
         boolean pauseAnimationAtTimeOnElementWithId(in DOMString animationName, in double time, in DOMString elementId);
         boolean pauseTransitionAtTimeOnElementWithId(in DOMString propertyName, in double time, in DOMString elementId);
         void suspendAnimations();
-        void resumeAnimations();
 
         // UserContent testing.
         void addUserScript(in DOMString source, in boolean runAtStart, in boolean allFrames);
index 709988b..6b265f3 100644 (file)
@@ -209,12 +209,6 @@ void LayoutTestController::suspendAnimations()
     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());
index d040790..e581cfa 100644 (file)
@@ -114,7 +114,6 @@ public:
     bool pauseAnimationAtTimeOnElementWithId(JSStringRef animationName, double time, JSStringRef elementId);
     bool pauseTransitionAtTimeOnElementWithId(JSStringRef propertyName, double time, JSStringRef elementId);
     void suspendAnimations();
-    void resumeAnimations();
     
     // Compositing testing.
     JSRetainPtr<JSStringRef> layerTreeAsText() const;