From d441d6f39bb846989d95bcf5caf387b42414718d Mon Sep 17 00:00:00 2001 From: Allan Sandfeld Jensen Date: Fri, 13 Sep 2013 12:51:20 +0200 Subject: Import Qt5x2 branch of QtWebkit for Qt 5.2 Importing a new snapshot of webkit. Change-Id: I2d01ad12cdc8af8cb015387641120a9d7ea5f10c Reviewed-by: Allan Sandfeld Jensen --- .../UIProcess/WebFullScreenManagerProxy.cpp | 24 +++++++++++++--------- 1 file changed, 14 insertions(+), 10 deletions(-) (limited to 'Source/WebKit2/UIProcess/WebFullScreenManagerProxy.cpp') 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::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& 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) -- cgit v1.2.1