diff options
| author | Simon Hausmann <simon.hausmann@nokia.com> | 2012-03-12 14:11:15 +0100 |
|---|---|---|
| committer | Simon Hausmann <simon.hausmann@nokia.com> | 2012-03-12 14:11:15 +0100 |
| commit | dd91e772430dc294e3bf478c119ef8d43c0a3358 (patch) | |
| tree | 6f33ce4d5872a5691e0291eb45bf6ab373a5f567 /Source/WebKit2/UIProcess/mac/WKFullScreenWindowController.h | |
| parent | ad0d549d4cc13433f77c1ac8f0ab379c83d93f28 (diff) | |
| download | qtwebkit-dd91e772430dc294e3bf478c119ef8d43c0a3358.tar.gz | |
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.
Diffstat (limited to 'Source/WebKit2/UIProcess/mac/WKFullScreenWindowController.h')
| -rw-r--r-- | Source/WebKit2/UIProcess/mac/WKFullScreenWindowController.h | 21 |
1 files changed, 10 insertions, 11 deletions
diff --git a/Source/WebKit2/UIProcess/mac/WKFullScreenWindowController.h b/Source/WebKit2/UIProcess/mac/WKFullScreenWindowController.h index 74e794704..4e9cbf08b 100644 --- a/Source/WebKit2/UIProcess/mac/WKFullScreenWindowController.h +++ b/Source/WebKit2/UIProcess/mac/WKFullScreenWindowController.h @@ -38,19 +38,23 @@ class IntRect; } @class WKView; +@class WebWindowScaleAnimation; +@class WebWindowFadeAnimation; @interface WKFullScreenWindowController : NSWindowController { @private WKView *_webView; - RetainPtr<NSView> _webViewPlaceholder; - RetainPtr<NSView> _layerHostingView; + RetainPtr<NSImageView> _webViewPlaceholder; + RetainPtr<WebWindowScaleAnimation> _scaleAnimation; + RetainPtr<WebWindowFadeAnimation> _fadeAnimation; + RetainPtr<NSWindow> _backgroundWindow; + NSRect _initialFrame; + NSRect _finalFrame; BOOL _isEnteringFullScreen; BOOL _isExitingFullScreen; BOOL _isFullScreen; - BOOL _forceDisableAnimation; BOOL _isPlaying; - OwnPtr<WebCore::DisplaySleepDisabler> _displaySleepDisabler; } - (WKView*)webView; @@ -58,14 +62,9 @@ class IntRect; - (void)enterFullScreen:(NSScreen *)screen; - (void)exitFullScreen; -- (void)beganEnterFullScreenAnimation; -- (void)beganExitFullScreenAnimation; -- (void)finishedEnterFullScreenAnimation:(bool)completed; -- (void)finishedExitFullScreenAnimation:(bool)completed; -- (void)enterAcceleratedCompositingMode:(const WebKit::LayerTreeContext&)context; -- (void)exitAcceleratedCompositingMode; -- (WebCore::IntRect)getFullScreenRect; - (void)close; +- (void)beganEnterFullScreenWithInitialFrame:(const WebCore::IntRect&)initialFrame finalFrame:(const WebCore::IntRect&)finalFrame; +- (void)beganExitFullScreenWithInitialFrame:(const WebCore::IntRect&)initialFrame finalFrame:(const WebCore::IntRect&)finalFrame; @end |