Changeset 160301 in webkit

Timestamp:

Dec 8, 2013 11:46:56 PM (10 years ago)

Author:

ryuan.choi@samsung.com

Message:

[EFL][WK2] Move FullScreenManager logic to WebViewEfl
​https://bugs.webkit.org/show_bug.cgi?id=125438

Reviewed by Gyuyoung Kim.

This patch fixed build break on EFL port Since r160296.

• PlatformEfl.cmake: Removed WebFullScreenManagerProxyEfl.cpp.
• UIProcess/WebFullScreenManagerProxy.cpp: Removed EFL specific code.

(WebKit::WebFullScreenManagerProxy::WebFullScreenManagerProxy):

• UIProcess/WebFullScreenManagerProxy.h: Ditto.
• UIProcess/efl/WebFullScreenManagerProxyEfl.cpp: Removed file and moved logic to WebViewEfl.
• UIProcess/efl/WebViewEfl.cpp:

(WebKit::WebViewEfl::WebViewEfl):
(WebKit::WebViewEfl::setEwkView): Removed call to setWebView().
(WebKit::WebViewEfl::fullScreenManagerProxyClient):
(WebKit::WebViewEfl::isFullScreen):
(WebKit::WebViewEfl::enterFullScreen):
(WebKit::WebViewEfl::exitFullScreen):

• UIProcess/efl/WebViewEfl.h:

Location:

trunk/Source/WebKit2

Files:

• ChangeLog (modified) (1 diff)
• PlatformEfl.cmake (modified) (1 diff)
• UIProcess/WebFullScreenManagerProxy.cpp (modified) (1 diff)
• UIProcess/WebFullScreenManagerProxy.h (modified) (1 diff)
• UIProcess/efl/WebFullScreenManagerProxyEfl.cpp (deleted)
• UIProcess/efl/WebViewEfl.cpp (modified) (3 diffs)
• UIProcess/efl/WebViewEfl.h (modified) (3 diffs)

trunk/Source/WebKit2/ChangeLog

@@ +1 @@
+2013-12-08  Ryuan Choi  <ryuan.choi@samsung.com>
+
+        [EFL][WK2] Move FullScreenManager logic to WebViewEfl
+        https://bugs.webkit.org/show_bug.cgi?id=125438
+
+        Reviewed by Gyuyoung Kim.
+
+        This patch fixed build break on EFL port Since r160296.
+
+        * PlatformEfl.cmake: Removed WebFullScreenManagerProxyEfl.cpp.
+        * UIProcess/WebFullScreenManagerProxy.cpp: Removed EFL specific code.
+        (WebKit::WebFullScreenManagerProxy::WebFullScreenManagerProxy):
+        * UIProcess/WebFullScreenManagerProxy.h: Ditto.
+        * UIProcess/efl/WebFullScreenManagerProxyEfl.cpp: Removed file and moved logic to WebViewEfl.
+        * UIProcess/efl/WebViewEfl.cpp:
+        (WebKit::WebViewEfl::WebViewEfl):
+        (WebKit::WebViewEfl::setEwkView): Removed call to setWebView().
+        (WebKit::WebViewEfl::fullScreenManagerProxyClient):
+        (WebKit::WebViewEfl::isFullScreen):
+        (WebKit::WebViewEfl::enterFullScreen):
+        (WebKit::WebViewEfl::exitFullScreen):
+        * UIProcess/efl/WebViewEfl.h:
+
 2013-12-08  Sam Weinig  <sam@webkit.org>
 

trunk/Source/WebKit2/PlatformEfl.cmake

@@ -148 +148 @@
     UIProcess/efl/WebContextEfl.cpp
     UIProcess/efl/WebContextMenuProxyEfl.cpp
-    UIProcess/efl/WebFullScreenManagerProxyEfl.cpp
     UIProcess/efl/WebInspectorProxyEfl.cpp
     UIProcess/efl/WebPageProxyEfl.cpp

trunk/Source/WebKit2/UIProcess/WebFullScreenManagerProxy.cpp

@@ -47 +47 @@
     : m_page(&page)
     , m_client(&client)
-#if PLATFORM(EFL)
-    , m_hasRequestedFullScreen(false)
-#endif
 {
     m_page->process().addMessageReceiver(Messages::WebFullScreenManagerProxy::messageReceiverName(), m_page->pageID(), this);

trunk/Source/WebKit2/UIProcess/WebFullScreenManagerProxy.h

@@ -87 +87 @@
     WebPageProxy* m_page;
     WebFullScreenManagerProxyClient* m_client;
-
-#if PLATFORM(EFL)
-    bool m_hasRequestedFullScreen;
-#endif
 };
 

trunk/Source/WebKit2/UIProcess/efl/WebViewEfl.cpp

@@ -58 +58 @@
     : WebView(context, pageGroup)
     , m_ewkView(0)
+    , m_hasRequestedFullScreen(false)
 {
 }
@@ -64 +65 @@
 {
     m_ewkView = ewkView;
-
-#if ENABLE(FULLSCREEN_API)
-    m_page->fullScreenManager()->setWebView(ewkView->evasObject());
-#endif
 }
 
@@ -144 +141 @@
 }
 
+#if ENABLE(FULLSCREEN_API)
+
+WebFullScreenManagerProxyClient& WebViewEfl::fullScreenManagerProxyClient()
+{
+    return *this;
+}
+
+// WebFullScreenManagerProxyClient
+bool WebViewEfl::isFullScreen()
+{
+    return m_hasRequestedFullScreen;
+}
+
+void WebViewEfl::enterFullScreen()
+{
+    if (!m_ewkView || m_hasRequestedFullScreen)
+        return;
+
+    m_hasRequestedFullScreen = true;
+
+    WebFullScreenManagerProxy* manager = m_page->fullScreenManager();
+    manager->willEnterFullScreen();
+    m_ewkView->enterFullScreen();
+    manager->didEnterFullScreen();
+}
+
+void WebViewEfl::exitFullScreen()
+{
+    if (!m_ewkView || !m_hasRequestedFullScreen)
+        return;
+
+    m_hasRequestedFullScreen = false;
+
+    WebFullScreenManagerProxy* manager = m_page->fullScreenManager();
+    manager->willExitFullScreen();
+    m_ewkView->exitFullScreen();
+    manager->didExitFullScreen();
+}
+
+#endif // ENABLE(FULLSCREEN_API)
+
 } // namespace WebKit

trunk/Source/WebKit2/UIProcess/efl/WebViewEfl.h

@@ -27 +27 @@
 #define WebViewEfl_h
 
+#include "WebFullScreenManagerProxy.h"
 #include "WebView.h"
 
@@ -37 +38 @@
 #endif
 
-class WebViewEfl : public WebView {
+class WebViewEfl : public WebView
+#if ENABLE(FULLSCREEN_API)
+    , public WebFullScreenManagerProxyClient
+#endif
+    {
 public:
     void setEwkView(EwkView*);
@@ -61 +66 @@
     void handleDownloadRequest(DownloadProxy*) OVERRIDE;
 
+#if ENABLE(FULLSCREEN_API)
+    WebFullScreenManagerProxyClient& fullScreenManagerProxyClient() OVERRIDE;
+#endif
+
+#if ENABLE(FULLSCREEN_API)
+    // WebFullScreenManagerProxyClient
+    virtual void closeFullScreenManager() OVERRIDE FINAL { }
+    virtual bool isFullScreen() OVERRIDE FINAL;
+    virtual void enterFullScreen() OVERRIDE FINAL;
+    virtual void exitFullScreen() OVERRIDE FINAL;
+    virtual void beganEnterFullScreen(const WebCore::IntRect&, const WebCore::IntRect&) OVERRIDE FINAL { }
+    virtual void beganExitFullScreen(const WebCore::IntRect&, const WebCore::IntRect&) OVERRIDE FINAL { }
+#endif
+
 private:
     EwkView* m_ewkView;
+    bool m_hasRequestedFullScreen;
 
     friend class WebView;