Merge WebKit at r64264 : Initial merge by git.

Change-Id: Ic42bef02efef8217a0f84c47176a9c617c28d1f1

1 files changed, 21 insertions, 0 deletions

diff --git a/WebKit/efl/EWebLauncher/main.c b/WebKit/efl/EWebLauncher/main.c
index 6980a58..c1956a2 100644
--- a/WebKit/efl/EWebLauncher/main.c
+++ b/WebKit/efl/EWebLauncher/main.c
@@ -373,6 +373,21 @@ on_tooltip_text_set(void* user_data, Evas_Object* webview, void* event_info)
         info("%s\n", text);
 }
 
+static void
+on_inputmethod_changed(void* user_data, Evas_Object* webview, void* event_info)
+{
+    Eina_Bool active = (Eina_Bool)(long)event_info;
+    unsigned int imh;
+    info("Keyboard changed: %d\n", active);
+
+    if (!active)
+        return;
+
+    imh = ewk_view_imh_get(webview);
+    info("    Keyboard flags: %#.2x\n", imh);
+
+}
+
 /**
  * "viewport,changed" signal will be always emitted regardless of the viewport existence.
  *
@@ -661,6 +676,7 @@ browserCreate(const char *url, const char *theme, const char *userAgent, Eina_Re
     evas_object_smart_callback_add(app->browser, "menubar,visible,set", on_menubar_visible_set, app);
     evas_object_smart_callback_add(app->browser, "menubar,visible,get", on_menubar_visible_get, app);
     evas_object_smart_callback_add(app->browser, "tooltip,text,set", on_tooltip_text_set, app);
+    evas_object_smart_callback_add(app->browser, "inputmethod,changed", on_inputmethod_changed, app);
 
 /*     ewk_callback_resize_requested_add(app->browser, on_resize_requested, app->ee); */
 
@@ -756,6 +772,7 @@ main(int argc, char *argv[])
     char *url = NULL;
     char *userAgent = NULL;
     const char *tmp;
+    const char *proxyUri;
     char path[PATH_MAX];
 
     char *engine = NULL;
@@ -818,6 +835,10 @@ main(int argc, char *argv[])
     ewk_settings_icon_database_path_set(path);
     ewk_settings_web_database_path_set(path);
 
+    proxyUri = getenv("http_proxy");
+    if (proxyUri)
+        ewk_settings_proxy_uri_set(proxyUri);
+
     browserCreate(url, theme, userAgent, geometry, engine, isFullscreen);
     ecore_event_handler_add(ECORE_EVENT_SIGNAL_EXIT, main_signal_exit, &windows);