Title: [114397] trunk/Source/WebKit2
- Revision
- 114397
- Author
- commit-qu...@webkit.org
- Date
- 2012-04-17 11:01:42 -0700 (Tue, 17 Apr 2012)
Log Message
[EFL][WK2] Fix build break when FULLSCREEN_API is enabled.
https://bugs.webkit.org/show_bug.cgi?id=84142
Patch by Michał Pakuła vel Rutka <m.pak...@samsung.com> on 2012-04-17
Reviewed by Martin Robinson.
Create a cpp file needed to build EFL port with FULLSCREEN_API.
* PlatformEfl.cmake: Added WebFullScreenManagerProxyEfl.cpp to build list.
* UIProcess/WebFullScreenManagerProxy.h:
(WebKit):
* UIProcess/efl/WebFullScreenManagerProxyEfl.cpp: Added.
(WebKit):
(WebKit::WebFullScreenManagerProxy::invalidate):
(WebKit::WebFullScreenManagerProxy::close):
(WebKit::WebFullScreenManagerProxy::isFullScreen):
(WebKit::WebFullScreenManagerProxy::enterFullScreen):
(WebKit::WebFullScreenManagerProxy::exitFullScreen):
(WebKit::WebFullScreenManagerProxy::beganEnterFullScreen):
(WebKit::WebFullScreenManagerProxy::beganExitFullScreen):
Modified Paths
Added Paths
Diff
Modified: trunk/Source/WebKit2/ChangeLog (114396 => 114397)
--- trunk/Source/WebKit2/ChangeLog 2012-04-17 17:59:18 UTC (rev 114396)
+++ trunk/Source/WebKit2/ChangeLog 2012-04-17 18:01:42 UTC (rev 114397)
@@ -1,3 +1,25 @@
+2012-04-17 Michał Pakuła vel Rutka <m.pak...@samsung.com>
+
+ [EFL][WK2] Fix build break when FULLSCREEN_API is enabled.
+ https://bugs.webkit.org/show_bug.cgi?id=84142
+
+ Reviewed by Martin Robinson.
+
+ Create a cpp file needed to build EFL port with FULLSCREEN_API.
+
+ * PlatformEfl.cmake: Added WebFullScreenManagerProxyEfl.cpp to build list.
+ * UIProcess/WebFullScreenManagerProxy.h:
+ (WebKit):
+ * UIProcess/efl/WebFullScreenManagerProxyEfl.cpp: Added.
+ (WebKit):
+ (WebKit::WebFullScreenManagerProxy::invalidate):
+ (WebKit::WebFullScreenManagerProxy::close):
+ (WebKit::WebFullScreenManagerProxy::isFullScreen):
+ (WebKit::WebFullScreenManagerProxy::enterFullScreen):
+ (WebKit::WebFullScreenManagerProxy::exitFullScreen):
+ (WebKit::WebFullScreenManagerProxy::beganEnterFullScreen):
+ (WebKit::WebFullScreenManagerProxy::beganExitFullScreen):
+
2012-04-17 Andras Becsi <andras.be...@nokia.com>
[Qt][WK2] Refactor the gesture recognizers
Modified: trunk/Source/WebKit2/PlatformEfl.cmake (114396 => 114397)
--- trunk/Source/WebKit2/PlatformEfl.cmake 2012-04-17 17:59:18 UTC (rev 114396)
+++ trunk/Source/WebKit2/PlatformEfl.cmake 2012-04-17 18:01:42 UTC (rev 114397)
@@ -31,6 +31,7 @@
UIProcess/efl/TextCheckerEfl.cpp
UIProcess/efl/WebContextEfl.cpp
+ UIProcess/efl/WebFullScreenManagerProxyEfl.cpp
UIProcess/efl/WebInspectorEfl.cpp
UIProcess/efl/WebPageProxyEfl.cpp
UIProcess/efl/WebPreferencesEfl.cpp
Modified: trunk/Source/WebKit2/UIProcess/WebFullScreenManagerProxy.h (114396 => 114397)
--- trunk/Source/WebKit2/UIProcess/WebFullScreenManagerProxy.h 2012-04-17 17:59:18 UTC (rev 114396)
+++ trunk/Source/WebKit2/UIProcess/WebFullScreenManagerProxy.h 2012-04-17 18:01:42 UTC (rev 114397)
@@ -60,6 +60,8 @@
typedef QObject PlatformWebView;
#elif PLATFORM(GTK)
typedef WebKitWebViewBase PlatformWebView;
+#elif PLATFORM(EFL)
+typedef Evas_Object PlatformWebView;
#endif
class WebPageProxy;
Added: trunk/Source/WebKit2/UIProcess/efl/WebFullScreenManagerProxyEfl.cpp (0 => 114397)
--- trunk/Source/WebKit2/UIProcess/efl/WebFullScreenManagerProxyEfl.cpp (rev 0)
+++ trunk/Source/WebKit2/UIProcess/efl/WebFullScreenManagerProxyEfl.cpp 2012-04-17 18:01:42 UTC (rev 114397)
@@ -0,0 +1,75 @@
+/*
+ * Copyright (C) 2012 Samsung Electronics
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
+ * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR
+ * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+ * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+ * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+ * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
+ * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+ * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#include "config.h"
+#include "WebFullScreenManagerProxy.h"
+
+#if ENABLE(FULLSCREEN_API)
+
+#include <WebCore/NotImplemented.h>
+
+using namespace WebCore;
+
+namespace WebKit {
+
+void WebFullScreenManagerProxy::invalidate()
+{
+ m_webView = 0;
+}
+
+void WebFullScreenManagerProxy::close()
+{
+ notImplemented();
+}
+
+bool WebFullScreenManagerProxy::isFullScreen()
+{
+ notImplemented();
+ return false;
+}
+
+void WebFullScreenManagerProxy::enterFullScreen()
+{
+ notImplemented();
+}
+
+void WebFullScreenManagerProxy::exitFullScreen()
+{
+ notImplemented();
+}
+
+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)
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
