Changeset 142157 in webkit

Timestamp:

Feb 7, 2013 11:19:06 AM (11 years ago)

Author:

kenneth@webkit.org

Message:

[WK2][EFL] Add WKView methods related to background drawing
​https://bugs.webkit.org/show_bug.cgi?id=109159

Reviewed by Anders Carlsson.

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

(WKViewSetDrawsBackground):
(WKViewGetDrawsBackground):
(WKViewSetDrawsTransparentBackground):
(WKViewGetDrawsTransparentBackground):

• UIProcess/efl/WebView.cpp:

(WebKit::WebView::setDrawsBackground):
(WebKit):
(WebKit::WebView::drawsBackground):
(WebKit::WebView::setDrawsTransparentBackground):
(WebKit::WebView::drawsTransparentBackground):

• UIProcess/efl/WebView.h:

(WebView):

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

New methods added

• UIProcess/API/efl/EwkView.cpp:

(EwkView::EwkView):
(EwkView::displayTimerFired):
(EwkView::handleEvasObjectColorSet):

• UIProcess/API/efl/EwkView.h:

(EwkView):

• UIProcess/API/efl/ewk_view.cpp:

(ewk_view_draws_page_background_set):

Remove the unneeded m_setDrawsBackground and replace
it with the WKView setting.

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) (3 diffs)
• UIProcess/API/efl/EwkView.h (modified) (2 diffs)
• UIProcess/API/efl/ewk_view.cpp (modified) (2 diffs)
• UIProcess/efl/WebView.cpp (modified) (1 diff)
• UIProcess/efl/WebView.h (modified) (1 diff)

trunk/Source/WebKit2/ChangeLog

@@ +1 @@
+2013-02-07  Kenneth Rohde Christiansen  <kenneth@webkit.org>
+
+        [WK2][EFL] Add WKView methods related to background drawing
+        https://bugs.webkit.org/show_bug.cgi?id=109159
+
+        Reviewed by Anders Carlsson.
+
+        * UIProcess/API/C/efl/WKView.cpp:
+        (WKViewSetDrawsBackground):
+        (WKViewGetDrawsBackground):
+        (WKViewSetDrawsTransparentBackground):
+        (WKViewGetDrawsTransparentBackground):
+         * UIProcess/efl/WebView.cpp:
+        (WebKit::WebView::setDrawsBackground):
+        (WebKit):
+        (WebKit::WebView::drawsBackground):
+        (WebKit::WebView::setDrawsTransparentBackground):
+        (WebKit::WebView::drawsTransparentBackground):
+        * UIProcess/efl/WebView.h:
+        (WebView):
+       * UIProcess/API/C/efl/WKView.h:
+
+            New methods added
+
+        * UIProcess/API/efl/EwkView.cpp:
+        (EwkView::EwkView):
+        (EwkView::displayTimerFired):
+        (EwkView::handleEvasObjectColorSet):
+        * UIProcess/API/efl/EwkView.h:
+        (EwkView):
+        * UIProcess/API/efl/ewk_view.cpp:
+        (ewk_view_draws_page_background_set):
+
+            Remove the unneeded m_setDrawsBackground and replace
+            it with the WKView setting.
+
 2013-02-07  Christophe Dumez  <dchris@gmail.com>
 

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

@@ -58 +58 @@
 }
 
+void WKViewSetDrawsBackground(WKViewRef viewRef, bool flag)
+{
+    toImpl(viewRef)->setDrawsBackground(flag);
+}
+
+bool WKViewGetDrawsBackground(WKViewRef viewRef)
+{
+    return toImpl(viewRef)->drawsBackground();
+}
+
+void WKViewSetDrawsTransparentBackground(WKViewRef viewRef, bool flag)
+{
+    toImpl(viewRef)->setDrawsTransparentBackground(flag);
+}
+
+bool WKViewGetDrawsTransparentBackground(WKViewRef viewRef)
+{
+    return toImpl(viewRef)->drawsTransparentBackground();
+}
+
 void WKViewSetThemePath(WKViewRef viewRef, WKStringRef theme)
 {

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

@@ -45 +45 @@
 WK_EXPORT void WKViewSetThemePath(WKViewRef, WKStringRef);
 
+WK_EXPORT void WKViewSetDrawsBackground(WKViewRef, bool);
+WK_EXPORT bool WKViewGetDrawsBackground(WKViewRef);
+
+WK_EXPORT void WKViewSetDrawsTransparentBackground(WKViewRef, bool);
+WK_EXPORT bool WKViewGetDrawsTransparentBackground(WKViewRef);
+
 WK_EXPORT void WKViewSuspendActiveDOMObjectsAndAnimations(WKViewRef);
 WK_EXPORT void WKViewResumeActiveDOMObjectsAndAnimations(WKViewRef);

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

@@ -254 +254 @@
     , m_inputMethodContext(InputMethodContextEfl::create(this, smartData()->base.evas))
     , m_isHardwareAccelerated(true)
-    , m_setDrawsBackground(false)
 {
     ASSERT(m_evasObject);
@@ -550 +549 @@
 
     scene->setActive(true);
-    scene->setDrawsBackground(m_setDrawsBackground);
+    scene->setDrawsBackground(WKViewGetDrawsBackground(wkView()));
+
     if (m_isHardwareAccelerated) {
         scene->paintToCurrentGLContext(transformToScene().toTransformationMatrix(), /* opacity */ 1, viewport);
@@ -1238 +1238 @@
 
     evas_object_image_alpha_set(smartData->image, alpha < 255);
-    view->page()->setDrawsBackground(red || green || blue);
-    view->page()->setDrawsTransparentBackground(alpha < 255);
+    WKViewSetDrawsBackground(view->wkView(), red || green || blue);
+    WKViewSetDrawsTransparentBackground(view->wkView(), alpha < 255);
 
     parentSmartClass.color_set(evasObject, red, green, blue, alpha);

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

@@ -219 +219 @@
 
     bool isHardwareAccelerated() const { return m_isHardwareAccelerated; }
-    void setDrawsBackground(bool enable) { m_setDrawsBackground = enable; }
 
     PassRefPtr<cairo_surface_t> takeSnapshot();
@@ -311 +310 @@
 #endif
     bool m_isHardwareAccelerated;
-    bool m_setDrawsBackground;
 
     static Evas_Smart_Class parentSmartClass;

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

@@ -37 +37 @@
 #include "WKString.h"
 #include "WKURL.h"
+#include "WKView.h"
 #include "WebContext.h"
 #include "WebData.h"
@@ -480 +481 @@
     EWK_VIEW_IMPL_GET_OR_RETURN(ewkView, impl);
 
-    impl->setDrawsBackground(enabled);
+    WKViewSetDrawsBackground(impl->wkView(), enabled);
 }
 

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

@@ -65 +65 @@
 }
 
+void WebView::setDrawsBackground(bool drawsBackground)
+{
+    m_webPageProxy->setDrawsBackground(drawsBackground);
+}
+
+bool WebView::drawsBackground() const
+{
+    return m_webPageProxy->drawsBackground();
+}
+
+void WebView::setDrawsTransparentBackground(bool transparentBackground)
+{
+    m_webPageProxy->setDrawsTransparentBackground(transparentBackground);
+}
+
+bool WebView::drawsTransparentBackground() const
+{
+    return m_webPageProxy->drawsTransparentBackground();
+}
+
 void WebView::suspendActiveDOMObjectsAndAnimations()
 {

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

@@ -47 +47 @@
     WKPageRef pageRef() const { return toAPI(m_webPageProxy.get()); }
 
+    void setDrawsBackground(bool);
+    bool drawsBackground() const;
+    void setDrawsTransparentBackground(bool);
+    bool drawsTransparentBackground() const;
+
     void setThemePath(WKStringRef);
+
     void suspendActiveDOMObjectsAndAnimations();
     void resumeActiveDOMObjectsAndAnimations();