From dd91e772430dc294e3bf478c119ef8d43c0a3358 Mon Sep 17 00:00:00 2001 From: Simon Hausmann Date: Mon, 12 Mar 2012 14:11:15 +0100 Subject: Imported WebKit commit 3db4eb1820ac8fb03065d7ea73a4d9db1e8fea1a (http://svn.webkit.org/repository/webkit/trunk@110422) This includes build fixes for the latest qtbase/qtdeclarative as well as the final QML2 API. --- Source/WebKit2/WebProcess/FullScreen/WebFullScreenManager.h | 11 ++--------- 1 file changed, 2 insertions(+), 9 deletions(-) (limited to 'Source/WebKit2/WebProcess/FullScreen/WebFullScreenManager.h') diff --git a/Source/WebKit2/WebProcess/FullScreen/WebFullScreenManager.h b/Source/WebKit2/WebProcess/FullScreen/WebFullScreenManager.h index a2b992f8f..9724d55e5 100644 --- a/Source/WebKit2/WebProcess/FullScreen/WebFullScreenManager.h +++ b/Source/WebKit2/WebProcess/FullScreen/WebFullScreenManager.h @@ -57,11 +57,6 @@ public: bool supportsFullScreen(bool withKeyboard); void enterFullScreenForElement(WebCore::Element*); void exitFullScreenForElement(WebCore::Element*); - void beganEnterFullScreenAnimation(); - void finishedEnterFullScreenAnimation(bool completed); - void beganExitFullScreenAnimation(); - void finishedExitFullScreenAnimation(bool completed); - virtual void setRootFullScreenLayer(WebCore::GraphicsLayer*) = 0; void willEnterFullScreen(); void didEnterFullScreen(); @@ -73,14 +68,12 @@ public: protected: WebFullScreenManager(WebPage*); - virtual void beginEnterFullScreenAnimation(float duration) = 0; - virtual void beginExitFullScreenAnimation(float duration) = 0; - virtual void disposeOfLayerClient() { } - WebCore::IntRect getFullScreenRect(); + void setAnimatingFullScreen(bool); void didReceiveWebFullScreenManagerMessage(CoreIPC::Connection*, CoreIPC::MessageID, CoreIPC::ArgumentDecoder*); WebCore::IntRect m_initialFrame; + WebCore::IntRect m_finalFrame; RefPtr m_page; RefPtr m_element; }; -- cgit v1.2.1