Changeset 185405 in webkit

Timestamp:

Jun 10, 2015, 12:29:36 AM (11 years ago)

Author:

commit-queue@webkit.org

Message:

[EFL] Execute Javascript method in mini browser address bar.
​https://bugs.webkit.org/show_bug.cgi?id=145725

Patch by Hyungwook Lee <​hyungwook.lee@navercorp.com> on 2015-06-10
Reviewed by Gyuyoung Kim.

Support 'javascript:' scheme in WebKit EFL Mini Browser.

• MiniBrowser/efl/main.c:

(url_from_user_input):
(url_load_from_user_input):
(on_url_bar_activated):
(elm_main):

Location:

trunk/Tools

Files:

• ChangeLog (modified) (1 diff)
• MiniBrowser/efl/main.c (modified) (4 diffs)

trunk/Tools/ChangeLog

@@ +1 @@
+2015-06-10  Hyungwook Lee  <hyungwook.lee@navercorp.com>
+
+        [EFL] Execute Javascript method in mini browser address bar.
+        https://bugs.webkit.org/show_bug.cgi?id=145725
+
+        Reviewed by Gyuyoung Kim.
+
+        Support 'javascript:' scheme in WebKit EFL Mini Browser.
+
+        * MiniBrowser/efl/main.c:
+        (url_from_user_input):
+        (url_load_from_user_input):
+        (on_url_bar_activated):
+        (elm_main):
+
 2015-06-09  Hyungwook Lee  <hyungwook.lee@navercorp.com>
 

trunk/Tools/MiniBrowser/efl/main.c

@@ -1039 +1039 @@
 {
     /* If it is already a URL, return the argument as is. */
-    if (has_scheme(arg) || !strcasecmp(arg, "about:blank"))
+    if (has_scheme(arg) || eina_str_has_prefix(arg, "javascript:") || !strcasecmp(arg, "about:blank"))
         return strdup(arg);
 
@@ -1061 +1061 @@
 }
 
+static Eina_Bool
+url_load_from_user_input(Evas_Object *ewk_view, const char *url)
+{
+    if (!ewk_view || !url)
+        return EINA_FALSE;
+
+    if (eina_str_has_prefix(url, "javascript:"))
+        return ewk_view_script_execute(ewk_view, strstr(url, "javascript:"), 0, 0);
+
+    return ewk_view_url_set(ewk_view, url);
+}
+
 static void
 on_url_bar_activated(void *user_data, Evas_Object *url_bar, void *event_info)
@@ -1069 +1081 @@
     char *user_url = elm_entry_markup_to_utf8(markup_url);
     char *url = url_from_user_input(user_url);
-    ewk_view_url_set(window->ewk_view, url);
+    url_load_from_user_input(window->ewk_view, url);
 
     free(user_url);
@@ -2462 +2474 @@
     if (args < argc) {
         char *url = url_from_user_input(argv[args]);
-        ewk_view_url_set(window->ewk_view, url);
+        url_load_from_user_input(window->ewk_view, url);
         free(url);
     } else