Changeset 129121 in webkit

Timestamp:

Sep 20, 2012 5:09:08 AM (12 years ago)

Author:

commit-queue@webkit.org

Message:

[EFL][WK2] Implemented color picker API
​https://bugs.webkit.org/show_bug.cgi?id=91832

Patch by KwangYong Choi <​ky0.choi@samsung.com> on 2012-09-20
Reviewed by Kenneth Rohde Christiansen.

Add support for color picker API for EFL port in WebKit2.

The external application can implement input picker by overriding
smart class function.

• UIProcess/API/efl/ewk_view.cpp:

(_Ewk_View_Private_Data):
(_Ewk_View_Private_Data::_Ewk_View_Private_Data):
(ewk_view_color_picker_request):
(ewk_view_color_picker_dismiss):
(ewk_view_color_picker_color_set):

• UIProcess/API/efl/ewk_view.h:
• UIProcess/API/efl/ewk_view_private.h:
• UIProcess/API/efl/ewk_view_ui_client.cpp:

(showColorPicker):
(hideColorPicker):
(ewk_view_ui_client_attach):

• UIProcess/API/efl/tests/test_ewk2_view.cpp:

(onColorPickerDone):
(setColorPickerColor):
(showColorPicker):
(hideColorPicker):
(TEST_F):

Location:

trunk/Source/WebKit2

Files:

• ChangeLog (modified) (1 diff)
• UIProcess/API/efl/ewk_view.cpp (modified) (4 diffs)
• UIProcess/API/efl/ewk_view.h (modified) (4 diffs)
• UIProcess/API/efl/ewk_view_private.h (modified) (1 diff)
• UIProcess/API/efl/ewk_view_ui_client.cpp (modified) (2 diffs)
• UIProcess/API/efl/tests/test_ewk2_view.cpp (modified) (1 diff)

trunk/Source/WebKit2/ChangeLog

@@ +1 @@
+2012-09-20  KwangYong Choi  <ky0.choi@samsung.com>
+
+        [EFL][WK2] Implemented color picker API
+        https://bugs.webkit.org/show_bug.cgi?id=91832
+
+        Reviewed by Kenneth Rohde Christiansen.
+
+        Add support for color picker API for EFL port in WebKit2.
+
+        The external application can implement input picker by overriding
+        smart class function.
+
+        * UIProcess/API/efl/ewk_view.cpp:
+        (_Ewk_View_Private_Data):
+        (_Ewk_View_Private_Data::_Ewk_View_Private_Data):
+        (ewk_view_color_picker_request):
+        (ewk_view_color_picker_dismiss):
+        (ewk_view_color_picker_color_set):
+        * UIProcess/API/efl/ewk_view.h:
+        * UIProcess/API/efl/ewk_view_private.h:
+        * UIProcess/API/efl/ewk_view_ui_client.cpp:
+        (showColorPicker):
+        (hideColorPicker):
+        (ewk_view_ui_client_attach):
+        * UIProcess/API/efl/tests/test_ewk2_view.cpp:
+        (onColorPickerDone):
+        (setColorPickerColor):
+        (showColorPicker):
+        (hideColorPicker):
+        (TEST_F):
+
 2012-09-20  Balazs Kelemen  <kbalazs@webkit.org>
 

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

@@ -27 +27 @@
 #include "PageClientImpl.h"
 #include "WKAPICast.h"
+#include "WKColorPickerResultListener.h"
 #include "WKEinaSharedString.h"
 #include "WKFindOptions.h"
@@ -99 +100 @@
     OwnPtr<Ewk_Settings> settings;
     bool areMouseEventsEnabled;
+    WKColorPickerResultListenerRef colorPickerResultListener;
 
     WebPopupMenuProxyEfl* popupMenuProxy;
@@ -117 +119 @@
         , backForwardList(0)
         , areMouseEventsEnabled(false)
+        , colorPickerResultListener(0)
         , popupMenuProxy(0)
         , popupMenuItems(0)
@@ -1698 +1701 @@
     return WKEinaSharedString::adopt(smartData->api->run_javascript_prompt(smartData, message, defaultValue));
 }
+
+#if ENABLE(INPUT_TYPE_COLOR)
+/**
+ * @internal
+ * Reqeusts to show external color picker.
+ */
+void ewk_view_color_picker_request(Evas_Object* ewkView, int r, int g, int b, int a, WKColorPickerResultListenerRef listener)
+{
+    EWK_VIEW_SD_GET_OR_RETURN(ewkView, smartData);
+    EWK_VIEW_PRIV_GET_OR_RETURN(smartData, priv);
+    EINA_SAFETY_ON_NULL_RETURN(smartData->api->input_picker_color_request);
+
+    priv->colorPickerResultListener = listener;
+
+    smartData->api->input_picker_color_request(smartData, r, g, b, a);
+}
+
+/**
+ * @internal
+ * Reqeusts to hide external color picker.
+ */
+void ewk_view_color_picker_dismiss(Evas_Object* ewkView)
+{
+    EWK_VIEW_SD_GET_OR_RETURN(ewkView, smartData);
+    EWK_VIEW_PRIV_GET_OR_RETURN(smartData, priv);
+    EINA_SAFETY_ON_NULL_RETURN(smartData->api->input_picker_color_dismiss);
+
+    priv->colorPickerResultListener = 0;
+
+    smartData->api->input_picker_color_dismiss(smartData);
+}
+#endif
+
+Eina_Bool ewk_view_color_picker_color_set(Evas_Object* ewkView, int r, int g, int b, int a)
+{
+#if ENABLE(INPUT_TYPE_COLOR)
+    EWK_VIEW_SD_GET_OR_RETURN(ewkView, smartData, false);
+    EWK_VIEW_PRIV_GET_OR_RETURN(smartData, priv, false);
+    EINA_SAFETY_ON_NULL_RETURN_VAL(priv->colorPickerResultListener, false);
+
+    WebCore::Color color = WebCore::Color(r, g, b, a);
+    const WKStringRef colorString = WKStringCreateWithUTF8CString(color.serialized().utf8().data());
+    WKColorPickerResultListenerSetColor(priv->colorPickerResultListener, colorString);
+    priv->colorPickerResultListener = 0;
+
+    return true;
+#else
+    return false;
+#endif
+}

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

@@ -122 +122 @@
     Eina_Bool (*run_javascript_confirm)(Ewk_View_Smart_Data *sd, const char *message);
     const char *(*run_javascript_prompt)(Ewk_View_Smart_Data *sd, const char *message, const char *default_value); /**< return string should be stringshared. */
+
+    // color picker:
+    //   - Shows and hides color picker.
+    Eina_Bool (*input_picker_color_request)(Ewk_View_Smart_Data *sd, int r, int g, int b, int a);
+    Eina_Bool (*input_picker_color_dismiss)(Ewk_View_Smart_Data *sd);
 };
 
@@ -128 +133 @@
  * in the @a Ewk_View_Smart_Class structure.
  */
-#define EWK_VIEW_SMART_CLASS_VERSION 4UL
+#define EWK_VIEW_SMART_CLASS_VERSION 5UL
 
 /**
@@ -140 +145 @@
  * @see EWK_VIEW_SMART_CLASS_INIT_NAME_VERSION
  */
-#define EWK_VIEW_SMART_CLASS_INIT(smart_class_init) {smart_class_init, EWK_VIEW_SMART_CLASS_VERSION, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0}
+#define EWK_VIEW_SMART_CLASS_INIT(smart_class_init) {smart_class_init, EWK_VIEW_SMART_CLASS_VERSION, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0}
 
 /**
@@ -662 +667 @@
 EAPI Eina_Bool ewk_view_mouse_events_enabled_get(const Evas_Object *o);
 
+/*
+ * Sets the user chosen color. To be used when implementing a color picker.
+ *
+ * The function should only be called when a color has been requested by the document.
+ * If called when this is not the case or when the input picker has been dismissed, this
+ * function will fail and return EINA_FALSE.
+ *
+ * @param o view object contains color picker
+ * @param r red channel value to be set
+ * @param g green channel value to be set
+ * @param b blue channel value to be set
+ * @param a alpha channel value to be set
+ *
+ * @return @c EINA_TRUE on success @c EINA_FALSE otherwise
+ */
+EAPI Eina_Bool ewk_view_color_picker_color_set(Evas_Object *o, int r, int g, int b, int a);
+
 #ifdef __cplusplus
 }

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

@@ -110 +110 @@
 WKEinaSharedString ewk_view_run_javascript_prompt(Evas_Object* ewkView, const WKEinaSharedString& message, const WKEinaSharedString& defaultValue);
 
+#if ENABLE(INPUT_TYPE_COLOR)
+void ewk_view_color_picker_request(Evas_Object* ewkView, int r, int g, int b, int a, WKColorPickerResultListenerRef listener);
+void ewk_view_color_picker_dismiss(Evas_Object* ewkView);
+#endif
+
 #endif // ewk_view_private_h

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

@@ -61 +61 @@
 }
 
+#if ENABLE(INPUT_TYPE_COLOR)
+static void showColorPicker(WKPageRef, WKStringRef initialColor, WKColorPickerResultListenerRef listener, const void* clientInfo)
+{
+    WebCore::Color color = WebCore::Color(WebKit::toWTFString(initialColor));
+    ewk_view_color_picker_request(toEwkView(clientInfo), color.red(), color.green(), color.blue(), color.alpha(), listener);
+}
+
+static void hideColorPicker(WKPageRef, const void* clientInfo)
+{
+    ewk_view_color_picker_dismiss(toEwkView(clientInfo));
+}
+#endif
+
 void ewk_view_ui_client_attach(WKPageRef pageRef, Evas_Object* ewkView)
 {
@@ -72 +85 @@
     uiClient.runJavaScriptConfirm = runJavaScriptConfirm;
     uiClient.runJavaScriptPrompt = runJavaScriptPrompt;
+
+#if ENABLE(INPUT_TYPE_COLOR)
+    uiClient.showColorPicker = showColorPicker;
+    uiClient.hideColorPicker = hideColorPicker;
+#endif
+
     WKPageSetPageUIClient(pageRef, &uiClient);
 }

trunk/Source/WebKit2/UIProcess/API/efl/tests/test_ewk2_view.cpp

@@ -625 +625 @@
     EXPECT_EQ(promptCallbackData.called, false);
 }
+
+#if ENABLE(INPUT_TYPE_COLOR)
+static const int initialRed = 0x12;
+static const int initialGreen = 0x34;
+static const int initialBlue = 0x56;
+static const int initialAlpha = 0xff;
+static const int changedRed = 0x98;
+static const int changedGreen = 0x76;
+static const int changedBlue = 0x54;
+static const int changedAlpha = 0xff;
+
+static bool isColorPickerShown = false;
+
+static void onColorPickerDone(void* userData, Evas_Object*, void*)
+{
+    bool* handled = static_cast<bool*>(userData);
+
+    *handled = true;
+}
+
+static unsigned char setColorPickerColor(void* data)
+{
+    Ewk_View_Smart_Data* smartData = static_cast<Ewk_View_Smart_Data*>(data);
+
+    // 3. Change color to changed color.
+    EXPECT_TRUE(ewk_view_color_picker_color_set(smartData->self, changedRed, changedGreen, changedBlue, changedAlpha));
+
+    evas_object_smart_callback_call(smartData->self, "input,type,color,request", 0);
+
+    return 0;
+}
+
+static Eina_Bool showColorPicker(Ewk_View_Smart_Data* smartData, int r, int g, int b, int a)
+{
+    static bool isFirstRun = true;
+
+    isColorPickerShown = true;
+
+    if (isFirstRun) {
+        // 1. Check initial value from html file.
+        EXPECT_EQ(r, initialRed);
+        EXPECT_EQ(g, initialGreen);
+        EXPECT_EQ(b, initialBlue);
+        EXPECT_EQ(a, initialAlpha);
+
+        isFirstRun = false;
+    } else {
+        // 4. Input values should be same as changed color.
+        EXPECT_EQ(r, changedRed);
+        EXPECT_EQ(g, changedGreen);
+        EXPECT_EQ(b, changedBlue);
+        EXPECT_EQ(a, changedAlpha);
+    }
+
+    // 2. Return after making a color picker.
+    ecore_timer_add(0.0, setColorPickerColor, smartData);
+    return true;
+}
+
+static Eina_Bool hideColorPicker(Ewk_View_Smart_Data*)
+{
+    // Test color picker is shown.
+    EXPECT_TRUE(isColorPickerShown);
+    isColorPickerShown = false;
+}
+
+TEST_F(EWK2UnitTestBase, ewk_view_color_picker_color_set)
+{
+    Ewk_View_Smart_Class* api = ewkViewClass();
+    api->input_picker_color_request = showColorPicker;
+    api->input_picker_color_dismiss = hideColorPicker;
+
+    loadUrlSync("data:text/html,<input type='color' value='#123456'>");
+
+    // Click input element.
+    mouseClick(30, 20);
+
+    bool handled = false;
+    evas_object_smart_callback_add(webView(), "input,type,color,request", onColorPickerDone, &handled);
+    while (!handled)
+        ecore_main_loop_iterate();
+
+    // Click input element again.
+    mouseClick(30, 20);
+
+    handled = false;
+    while (!handled)
+        ecore_main_loop_iterate();
+    evas_object_smart_callback_del(webView(), "input,type,color,request", onColorPickerDone);
+}
+#endif // ENABLE(INPUT_TYPE_COLOR)