Changeset 171724 in webkit

Timestamp:

Jul 29, 2014 12:52:11 AM (10 years ago)

Author:

ryuan.choi@samsung.com

Message:

[EFL] Alpha value of ewk_view_bg_color_set is not working
​https://bugs.webkit.org/show_bug.cgi?id=135333

Reviewed by Gyuyoung Kim.

evas_object_image_alpha_set should be called for the transparent evas object.

• UIProcess/API/efl/EwkView.cpp:

(EwkView::handleEvasObjectColorSet):
(EwkView::setBackgroundColor): Checked the alpha value of object and called evas_object_image_alpha_set.

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

(ewk_view_bg_color_set): Moved the logic to EwkView.

Location:

trunk/Source/WebKit2

Files:

• ChangeLog (modified) (1 diff)
• UIProcess/API/efl/EwkView.cpp (modified) (2 diffs)
• UIProcess/API/efl/EwkView.h (modified) (1 diff)
• UIProcess/API/efl/ewk_view.cpp (modified) (1 diff)

trunk/Source/WebKit2/ChangeLog

@@ +1 @@
+2014-07-29  Ryuan Choi  <ryuan.choi@samsung.com>
+
+        [EFL] Alpha value of ewk_view_bg_color_set is not working
+        https://bugs.webkit.org/show_bug.cgi?id=135333
+
+        Reviewed by Gyuyoung Kim.
+
+        evas_object_image_alpha_set should be called for the transparent evas object.
+
+        * UIProcess/API/efl/EwkView.cpp:
+        (EwkView::handleEvasObjectColorSet):
+        (EwkView::setBackgroundColor): Checked the alpha value of object and called evas_object_image_alpha_set.
+        * UIProcess/API/efl/EwkView.h:
+        * UIProcess/API/efl/ewk_view.cpp:
+        (ewk_view_bg_color_set): Moved the logic to EwkView.
+
 2014-07-28  Mark Rowe  <mrowe@apple.com>
 

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

@@ -1237 +1237 @@
     ASSERT(smartData);
 
-    evas_object_image_alpha_set(smartData->image, alpha < 255);
+    int backgroundAlpha;
+    WKViewGetBackgroundColor(toEwkView(smartData)->wkView(), nullptr, nullptr, nullptr, &backgroundAlpha);
+    evas_object_image_alpha_set(smartData->image, alpha < 255 || backgroundAlpha < 255);
     parentSmartClass.color_set(evasObject, red, green, blue, alpha);
 }
@@ -1416 +1418 @@
 }
 
+void EwkView::setBackgroundColor(int red, int green, int blue, int alpha)
+{
+    if (red == 255 && green == 255 && blue == 255 && alpha == 255)
+        WKViewSetDrawsBackground(wkView(), true);
+    else
+        WKViewSetDrawsBackground(wkView(), false);
+
+    int objectAlpha;
+    Evas_Object* image = smartData()->image;
+    evas_object_color_get(image, nullptr, nullptr, nullptr, &objectAlpha);
+    evas_object_image_alpha_set(image, alpha < 255 || objectAlpha < 255);
+
+    WKViewSetBackgroundColor(wkView(), red, green, blue, alpha);
+}
+
 Evas_Smart_Class EwkView::parentSmartClass = EVAS_SMART_CLASS_INIT_NULL;
 

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

@@ -182 +182 @@
     bool scrollBy(const WebCore::IntSize&);
 
+    void setBackgroundColor(int red, int green, int blue, int alpha);
+
     void didFindZoomableArea(const WKPoint&, const WKRect&);
 

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

@@ -734 +734 @@
     EWK_VIEW_IMPL_GET_OR_RETURN(ewkView, impl);
 
-    if (red == 255 && green == 255 && blue == 255 && alpha == 255)
-        WKViewSetDrawsBackground(impl->wkView(), true);
-    else
-        WKViewSetDrawsBackground(impl->wkView(), false);
-
-    WKViewSetBackgroundColor(impl->wkView(), red, green, blue, alpha);
+    impl->setBackgroundColor(red, green, blue, alpha);
 }