diff options
author | Allan Sandfeld Jensen <allan.jensen@digia.com> | 2013-09-13 12:51:20 +0200 |
---|---|---|
committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-09-19 20:50:05 +0200 |
commit | d441d6f39bb846989d95bcf5caf387b42414718d (patch) | |
tree | e367e64a75991c554930278175d403c072de6bb8 /Source/WebKit2/UIProcess/WebFullScreenManagerProxy.cpp | |
parent | 0060b2994c07842f4c59de64b5e3e430525c4b90 (diff) | |
download | qtwebkit-d441d6f39bb846989d95bcf5caf387b42414718d.tar.gz |
Import Qt5x2 branch of QtWebkit for Qt 5.2
Importing a new snapshot of webkit.
Change-Id: I2d01ad12cdc8af8cb015387641120a9d7ea5f10c
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@digia.com>
Diffstat (limited to 'Source/WebKit2/UIProcess/WebFullScreenManagerProxy.cpp')
-rw-r--r-- | Source/WebKit2/UIProcess/WebFullScreenManagerProxy.cpp | 24 |
1 files changed, 14 insertions, 10 deletions
diff --git a/Source/WebKit2/UIProcess/WebFullScreenManagerProxy.cpp b/Source/WebKit2/UIProcess/WebFullScreenManagerProxy.cpp index e49ad86ef..58fbb5973 100644 --- a/Source/WebKit2/UIProcess/WebFullScreenManagerProxy.cpp +++ b/Source/WebKit2/UIProcess/WebFullScreenManagerProxy.cpp @@ -42,7 +42,11 @@ PassRefPtr<WebFullScreenManagerProxy> WebFullScreenManagerProxy::create(WebPageP WebFullScreenManagerProxy::WebFullScreenManagerProxy(WebPageProxy* page) : m_page(page) , m_webView(0) +#if PLATFORM(EFL) + , m_hasRequestedFullScreen(false) +#endif { + m_page->process()->addMessageReceiver(Messages::WebFullScreenManagerProxy::messageReceiverName(), m_page->pageID(), this); } WebFullScreenManagerProxy::~WebFullScreenManagerProxy() @@ -54,16 +58,6 @@ void WebFullScreenManagerProxy::setWebView(PlatformWebView* webView) m_webView = webView; } -void WebFullScreenManagerProxy::didReceiveMessage(CoreIPC::Connection* connection, CoreIPC::MessageID messageID, CoreIPC::MessageDecoder& decoder) -{ - didReceiveWebFullScreenManagerProxyMessage(connection, messageID, decoder); -} - -void WebFullScreenManagerProxy::didReceiveSyncMessage(CoreIPC::Connection* connection, CoreIPC::MessageID messageID, CoreIPC::MessageDecoder& decoder, OwnPtr<CoreIPC::MessageEncoder>& replyEncoder) -{ - didReceiveSyncWebFullScreenManagerProxyMessage(connection, messageID, decoder, replyEncoder); -} - void WebFullScreenManagerProxy::willEnterFullScreen() { m_page->process()->send(Messages::WebFullScreenManager::WillEnterFullScreen(), m_page->pageID()); @@ -99,6 +93,16 @@ void WebFullScreenManagerProxy::supportsFullScreen(bool withKeyboard, bool& supp supports = !withKeyboard; } +void WebFullScreenManagerProxy::saveScrollPosition() +{ + m_page->process()->send(Messages::WebFullScreenManager::SaveScrollPosition(), m_page->pageID()); +} + +void WebFullScreenManagerProxy::restoreScrollPosition() +{ + m_page->process()->send(Messages::WebFullScreenManager::RestoreScrollPosition(), m_page->pageID()); +} + } // namespace WebKit #endif // ENABLE(FULLSCREEN_API) |