<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[205279] trunk/Tools</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://trac.webkit.org/projects/webkit/changeset/205279">205279</a></dd>
<dt>Author</dt> <dd>gyuyoung.kim@webkit.org</dd>
<dt>Date</dt> <dd>2016-08-31 22:47:16 -0700 (Wed, 31 Aug 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>[EFL] Small clean up in MiniBrowser
https://bugs.webkit.org/show_bug.cgi?id=161428
Reviewed by Yusuke Suzuki.
This patch resizes MiniBrowser, add *char* constants for scheme,
does line breaking, and remove unnecessary spaces.
* MiniBrowser/efl/main.c:
(on_mouse_wheel):
(history_list_hide):
(script_execute_callback):
(on_key_down):
(on_url_changed):
(on_error):
(on_color_picker_request):
(url_from_user_input):
(url_load_from_user_input):
(on_back_button_clicked):
(on_search_case_option_changed):
(on_search_word_start_option_changed):
(on_list_item_select):
(navigation_button_longpress_process):
(on_navigation_policy_decision):
(window_create):
(parse_cookies_policy):</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkToolsChangeLog">trunk/Tools/ChangeLog</a></li>
<li><a href="#trunkToolsMiniBrowsereflmainc">trunk/Tools/MiniBrowser/efl/main.c</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkToolsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Tools/ChangeLog (205278 => 205279)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/ChangeLog 2016-09-01 03:48:34 UTC (rev 205278)
+++ trunk/Tools/ChangeLog 2016-09-01 05:47:16 UTC (rev 205279)
</span><span class="lines">@@ -1,3 +1,32 @@
</span><ins>+2016-08-31 Gyuyoung Kim <gyuyoung.kim@webkit.org>
+
+ [EFL] Small clean up in MiniBrowser
+ https://bugs.webkit.org/show_bug.cgi?id=161428
+
+ Reviewed by Yusuke Suzuki.
+
+ This patch resizes MiniBrowser, add *char* constants for scheme,
+ does line breaking, and remove unnecessary spaces.
+
+ * MiniBrowser/efl/main.c:
+ (on_mouse_wheel):
+ (history_list_hide):
+ (script_execute_callback):
+ (on_key_down):
+ (on_url_changed):
+ (on_error):
+ (on_color_picker_request):
+ (url_from_user_input):
+ (url_load_from_user_input):
+ (on_back_button_clicked):
+ (on_search_case_option_changed):
+ (on_search_word_start_option_changed):
+ (on_list_item_select):
+ (navigation_button_longpress_process):
+ (on_navigation_policy_decision):
+ (window_create):
+ (parse_cookies_policy):
+
</ins><span class="cx"> 2016-08-31 Alex Christensen <achristensen@webkit.org>
</span><span class="cx">
</span><span class="cx"> Implement IPv6 parsing in URLParser
</span></span></pre></div>
<a id="trunkToolsMiniBrowsereflmainc"></a>
<div class="modfile"><h4>Modified: trunk/Tools/MiniBrowser/efl/main.c (205278 => 205279)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/MiniBrowser/efl/main.c 2016-09-01 03:48:34 UTC (rev 205278)
+++ trunk/Tools/MiniBrowser/efl/main.c 2016-09-01 05:47:16 UTC (rev 205279)
</span><span class="lines">@@ -30,6 +30,9 @@
</span><span class="cx">
</span><span class="cx"> static const char DEFAULT_URL[] = "http://www.ewebkit.org/";
</span><span class="cx"> static const char APP_NAME[] = "EFL MiniBrowser";
</span><ins>+static const char JAVASCRIPT_SCHEME[] = "javascript:";
+static const char FILE_SCHEME[] = "file://";
+static const char HTTP_SCHEME[] = "http://";
</ins><span class="cx"> static const int TOOL_BAR_ICON_SIZE = 24;
</span><span class="cx"> static const int TOOL_BAR_BUTTON_SIZE = 32;
</span><span class="cx"> static const int SEARCH_FIELD_SIZE = 200;
</span><span class="lines">@@ -55,8 +58,8 @@
</span><span class="cx"> static Eina_Bool fixed_layout_enabled = EINA_TRUE;
</span><span class="cx"> static Eina_Bool separated_process_enabled = EINA_FALSE;
</span><span class="cx"> static Eina_Bool longpress_enabled = EINA_FALSE;
</span><del>-static int window_width = 800;
-static int window_height = 600;
</del><ins>+static int window_width = 1000;
+static int window_height = 800;
</ins><span class="cx"> static int search_flags = EWK_FIND_OPTIONS_SHOW_HIGHLIGHT | EWK_FIND_OPTIONS_WRAP_AROUND | EWK_FIND_OPTIONS_CASE_INSENSITIVE;
</span><span class="cx"> /* Default value of device_pixel_ratio is '0' so that we don't set custom device
</span><span class="cx"> * scale factor unless it's required by the User. */
</span><span class="lines">@@ -126,7 +129,7 @@
</span><span class="cx"> Evas_Object *history_list;
</span><span class="cx"> Eina_List *history_list_items;
</span><span class="cx"> } history;
</span><del>- int current_zoom_level;
</del><ins>+ int current_zoom_level;
</ins><span class="cx"> Tooltip_Information tooltip;
</span><span class="cx"> Color_Selector color_selector;
</span><span class="cx"> struct {
</span><span class="lines">@@ -316,7 +319,7 @@
</span><span class="cx"> elm_object_disabled_set(window->forward_button, !ewk_view_forward_possible(ewk_view));
</span><span class="cx"> } else if (ev->z == 1 && ewk_view_back_possible(ewk_view)) {
</span><span class="cx"> ewk_view_back(ewk_view);
</span><del>- elm_object_disabled_set(window->back_button, !ewk_view_back_possible(ewk_view));
</del><ins>+ elm_object_disabled_set(window->back_button, !ewk_view_back_possible(ewk_view));
</ins><span class="cx"> }
</span><span class="cx"> } else if (ctrlPressed) {
</span><span class="cx"> if (ev->z == -1 && zoom_level_set(ewk_view, window->current_zoom_level + 1)) {
</span><span class="lines">@@ -466,21 +469,21 @@
</span><span class="cx"> evas_object_focus_set(window->ewk_view, EINA_TRUE);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-static void
</del><ins>+static void
</ins><span class="cx"> history_list_hide(Browser_Window *window)
</span><span class="cx"> {
</span><span class="cx"> /* Hide history list */
</span><span class="cx"> evas_object_hide(window->history.history_box);
</span><span class="cx"> evas_object_hide(window->history.history_list);
</span><del>-
</del><ins>+
</ins><span class="cx"> /* Dereference the list items and clear the history list */
</span><del>- void *data;
</del><ins>+ void *data;
</ins><span class="cx"> EINA_LIST_FREE(window->history.history_list_items, data) {
</span><span class="cx"> ewk_object_unref(data);
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> elm_genlist_clear(window->history.history_list);
</span><del>-
</del><ins>+
</ins><span class="cx"> /* Give focus back to the view */
</span><span class="cx"> elm_object_focus_set(window->history.history_box, EINA_FALSE);
</span><span class="cx"> elm_object_focus_set(window->history.history_list, EINA_FALSE);
</span><span class="lines">@@ -488,7 +491,7 @@
</span><span class="cx">
</span><span class="cx"> /* Reset flags */
</span><span class="cx"> longpress_enabled = EINA_FALSE;
</span><del>-}
</del><ins>+}
</ins><span class="cx">
</span><span class="cx"> static void save_page_contents_callback(Ewk_Page_Contents_Type type, const char *data, void *user_data)
</span><span class="cx"> {
</span><span class="lines">@@ -518,7 +521,7 @@
</span><span class="cx"> eina_stringshare_del(fileName);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-static void
</del><ins>+static void
</ins><span class="cx"> script_execute_callback(Evas_Object *ewk_view, const char *return_value, void *user_data)
</span><span class="cx"> {
</span><span class="cx"> Browser_Window *window = (Browser_Window *)user_data;
</span><span class="lines">@@ -528,7 +531,7 @@
</span><span class="cx"> if (return_value) {
</span><span class="cx"> eina_strbuf_append(text_buffer, return_value);
</span><span class="cx"> INFO("selected text is: %s", eina_strbuf_string_get(text_buffer));
</span><del>- elm_entry_entry_set(window->search.search_field, eina_strbuf_string_get(text_buffer));
</del><ins>+ elm_entry_entry_set(window->search.search_field, eina_strbuf_string_get(text_buffer));
</ins><span class="cx"> }
</span><span class="cx"> eina_strbuf_free(text_buffer);
</span><span class="cx"> search_box_show(window);
</span><span class="lines">@@ -650,7 +653,7 @@
</span><span class="cx"> if (!open_file_name)
</span><span class="cx"> return;
</span><span class="cx"> Eina_Strbuf *uri_path = eina_strbuf_new();
</span><del>- eina_strbuf_append_printf(uri_path, "file://%s", open_file_name);
</del><ins>+ eina_strbuf_append_printf(uri_path, "%s%s", FILE_SCHEME, open_file_name);
</ins><span class="cx"> INFO("pressed (CTRL + L) : Loading Page %s", eina_strbuf_string_get(uri_path));
</span><span class="cx"> ewk_view_url_set(ewk_view, eina_strbuf_string_get(uri_path));
</span><span class="cx"> eina_strbuf_free(uri_path);
</span><span class="lines">@@ -719,7 +722,7 @@
</span><span class="cx"> {
</span><span class="cx"> Browser_Window *window = (Browser_Window *)user_data;
</span><span class="cx"> const char *url = ewk_view_url_get(window->ewk_view);
</span><del>- char *converted_url = elm_entry_utf8_to_markup(url);
</del><ins>+ char *converted_url = elm_entry_utf8_to_markup(url);
</ins><span class="cx"> elm_entry_entry_set(window->url_bar, converted_url);
</span><span class="cx">
</span><span class="cx"> on_icon_changed_cb(ewk_context_favicon_database_get(ewk_view_context_get(ewk_view)), url, user_data);
</span><span class="lines">@@ -759,7 +762,8 @@
</span><span class="cx"> return;
</span><span class="cx">
</span><span class="cx"> buffer = eina_strbuf_new();
</span><del>- eina_strbuf_append_printf(buffer, "<html><body><div style=\"color:#ff0000\">ERROR!</div><br><div>Code: %d<br>Description: %s<br>URL: %s</div></body</html>",
</del><ins>+ eina_strbuf_append_printf(buffer,
+ "<html><body><div style=\"color:#ff0000\">ERROR!</div><br><div>Code: %d<br>Description: %s<br>URL: %s</div></body</html>",
</ins><span class="cx"> ewk_error_code_get(error), ewk_error_description_get(error), ewk_error_url_get(error));
</span><span class="cx">
</span><span class="cx"> ewk_view_html_string_load(ewk_view, eina_strbuf_string_get(buffer), 0, ewk_error_url_get(error));
</span><span class="lines">@@ -1004,10 +1008,13 @@
</span><span class="cx"> evas_object_show(cancel_button);
</span><span class="cx">
</span><span class="cx"> evas_object_smart_callback_add(ok_button, "clicked", on_color_picker_ok_clicked, &(window->color_selector));
</span><del>- evas_object_smart_callback_add(cancel_button, "clicked", on_color_picker_cancel_clicked, window->color_selector.ewk_picker);
- evas_object_smart_callback_add(window->color_selector.elm_selector_window, "delete,request", on_color_picker_cancel_clicked, window->color_selector.ewk_picker);
</del><ins>+ evas_object_smart_callback_add(cancel_button, "clicked", on_color_picker_cancel_clicked,
+ window->color_selector.ewk_picker);
+ evas_object_smart_callback_add(window->color_selector.elm_selector_window, "delete,request",
+ on_color_picker_cancel_clicked, window->color_selector.ewk_picker);
</ins><span class="cx"> evas_object_smart_callback_add(window->color_selector.elm_selector, "changed", on_color_changed, rect);
</span><del>- evas_object_smart_callback_add(window->color_selector.elm_selector, "color,item,selected", on_color_item_selected, rect);
</del><ins>+ evas_object_smart_callback_add(window->color_selector.elm_selector, "color,item,selected", on_color_item_selected,
+ rect);
</ins><span class="cx">
</span><span class="cx"> elm_win_center(window->color_selector.elm_selector_window, EINA_TRUE, EINA_TRUE);
</span><span class="cx"> evas_object_resize(window->color_selector.elm_selector_window, 350, 500);
</span><span class="lines">@@ -1043,7 +1050,7 @@
</span><span class="cx"> url_from_user_input(const char *arg)
</span><span class="cx"> {
</span><span class="cx"> /* If it is already a URL, return the argument as is. */
</span><del>- if (has_scheme(arg) || eina_str_has_prefix(arg, "javascript:") || !strcasecmp(arg, "about:blank"))
</del><ins>+ if (has_scheme(arg) || eina_str_has_prefix(arg, JAVASCRIPT_SCHEME) || !strcasecmp(arg, "about:blank"))
</ins><span class="cx"> return strdup(arg);
</span><span class="cx">
</span><span class="cx"> Eina_Strbuf *buf = eina_strbuf_manage_new(eina_file_path_sanitize(arg));
</span><span class="lines">@@ -1051,13 +1058,13 @@
</span><span class="cx"> /* Check if the path exists. */
</span><span class="cx"> if (ecore_file_exists(eina_strbuf_string_get(buf))) {
</span><span class="cx"> /* File exists, convert local path to a URL. */
</span><del>- eina_strbuf_prepend(buf, "file://");
</del><ins>+ eina_strbuf_prepend(buf, FILE_SCHEME);
</ins><span class="cx"> } else {
</span><span class="cx"> /* The path does not exist, convert it to a URL by
</span><span class="cx"> prepending http:// scheme:
</span><span class="cx"> www.google.com -> http://www.google.com */
</span><span class="cx"> eina_strbuf_string_free(buf);
</span><del>- eina_strbuf_append_printf(buf, "http://%s", arg);
</del><ins>+ eina_strbuf_append_printf(buf, "%s%s", HTTP_SCHEME, arg);
</ins><span class="cx"> }
</span><span class="cx"> char *url = eina_strbuf_string_steal(buf);
</span><span class="cx"> eina_strbuf_free(buf);
</span><span class="lines">@@ -1071,8 +1078,8 @@
</span><span class="cx"> if (!ewk_view || !url)
</span><span class="cx"> return EINA_FALSE;
</span><span class="cx">
</span><del>- if (eina_str_has_prefix(url, "javascript:"))
- return ewk_view_script_execute(ewk_view, strstr(url, "javascript:"), 0, 0);
</del><ins>+ if (eina_str_has_prefix(url, JAVASCRIPT_SCHEME))
+ return ewk_view_script_execute(ewk_view, strstr(url, JAVASCRIPT_SCHEME), 0, 0);
</ins><span class="cx">
</span><span class="cx"> return ewk_view_url_set(ewk_view, url);
</span><span class="cx"> }
</span><span class="lines">@@ -1144,7 +1151,7 @@
</span><span class="cx"> {
</span><span class="cx"> if (longpress_enabled)
</span><span class="cx"> return;
</span><del>-
</del><ins>+
</ins><span class="cx"> Browser_Window *window = (Browser_Window *)user_data;
</span><span class="cx">
</span><span class="cx"> ewk_view_back(window->ewk_view);
</span><span class="lines">@@ -1190,10 +1197,10 @@
</span><span class="cx"> {
</span><span class="cx"> Browser_Window *window = (Browser_Window *)user_data;
</span><span class="cx"> char *text = elm_entry_markup_to_utf8(elm_entry_entry_get(window->search.search_field));
</span><del>-
</del><ins>+
</ins><span class="cx"> /* Bit toggle the case sensitive flag */
</span><span class="cx"> search_flags = search_flags ^ EWK_FIND_OPTIONS_CASE_INSENSITIVE;
</span><del>-
</del><ins>+
</ins><span class="cx"> ewk_view_text_find(window->ewk_view, text, search_flags, MAX_SEARCH_COUNT);
</span><span class="cx"> free(text);
</span><span class="cx"> }
</span><span class="lines">@@ -1203,10 +1210,10 @@
</span><span class="cx"> {
</span><span class="cx"> Browser_Window *window = (Browser_Window *)user_data;
</span><span class="cx"> char *text = elm_entry_markup_to_utf8(elm_entry_entry_get(window->search.search_field));
</span><del>-
</del><ins>+
</ins><span class="cx"> /* Bit toggle the word start flag */
</span><span class="cx"> search_flags = search_flags ^ EWK_FIND_OPTIONS_AT_WORD_STARTS;
</span><del>-
</del><ins>+
</ins><span class="cx"> ewk_view_text_find(window->ewk_view, text, search_flags, MAX_SEARCH_COUNT);
</span><span class="cx"> free(text);
</span><span class="cx"> }
</span><span class="lines">@@ -1257,7 +1264,7 @@
</span><span class="cx"> on_list_item_select(void *user_data, Evas_Object *obj, void *event_info)
</span><span class="cx"> {
</span><span class="cx"> Browser_Window *window = evas_object_data_get(obj, "Browser_Window");
</span><del>- ewk_view_navigate_to(window->ewk_view, user_data);
</del><ins>+ ewk_view_navigate_to(window->ewk_view, user_data);
</ins><span class="cx"> history_list_hide(window);
</span><span class="cx"> evas_object_data_del(obj, "Browser_Window");
</span><span class="cx"> }
</span><span class="lines">@@ -1270,7 +1277,7 @@
</span><span class="cx">
</span><span class="cx"> longpress_enabled = EINA_TRUE;
</span><span class="cx"> Browser_Window *window = (Browser_Window *)user_data;
</span><del>-
</del><ins>+
</ins><span class="cx"> Ewk_Back_Forward_List *list = ewk_view_back_forward_list_get(window->ewk_view);
</span><span class="cx"> const Eina_List *l;
</span><span class="cx"> void *data;
</span><span class="lines">@@ -1282,11 +1289,11 @@
</span><span class="cx"> int width;
</span><span class="cx"> int height;
</span><span class="cx"> size_t index;
</span><del>-
</del><ins>+
</ins><span class="cx"> evas_object_data_set(window->history.history_list, "Browser_Window", window);
</span><span class="cx">
</span><span class="cx"> if (forward_navigation_enabled)
</span><del>- window->history.history_list_items = ewk_back_forward_list_forward_items_copy(list);
</del><ins>+ window->history.history_list_items = ewk_back_forward_list_forward_items_copy(list);
</ins><span class="cx"> else
</span><span class="cx"> window->history.history_list_items = ewk_back_forward_list_back_items_copy(list);
</span><span class="cx">
</span><span class="lines">@@ -1307,7 +1314,7 @@
</span><span class="cx"> INFO(" title = %s", title);
</span><span class="cx"> elm_genlist_item_append(window->history.history_list, list_item, (void *)(title), NULL, ELM_GENLIST_ITEM_NONE, on_list_item_select, data);
</span><span class="cx"> }
</span><del>-
</del><ins>+
</ins><span class="cx"> if (item_count > 0) {
</span><span class="cx"> evas_object_geometry_get(window->elm_window, &x, &y, &width, &height);
</span><span class="cx"> elm_list_go(window->history.history_list);
</span><span class="lines">@@ -1315,12 +1322,12 @@
</span><span class="cx">
</span><span class="cx"> if (forward_navigation_enabled) {
</span><span class="cx"> evas_object_move(window->history.history_box , x + TOOL_BAR_BUTTON_SIZE + 1, y + TOOL_BAR_BUTTON_SIZE);
</span><del>- evas_object_move(window->history.history_list , x + TOOL_BAR_BUTTON_SIZE + 1, y + TOOL_BAR_BUTTON_SIZE);
</del><ins>+ evas_object_move(window->history.history_list , x + TOOL_BAR_BUTTON_SIZE + 1, y + TOOL_BAR_BUTTON_SIZE);
</ins><span class="cx"> } else {
</span><span class="cx"> evas_object_move(window->history.history_box , x, y + TOOL_BAR_BUTTON_SIZE);
</span><del>- evas_object_move(window->history.history_list , x, y + TOOL_BAR_BUTTON_SIZE);
</del><ins>+ evas_object_move(window->history.history_list , x, y + TOOL_BAR_BUTTON_SIZE);
</ins><span class="cx"> }
</span><del>-
</del><ins>+
</ins><span class="cx"> elm_genlist_mode_set(window->history.history_list, ELM_LIST_COMPRESS);
</span><span class="cx"> evas_object_show(window->history.history_box);
</span><span class="cx"> evas_object_show(window->history.history_list);
</span><span class="lines">@@ -2027,7 +2034,7 @@
</span><span class="cx"> windows = eina_list_append(windows, window);
</span><span class="cx"> INFO("Mouse middle button pressed, open link in new window");
</span><span class="cx">
</span><del>- ewk_navigation_policy_decision_reject(decision);
</del><ins>+ ewk_navigation_policy_decision_reject(decision);
</ins><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -2256,7 +2263,7 @@
</span><span class="cx"> evas_object_size_hint_align_set(window->history.history_list, EVAS_HINT_FILL, EVAS_HINT_FILL);
</span><span class="cx"> elm_win_resize_object_add(window->elm_window, window->history.history_box);
</span><span class="cx"> elm_box_pack_end(window->history.history_box, window->history.history_list);
</span><del>-
</del><ins>+
</ins><span class="cx"> /* Create ewk_view */
</span><span class="cx"> Ewk_View_Smart_Class *ewkViewClass = miniBrowserViewSmartClass();
</span><span class="cx"> ewkViewClass->run_javascript_alert = on_javascript_alert;
</span><span class="lines">@@ -2340,7 +2347,7 @@
</span><span class="cx"> evas_object_event_callback_add(window->ewk_view, EVAS_CALLBACK_MOUSE_MOVE, on_mouse_move, window);
</span><span class="cx"> evas_object_event_callback_add(window->ewk_view, EVAS_CALLBACK_MOUSE_WHEEL, on_mouse_wheel, window);
</span><span class="cx"> evas_object_event_callback_add(window->elm_window, EVAS_CALLBACK_RESIZE, on_window_resize, window);
</span><del>-
</del><ins>+
</ins><span class="cx"> elm_button_autorepeat_set(window->back_button, EINA_TRUE);
</span><span class="cx"> elm_button_autorepeat_set(window->forward_button, EINA_TRUE);
</span><span class="cx"> elm_button_autorepeat_initial_timeout_set(window->back_button, LONGPRESS_INTERVAL_SECONDS);
</span><span class="lines">@@ -2376,7 +2383,7 @@
</span><span class="cx"> static Ewk_Cookie_Accept_Policy
</span><span class="cx"> parse_cookies_policy(const char *input_string)
</span><span class="cx"> {
</span><del>- if (!strcmp(input_string, "always"))
</del><ins>+ if (!strcmp(input_string, "always"))
</ins><span class="cx"> return EWK_COOKIE_ACCEPT_POLICY_ALWAYS;
</span><span class="cx"> if (!strcmp(input_string, "never"))
</span><span class="cx"> return EWK_COOKIE_ACCEPT_POLICY_NEVER;
</span></span></pre>
</div>
</div>
</body>
</html>