Changeset 147723 in webkit

Timestamp:

Apr 5, 2013 1:20:10 AM (11 years ago)

Author:

mikhail.pozdnyakov@intel.com

Message:

[WK2][EFL] Encapsulate view states set-up within WebView
​https://bugs.webkit.org/show_bug.cgi?id=110877

Reviewed by Benjamin Poulain.

View states set-up is encapsulated within WebView. This change
reduces both usage of EwkView inside WebView class and usage of
WebPageProxy inside EwkView class.

New WKView API was added so that EwkView can define whether or not
the view is visible and focused.

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

(WKViewIsFocused):
(WKViewSetIsFocused):
(WKViewIsVisible):
(WKViewSetIsVisible):

• UIProcess/API/C/efl/WKView.h:
• UIProcess/API/efl/EwkView.cpp:

(::handleEvent):
(EwkView::handleEvasObjectShow):
(EwkView::handleEwkViewFocusIn):
(EwkView::handleEwkViewFocusOut):

• UIProcess/API/efl/EwkView.h:
• UIProcess/efl/WebView.cpp:

(WebKit::WebView::WebView):
(WebKit::WebView::setFocused):
(WebKit):
(WebKit::WebView::setVisible):
(WebKit::WebView::isViewFocused):
(WebKit::WebView::isViewVisible):

• UIProcess/efl/WebView.h:

(WebKit::WebView::isFocused):
(WebView):
(WebKit::WebView::isVisible):

Location:

trunk/Source/WebKit2

Files:

• ChangeLog (modified) (1 diff)
• UIProcess/API/C/efl/WKView.cpp (modified) (1 diff)
• UIProcess/API/C/efl/WKView.h (modified) (1 diff)
• UIProcess/API/efl/EwkView.cpp (modified) (5 diffs)
• UIProcess/API/efl/EwkView.h (modified) (1 diff)
• UIProcess/efl/WebView.cpp (modified) (3 diffs)
• UIProcess/efl/WebView.h (modified) (2 diffs)

trunk/Source/WebKit2/ChangeLog

@@ +1 @@
+2013-04-05  Mikhail Pozdnyakov  <mikhail.pozdnyakov@intel.com>
+
+        [WK2][EFL] Encapsulate view states set-up within WebView
+        https://bugs.webkit.org/show_bug.cgi?id=110877
+
+        Reviewed by Benjamin Poulain.
+
+        View states set-up is encapsulated within WebView. This change
+        reduces both usage of EwkView inside WebView class and usage of
+        WebPageProxy inside EwkView class.
+
+        New WKView API was added so that EwkView can define whether or not
+        the view is visible and focused.
+
+        * UIProcess/API/C/efl/WKView.cpp:
+        (WKViewIsFocused):
+        (WKViewSetIsFocused):
+        (WKViewIsVisible):
+        (WKViewSetIsVisible):
+        * UIProcess/API/C/efl/WKView.h:
+        * UIProcess/API/efl/EwkView.cpp:
+        (::handleEvent):
+        (EwkView::handleEvasObjectShow):
+        (EwkView::handleEwkViewFocusIn):
+        (EwkView::handleEwkViewFocusOut):
+        * UIProcess/API/efl/EwkView.h:
+        * UIProcess/efl/WebView.cpp:
+        (WebKit::WebView::WebView):
+        (WebKit::WebView::setFocused):
+        (WebKit):
+        (WebKit::WebView::setVisible):
+        (WebKit::WebView::isViewFocused):
+        (WebKit::WebView::isViewVisible):
+        * UIProcess/efl/WebView.h:
+        (WebKit::WebView::isFocused):
+        (WebView):
+        (WebKit::WebView::isVisible):
+
 2013-04-04  KwangYong Choi  <ky0.choi@samsung.com>
 

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

@@ -54 +54 @@
 {
     toImpl(viewRef)->initializeClient(client);
+}
+
+bool WKViewIsFocused(WKViewRef viewRef)
+{
+    return toImpl(viewRef)->isFocused();
+}
+
+void WKViewSetIsFocused(WKViewRef viewRef, bool isFocused)
+{
+    toImpl(viewRef)->setFocused(isFocused);
+}
+
+bool WKViewIsVisible(WKViewRef viewRef)
+{
+    return toImpl(viewRef)->isVisible();
+}
+
+void WKViewSetIsVisible(WKViewRef viewRef, bool isVisible)
+{
+    toImpl(viewRef)->setVisible(isVisible);
 }
 

trunk/Source/WebKit2/UIProcess/API/C/efl/WKView.h

@@ -59 +59 @@
 WK_EXPORT void WKViewSetViewClient(WKViewRef, const WKViewClient*);
 
+WK_EXPORT bool WKViewIsFocused(WKViewRef);
+WK_EXPORT void WKViewSetIsFocused(WKViewRef, bool);
+
+WK_EXPORT bool WKViewIsVisible(WKViewRef);
+WK_EXPORT void WKViewSetIsVisible(WKViewRef, bool);
+
 WK_EXPORT void WKViewSetUserViewportTranslation(WKViewRef, double tx, double ty);
 WK_EXPORT WKPoint WKViewUserViewportToContents(WKViewRef, WKPoint);

trunk/Source/WebKit2/UIProcess/API/efl/EwkView.cpp

@@ -215 +215 @@
 {
     Ewk_View_Smart_Data* smartData = static_cast<Ewk_View_Smart_Data*>(data);
-    toEwkView(smartData)->page()->viewStateDidChange(WebPageProxy::ViewIsVisible);
+    WKViewSetIsVisible(toEwkView(smartData)->wkView(), true);
 }
 
@@ -222 +222 @@
 {
     Ewk_View_Smart_Data* smartData = static_cast<Ewk_View_Smart_Data*>(data);
-
-    // We need to pass ViewIsVisible here. viewStateDidChange() itself is responsible for actually setting the visibility to Visible or Hidden
-    // depending on what WebPageProxy::isViewVisible() returns, this simply triggers the process.
-    toEwkView(smartData)->page()->viewStateDidChange(WebPageProxy::ViewIsVisible);
+    WKViewSetIsVisible(toEwkView(smartData)->wkView(), false);
 }
 
@@ -623 +620 @@
 }
 
-bool EwkView::isFocused() const
-{
-    return evas_object_focus_get(m_evasObject);
-}
-
-bool EwkView::isVisible() const
-{
-    return evas_object_visible_get(m_evasObject);
-}
-
 const char* EwkView::title() const
 {
@@ -1164 +1151 @@
 Eina_Bool EwkView::handleEwkViewFocusIn(Ewk_View_Smart_Data* smartData)
 {
-    toEwkView(smartData)->page()->viewStateDidChange(WebPageProxy::ViewIsFocused | WebPageProxy::ViewWindowIsActive);
+    WKViewSetIsFocused(toEwkView(smartData)->wkView(), true);
     return true;
 }
@@ -1170 +1157 @@
 Eina_Bool EwkView::handleEwkViewFocusOut(Ewk_View_Smart_Data* smartData)
 {
-    toEwkView(smartData)->page()->viewStateDidChange(WebPageProxy::ViewIsFocused | WebPageProxy::ViewWindowIsActive);
+    WKViewSetIsFocused(toEwkView(smartData)->wkView(), false);
     return true;
 }

trunk/Source/WebKit2/UIProcess/API/efl/EwkView.h

@@ -120 +120 @@
     WebKit::PageViewportController* pageViewportController() { return m_pageViewportController.get(); }
 
-    bool isFocused() const;
-    bool isVisible() const;
-
     void setDeviceScaleFactor(float scale);
     float deviceScaleFactor() const;

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

@@ -55 +55 @@
     : m_ewkView(0)
     , m_page(context->createWebPage(this, pageGroup))
+    , m_focused(false)
+    , m_visible(false)
 {
     m_page->pageGroup()->preferences()->setAcceleratedCompositingEnabled(true);
@@ -103 +105 @@
 }
 
+void WebView::setFocused(bool focused)
+{
+    if (m_focused == focused)
+        return;
+
+    m_focused = focused;
+    m_page->viewStateDidChange(WebPageProxy::ViewIsFocused | WebPageProxy::ViewWindowIsActive);
+}
+
+void WebView::setVisible(bool visible)
+{
+    if (m_visible == visible)
+        return;
+
+    m_visible = visible;
+    m_page->viewStateDidChange(WebPageProxy::ViewIsVisible);
+}
+
 void WebView::setUserViewportTranslation(double tx, double ty)
 {
@@ -302 +322 @@
 bool WebView::isViewFocused()
 {
-    // FIXME: Unneeded after webkit.org/b/110877
-    if (!m_ewkView)
-        return false;
-
-    return m_ewkView->isFocused();
+    return isFocused();
 }
 
 bool WebView::isViewVisible()
 {
-    // FIXME: Unneeded after webkit.org/b/110877
-    if (!m_ewkView)
-        return false;
-
-    return m_ewkView->isVisible();
+    return isVisible();
 }
 

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

@@ -61 +61 @@
     const WebCore::IntSize& size() const { return m_size; }
 
+    bool isFocused() const { return m_focused; }
+    void setFocused(bool);
+
+    bool isVisible() const { return m_visible; }
+    void setVisible(bool);
+
     void setUserViewportTranslation(double tx, double ty);
     WebCore::IntPoint userViewportToContents(const WebCore::IntPoint&) const;
@@ -186 +192 @@
     WebCore::TransformationMatrix m_userViewportTransform;
     WebCore::IntSize m_size; // Size in device units.
+    bool m_focused;
+    bool m_visible;
 };