Changeset 160321 in webkit

Timestamp:

Dec 9, 2013 11:30:40 AM (10 years ago)

Author:

ryuan.choi@samsung.com

Message:

[EFL][WK2] LayoutTests are broken after r160301
​https://bugs.webkit.org/show_bug.cgi?id=125447

Reviewed by Darin Adler.

r160301 moved FullScreenManagerProxyClient logic to WebViewEfl, child class
of CoordinatedGraphics::WebView, because implementations are EFL specific.
However, CoordinatedGraphics::WebView creates WebPageProxy in constructor and
WebPageProxy requires FullScreenManagerProxyClient in constructor.
So, All WK2/Efl based applications got crashed

This patch adds virtual methods for FullScreenManagerProxyClient to CoordinatedGraphics::WebView
so that WebPageProxy can get FullScreenManagerProxyClient instance without
pure viertual methods.

• UIProcess/API/C/CoordinatedGraphics/WKView.cpp:

(WKViewExitFullScreen):

• UIProcess/CoordinatedGraphics/WebView.cpp:

(WebKit::WebView::fullScreenManagerProxyClient):
(WebKit::WebView::requestExitFullScreen):
renamed from exitFullScreen not to conflict with methods of FullScreenManagerProxyClient.

• UIProcess/CoordinatedGraphics/WebView.h:
• UIProcess/efl/WebViewEfl.cpp:
• UIProcess/efl/WebViewEfl.h:

Location:

trunk/Source/WebKit2

Files:

• ChangeLog (modified) (1 diff)
• UIProcess/API/C/CoordinatedGraphics/WKView.cpp (modified) (1 diff)
• UIProcess/CoordinatedGraphics/WebView.cpp (modified) (1 diff)
• UIProcess/CoordinatedGraphics/WebView.h (modified) (4 diffs)
• UIProcess/efl/WebViewEfl.cpp (modified) (1 diff)
• UIProcess/efl/WebViewEfl.h (modified) (3 diffs)

trunk/Source/WebKit2/ChangeLog

@@ +1 @@
+2013-12-09  Ryuan Choi  <ryuan.choi@samsung.com>
+
+        [EFL][WK2] LayoutTests are broken after r160301
+        https://bugs.webkit.org/show_bug.cgi?id=125447
+
+        Reviewed by Darin Adler.
+
+        r160301 moved FullScreenManagerProxyClient logic to WebViewEfl, child class
+        of CoordinatedGraphics::WebView, because implementations are EFL specific.
+        However, CoordinatedGraphics::WebView creates WebPageProxy in constructor and
+        WebPageProxy requires FullScreenManagerProxyClient in constructor.
+        So, All WK2/Efl based applications got crashed
+
+        This patch adds virtual methods for FullScreenManagerProxyClient to CoordinatedGraphics::WebView
+        so that WebPageProxy can get FullScreenManagerProxyClient instance without
+        pure viertual methods.
+
+        * UIProcess/API/C/CoordinatedGraphics/WKView.cpp:
+        (WKViewExitFullScreen):
+        * UIProcess/CoordinatedGraphics/WebView.cpp:
+        (WebKit::WebView::fullScreenManagerProxyClient):
+        (WebKit::WebView::requestExitFullScreen):
+        renamed from exitFullScreen not to conflict with methods of FullScreenManagerProxyClient.
+        * UIProcess/CoordinatedGraphics/WebView.h:
+        * UIProcess/efl/WebViewEfl.cpp:
+        * UIProcess/efl/WebViewEfl.h:
+
 2013-12-09  Sergio Villar Senin  <svillar@igalia.com>
 

trunk/Source/WebKit2/UIProcess/API/C/CoordinatedGraphics/WKView.cpp

@@ -183 +183 @@
 {
 #if ENABLE(FULLSCREEN_API)
-    return toImpl(viewRef)->exitFullScreen();
+    return toImpl(viewRef)->requestExitFullScreen();
 #else
     UNUSED_PARAM(viewRef);

trunk/Source/WebKit2/UIProcess/CoordinatedGraphics/WebView.cpp

@@ -195 +195 @@
 
 #if ENABLE(FULLSCREEN_API)
-bool WebView::exitFullScreen()
-{
-#if PLATFORM(EFL)
-    // FIXME: Implement this for other platforms.
-    if (!m_page->fullScreenManager()->isFullScreen())
+WebFullScreenManagerProxyClient& WebView::fullScreenManagerProxyClient()
+{
+    return *this;
+}
+
+bool WebView::requestExitFullScreen()
+{
+    if (!isFullScreen())
         return false;
-#endif
+
     m_page->fullScreenManager()->requestExitFullScreen();
     return true;

trunk/Source/WebKit2/UIProcess/CoordinatedGraphics/WebView.h

@@ -34 +34 @@
 #include "PageClient.h"
 #include "WebContext.h"
+#include "WebFullScreenManagerProxy.h"
 #include "WebGeometry.h"
 #include "WebPageGroup.h"
@@ -47 +48 @@
 namespace WebKit {
 
-class WebView : public API::TypedObject<API::Object::Type::View>, public PageClient {
+class WebView : public API::TypedObject<API::Object::Type::View>, public PageClient
+#if ENABLE(FULLSCREEN_API)
+    , public WebFullScreenManagerProxyClient
+#endif
+    {
 public:
     virtual ~WebView();
@@ -94 +99 @@
 
 #if ENABLE(FULLSCREEN_API)
-    bool exitFullScreen();
+    bool requestExitFullScreen();
 #endif
 
@@ -189 +194 @@
     virtual void exitAcceleratedCompositingMode() OVERRIDE;
     virtual void updateAcceleratedCompositingMode(const LayerTreeContext&) OVERRIDE;
+
+#if ENABLE(FULLSCREEN_API)
+    WebFullScreenManagerProxyClient& fullScreenManagerProxyClient() OVERRIDE;
+
+    // WebFullScreenManagerProxyClient
+    virtual void closeFullScreenManager() OVERRIDE { }
+    virtual bool isFullScreen() OVERRIDE { return false; }
+    virtual void enterFullScreen() OVERRIDE { }
+    virtual void exitFullScreen() OVERRIDE { }
+    virtual void beganEnterFullScreen(const WebCore::IntRect&, const WebCore::IntRect&) OVERRIDE { }
+    virtual void beganExitFullScreen(const WebCore::IntRect&, const WebCore::IntRect&) OVERRIDE { }
+#endif
 
 protected:

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

@@ -143 +143 @@
 #if ENABLE(FULLSCREEN_API)
 
-WebFullScreenManagerProxyClient& WebViewEfl::fullScreenManagerProxyClient()
-{
-    return *this;
-}
-
 // WebFullScreenManagerProxyClient
 bool WebViewEfl::isFullScreen()

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

@@ -27 +27 @@
 #define WebViewEfl_h
 
-#include "WebFullScreenManagerProxy.h"
 #include "WebView.h"
 
@@ -39 +38 @@
 
 class WebViewEfl : public WebView
-#if ENABLE(FULLSCREEN_API)
-    , public WebFullScreenManagerProxyClient
-#endif
     {
 public:
@@ -67 +63 @@
 
 #if ENABLE(FULLSCREEN_API)
-    WebFullScreenManagerProxyClient& fullScreenManagerProxyClient() OVERRIDE;
-#endif
-
-#if ENABLE(FULLSCREEN_API)
     // WebFullScreenManagerProxyClient
     virtual void closeFullScreenManager() OVERRIDE FINAL { }