diff options
Diffstat (limited to 'Source/WebKit2')
5 files changed, 12 insertions, 98 deletions
diff --git a/Source/WebKit2/UIProcess/API/qt/qwebpreferences.cpp b/Source/WebKit2/UIProcess/API/qt/qwebpreferences.cpp index a056173e8..c781a97ca 100644 --- a/Source/WebKit2/UIProcess/API/qt/qwebpreferences.cpp +++ b/Source/WebKit2/UIProcess/API/qt/qwebpreferences.cpp @@ -66,10 +66,6 @@ bool QWebPreferencesPrivate::testAttribute(QWebPreferencesPrivate::WebAttribute #if ENABLE(WEBGL) case WebGLEnabled: return WKPreferencesGetWebGLEnabled(preferencesRef); -#if ENABLE(CSS_SHADERS) - case CSSCustomFilterEnabled: - return WKPreferencesGetCSSCustomFilterEnabled(preferencesRef); -#endif #endif #if ENABLE(WEB_AUDIO) case WebAudioEnabled: @@ -135,11 +131,6 @@ void QWebPreferencesPrivate::setAttribute(QWebPreferencesPrivate::WebAttribute a case WebGLEnabled: WKPreferencesSetWebGLEnabled(preferencesRef, enable); break; -#if ENABLE(CSS_SHADERS) - case CSSCustomFilterEnabled: - WKPreferencesSetCSSCustomFilterEnabled(preferencesRef, enable); - break; -#endif #endif #if ENABLE(WEB_AUDIO) case WebAudioEnabled: diff --git a/Source/WebKit2/UIProcess/API/qt/qwebpreferences_p_p.h b/Source/WebKit2/UIProcess/API/qt/qwebpreferences_p_p.h index f978a5bd2..2b4c804ff 100644 --- a/Source/WebKit2/UIProcess/API/qt/qwebpreferences_p_p.h +++ b/Source/WebKit2/UIProcess/API/qt/qwebpreferences_p_p.h @@ -38,7 +38,6 @@ public: DnsPrefetchEnabled, DeveloperExtrasEnabled, WebGLEnabled, - CSSCustomFilterEnabled, WebAudioEnabled, CaretBrowsingEnabled, NotificationsEnabled, diff --git a/Source/WebKit2/UIProcess/qt/QtPageClient.cpp b/Source/WebKit2/UIProcess/qt/QtPageClient.cpp index 5f62dc600..53faa7647 100644 --- a/Source/WebKit2/UIProcess/qt/QtPageClient.cpp +++ b/Source/WebKit2/UIProcess/qt/QtPageClient.cpp @@ -288,12 +288,21 @@ bool QtPageClient::isFullScreen() void QtPageClient::enterFullScreen() { - notImplemented(); + if (!m_webView) + return; + + WebFullScreenManagerProxy* manager = m_eventHandler->webPageProxy()->fullScreenManager(); + manager->willEnterFullScreen(); + emit m_webView->experimental()->enterFullScreenRequested(); + manager->didEnterFullScreen(); } void QtPageClient::exitFullScreen() { - notImplemented(); + WebFullScreenManagerProxy* manager = m_eventHandler->webPageProxy()->fullScreenManager(); + manager->willExitFullScreen(); + emit m_webView->experimental()->exitFullScreenRequested(); + manager->didExitFullScreen(); } void QtPageClient::beganEnterFullScreen(const IntRect& initialFrame, const IntRect& finalFrame) diff --git a/Source/WebKit2/UIProcess/qt/QtWebPageEventHandler.h b/Source/WebKit2/UIProcess/qt/QtWebPageEventHandler.h index 2fe82e8e0..32c7f3f0d 100644 --- a/Source/WebKit2/UIProcess/qt/QtWebPageEventHandler.h +++ b/Source/WebKit2/UIProcess/qt/QtWebPageEventHandler.h @@ -93,6 +93,7 @@ public: void resetGestureRecognizers(); PageViewportControllerClientQt* viewportController() { return m_viewportController; } + WebPageProxy* webPageProxy() { return m_webPageProxy; } void startDrag(const WebCore::DragData&, PassRefPtr<ShareableBitmap> dragImage); diff --git a/Source/WebKit2/UIProcess/qt/WebFullScreenManagerProxyQt.cpp b/Source/WebKit2/UIProcess/qt/WebFullScreenManagerProxyQt.cpp deleted file mode 100644 index 2b97dc722..000000000 --- a/Source/WebKit2/UIProcess/qt/WebFullScreenManagerProxyQt.cpp +++ /dev/null @@ -1,86 +0,0 @@ -/* - * Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies) - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Library General Public - * License as published by the Free Software Foundation; either - * version 2 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Library General Public License for more details. - * - * You should have received a copy of the GNU Library General Public License - * along with this library; see the file COPYING.LIB. If not, write to - * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - * Boston, MA 02110-1301, USA. - */ - -#include "config.h" -#include "WebFullScreenManagerProxy.h" - -#if ENABLE(FULLSCREEN_API) - -#include "WebContext.h" -#include "WebFullScreenManagerMessages.h" -#include "WebFullScreenManagerProxyMessages.h" -#include <WebCore/NotImplemented.h> - -#if HAVE(QTQUICK) -#include "qquickwebview_p.h" -#endif - -using namespace WebCore; - -namespace WebKit { - -void WebFullScreenManagerProxy::invalidate() -{ -#if HAVE(QTQUICK) - m_webView = 0; -#endif -} - -void WebFullScreenManagerProxy::close() -{ - notImplemented(); -} - -bool WebFullScreenManagerProxy::isFullScreen() -{ - notImplemented(); - return false; -} - -void WebFullScreenManagerProxy::enterFullScreen() -{ - willEnterFullScreen(); -#if HAVE(QTQUICK) - emit m_webView->experimental()->enterFullScreenRequested(); -#endif - didEnterFullScreen(); -} - -void WebFullScreenManagerProxy::exitFullScreen() -{ - willExitFullScreen(); -#if HAVE(QTQUICK) - emit m_webView->experimental()->exitFullScreenRequested(); -#endif - didExitFullScreen(); -} - -void WebFullScreenManagerProxy::beganEnterFullScreen(const IntRect& initialFrame, const IntRect& finalFrame) -{ - notImplemented(); -} - -void WebFullScreenManagerProxy::beganExitFullScreen(const IntRect& initialFrame, const IntRect& finalFrame) -{ - notImplemented(); -} - -} // namespace WebKit - -#endif // ENABLE(FULLSCREEN_API) |