diff options
| author | Simon Hausmann <simon.hausmann@digia.com> | 2012-11-29 12:18:48 +0100 |
|---|---|---|
| committer | Simon Hausmann <simon.hausmann@digia.com> | 2012-11-29 12:18:57 +0100 |
| commit | 4c01d0526ba4dd8cff0c0ff22a6f0ab5eb973064 (patch) | |
| tree | bed2fe914fe0f7ec70abfb47d2d84af8a3604d09 /Tools/MiniBrowser | |
| parent | 01485457c9a5da3f1121015afd25bb53af77662e (diff) | |
| download | qtwebkit-4c01d0526ba4dd8cff0c0ff22a6f0ab5eb973064.tar.gz | |
Imported WebKit commit c60cfe0fc09efd257aa0111d7b133b02deb8a63e (http://svn.webkit.org/repository/webkit/trunk@136119)
New snapshot that includes the fix for installing the QtWebProcess into libexec
Change-Id: I01344e079cbdac5678c4cba6ffcc05f4597cf0d7
Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
Diffstat (limited to 'Tools/MiniBrowser')
| -rw-r--r-- | Tools/MiniBrowser/efl/main.c | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/Tools/MiniBrowser/efl/main.c b/Tools/MiniBrowser/efl/main.c index 768e9ca33..ac38b7ec5 100644 --- a/Tools/MiniBrowser/efl/main.c +++ b/Tools/MiniBrowser/efl/main.c @@ -41,6 +41,7 @@ static Eina_List *windows = NULL; static char *evas_engine_name = NULL; static Eina_Bool encoding_detector_enabled = EINA_FALSE; static Eina_Bool frame_flattening_enabled = EINA_FALSE; +static Eina_Bool local_storage_enabled = EINA_TRUE; static int window_width = 800; static int window_height = 600; /* Default value of device_pixel_ratio is '0' so that we don't set custom device @@ -78,9 +79,9 @@ static const Ecore_Getopt options = { "MiniBrowser", "%prog [options] [url]", "0.0.1", - "(C)2012 Samsung Electronics\n", + "(C)2012 Samsung Electronics\n (C)2012 Intel Corporation\n", "", - "Test Web Browser using the Enlightenment Foundation Libraries of WebKit2", + "Test Web Browser using the Enlightenment Foundation Libraries (EFL) port of WebKit2", EINA_TRUE, { ECORE_GETOPT_STORE_STR ('e', "engine", "ecore-evas engine to use."), @@ -95,6 +96,8 @@ static const Ecore_Getopt options = { ('c', "encoding-detector", "enable/disable encoding detector", EINA_FALSE), ECORE_GETOPT_STORE_DEF_BOOL ('f', "flattening", "frame flattening.", EINA_FALSE), + ECORE_GETOPT_STORE_DEF_BOOL + ('l', "local-storage", "HTML5 local storage support (enabled by default).", EINA_TRUE), ECORE_GETOPT_VERSION ('V', "version"), ECORE_GETOPT_COPYRIGHT @@ -1063,6 +1066,8 @@ static Browser_Window *window_create(const char *url, int width, int height) ewk_settings_file_access_from_file_urls_allowed_set(settings, EINA_TRUE); ewk_settings_encoding_detector_enabled_set(settings, encoding_detector_enabled); ewk_settings_frame_flattening_enabled_set(settings, frame_flattening_enabled); + ewk_settings_local_storage_enabled_set(settings, local_storage_enabled); + info("HTML5 local storage is %s for this view.\n", local_storage_enabled ? "enabled" : "disabled"); ewk_settings_developer_extras_enabled_set(settings, EINA_TRUE); ewk_settings_preferred_minimum_contents_width_set(settings, 0); @@ -1139,6 +1144,7 @@ elm_main(int argc, char *argv[]) ECORE_GETOPT_VALUE_BOOL(quitOption), ECORE_GETOPT_VALUE_BOOL(encoding_detector_enabled), ECORE_GETOPT_VALUE_BOOL(frame_flattening_enabled), + ECORE_GETOPT_VALUE_BOOL(local_storage_enabled), ECORE_GETOPT_VALUE_BOOL(quitOption), ECORE_GETOPT_VALUE_BOOL(quitOption), ECORE_GETOPT_VALUE_BOOL(quitOption), |