Changeset 130658 in webkit

Timestamp:

Oct 8, 2012, 11:23:05 AM (14 years ago)

Author:

commit-queue@webkit.org

Message:

[EFL][WK2] Simplify frame flattening support in MiniBrowser
​https://bugs.webkit.org/show_bug.cgi?id=98657

Patch by Christophe Dumez <Christophe Dumez> on 2012-10-08
Reviewed by Kenneth Rohde Christiansen.

Simplify frame flattening support code in MiniBrowser to
avoid passing the setting around to window_create()
function().

• MiniBrowser/efl/main.c:

(on_key_down):
(on_new_window):
(window_create):
(main):

Location:

trunk/Tools

Files:

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

trunk/Tools/ChangeLog

@@ +1 @@
+2012-10-08  Christophe Dumez  <christophe.dumez@intel.com>
+
+        [EFL][WK2] Simplify frame flattening support in MiniBrowser
+        https://bugs.webkit.org/show_bug.cgi?id=98657
+
+        Reviewed by Kenneth Rohde Christiansen.
+
+        Simplify frame flattening support code in MiniBrowser to
+        avoid passing the setting around to window_create()
+        function().
+
+        * MiniBrowser/efl/main.c:
+        (on_key_down):
+        (on_new_window):
+        (window_create):
+        (main):
+
 2012-10-08  Christophe Dumez  <christophe.dumez@intel.com>
 

trunk/Tools/MiniBrowser/efl/main.c

@@ -40 +40 @@
 static Eina_List *windows = NULL;
 static char *evas_engine_name = NULL;
+static Eina_Bool frame_flattening_enabled = EINA_FALSE;
 
 typedef struct _Browser_Window {
@@ -73 +74 @@
 };
 
-static Browser_Window *window_create(const char *url, Eina_Bool frame_flattening);
+static Browser_Window *window_create(const char *url);
 
 static Browser_Window *browser_window_find(Ecore_Evas *ee)
@@ -170 +171 @@
     } else if (!strcmp(ev->key, "n") && ctrlPressed) {
         info("Create new window (Ctrl+n) was pressed.\n");
-        Browser_Window *window = window_create(DEFAULT_URL, EINA_FALSE);
+        Browser_Window *window = window_create(DEFAULT_URL);
         windows = eina_list_append(windows, window);
     }
@@ -226 +227 @@
 {
     Evas_Object **new_view = (Evas_Object **)event_info;
-    Browser_Window *window = window_create(NULL, EINA_FALSE);
+    Browser_Window *window = window_create(NULL);
     *new_view = window->webview;
     windows = eina_list_append(windows, window);
@@ -304 +305 @@
 }
 
-static Browser_Window *window_create(const char *url, Eina_Bool frame_flattening)
+static Browser_Window *window_create(const char *url)
 {
     Browser_Window *window = malloc(sizeof(Browser_Window));
@@ -335 +336 @@
     window->webview = ewk_view_add(window->evas);
     ewk_view_theme_set(window->webview, THEME_DIR"/default.edj");
-    ewk_settings_enable_frame_flattening_set(ewk_view_settings_get(window->webview), frame_flattening);
+    ewk_settings_enable_frame_flattening_set(ewk_view_settings_get(window->webview), frame_flattening_enabled);
 
     Ewk_Settings *settings = ewk_view_settings_get(window->webview);
@@ -372 +373 @@
     Browser_Window *window;
 
-    Eina_Bool frame_flattening = EINA_FALSE;
-
     Ecore_Getopt_Value values[] = {
         ECORE_GETOPT_VALUE_STR(evas_engine_name),
         ECORE_GETOPT_VALUE_BOOL(quitOption),
-        ECORE_GETOPT_VALUE_BOOL(frame_flattening),
+        ECORE_GETOPT_VALUE_BOOL(frame_flattening_enabled),
         ECORE_GETOPT_VALUE_BOOL(quitOption),
         ECORE_GETOPT_VALUE_BOOL(quitOption),
@@ -398 +397 @@
     if (args < argc) {
         char *url = url_from_user_input(argv[args]);
-        window = window_create(url, frame_flattening);
+        window = window_create(url);
         free(url);
     } else
-        window = window_create(DEFAULT_URL, frame_flattening);
+        window = window_create(DEFAULT_URL);
 
     if (!window)