diff options
| author | Steve Block <steveblock@google.com> | 2011-05-06 11:45:16 +0100 |
|---|---|---|
| committer | Steve Block <steveblock@google.com> | 2011-05-12 13:44:10 +0100 |
| commit | cad810f21b803229eb11403f9209855525a25d57 (patch) | |
| tree | 29a6fd0279be608e0fe9ffe9841f722f0f4e4269 /Tools/EWebLauncher/main.c | |
| parent | 121b0cf4517156d0ac5111caf9830c51b69bae8f (diff) | |
| download | external_webkit-cad810f21b803229eb11403f9209855525a25d57.zip external_webkit-cad810f21b803229eb11403f9209855525a25d57.tar.gz external_webkit-cad810f21b803229eb11403f9209855525a25d57.tar.bz2 | |
Merge WebKit at r75315: Initial merge by git.
Change-Id: I570314b346ce101c935ed22a626b48c2af266b84
Diffstat (limited to 'Tools/EWebLauncher/main.c')
| -rw-r--r-- | Tools/EWebLauncher/main.c | 23 |
1 files changed, 5 insertions, 18 deletions
diff --git a/Tools/EWebLauncher/main.c b/Tools/EWebLauncher/main.c index 5f417d0..79bc043 100644 --- a/Tools/EWebLauncher/main.c +++ b/Tools/EWebLauncher/main.c @@ -483,14 +483,6 @@ on_focus_in(void *data, Evas *e, Evas_Object *obj, void *event_info) } static void -on_resized(void *data, Evas *e, Evas_Object *obj, void *event_info) -{ - Evas_Coord w, h; - evas_object_geometry_get(obj, NULL, NULL, &w, &h); - ewk_view_fixed_layout_size_set(obj, w, h); -} - -static void on_key_down(void *data, Evas *e, Evas_Object *obj, void *event_info) { Evas_Event_Key_Down *ev = (Evas_Event_Key_Down*) event_info; @@ -698,13 +690,14 @@ browserCreate(const char *url, const char *theme, const char *userAgent, Eina_Re evas_object_layer_set(app->bg, EVAS_LAYER_MIN); evas_object_show(app->bg); - if (backingStore && !strcasecmp(backingStore, "single")) { - app->browser = ewk_view_single_add(app->evas); - info("backing store: single\n"); - } else { + if (backingStore && !strcasecmp(backingStore, "tiled")) { app->browser = ewk_view_tiled_add(app->evas); info("backing store: tiled\n"); + } else { + app->browser = ewk_view_single_add(app->evas); + info("backing store: single\n"); } + ewk_view_theme_set(app->browser, theme); if (userAgent) ewk_view_setting_user_agent_set(app->browser, userAgent); @@ -730,7 +723,6 @@ browserCreate(const char *url, const char *theme, const char *userAgent, Eina_Re /* ewk_callback_resize_requested_add(app->browser, on_resize_requested, app->ee); */ - evas_object_event_callback_add(app->browser, EVAS_CALLBACK_RESIZE, on_resized, app); evas_object_event_callback_add(app->browser, EVAS_CALLBACK_KEY_DOWN, on_key_down, app); evas_object_event_callback_add(app->browser, EVAS_CALLBACK_MOUSE_DOWN, on_mouse_down, app); evas_object_event_callback_add(app->browser, EVAS_CALLBACK_FOCUS_IN, on_focus_in, app); @@ -830,7 +822,6 @@ main(int argc, char *argv[]) unsigned char quitOption = 0; unsigned char isFullscreen = 0; - unsigned char sudoWorkaround = 0; int args; Ecore_Getopt_Value values[] = { @@ -841,7 +832,6 @@ main(int argc, char *argv[]) ECORE_GETOPT_VALUE_PTR_CAST(geometry), ECORE_GETOPT_VALUE_STR(theme), ECORE_GETOPT_VALUE_STR(userAgent), - ECORE_GETOPT_VALUE_BOOL(sudoWorkaround), ECORE_GETOPT_VALUE_INT(verbose), ECORE_GETOPT_VALUE_BOOL(quitOption), ECORE_GETOPT_VALUE_BOOL(quitOption), @@ -872,9 +862,6 @@ main(int argc, char *argv[]) else url = (char*) default_url; - if (sudoWorkaround) - strcat(getenv("HOME"), "blah"); - themePath = findThemePath(theme); if (!themePath) return quit(EINA_FALSE, "ERROR: could not find theme.\n"); |