Changeset 85625 in webkit

Timestamp:

May 3, 2011 11:15:51 AM (13 years ago)

Author:

demarchi@webkit.org

Message:

2011-05-03 Lucas De Marchi <​lucas.demarchi@profusion.mobi>

Unreviewed, rolling out r85471.
​http://trac.webkit.org/changeset/85471
​https://bugs.webkit.org/show_bug.cgi?id=59922

The rule of thumb in EFL is that you init in all the places
you use it. So, if in your application you call ecore_evas_*
functions, you have to call ecore_evas_init() first.

• EWebLauncher/main.c: always call *_init() functions when you use that namespace. (quit): (main):

Location:

trunk/Tools

Files:

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

trunk/Tools/ChangeLog

@@ +1 @@
+2011-05-03  Lucas De Marchi  <lucas.demarchi@profusion.mobi>
+
+        Unreviewed, rolling out r85471.
+        http://trac.webkit.org/changeset/85471
+        https://bugs.webkit.org/show_bug.cgi?id=59922
+
+        The rule of thumb in EFL is that you init in all the places
+        you use it. So, if in your application you call ecore_evas_*
+        functions, you have to call ecore_evas_init() first.
+
+        * EWebLauncher/main.c: always call *_init() functions when you use
+        that namespace.
+        (quit):
+        (main):
+
 2011-05-02  Ojan Vafai  <ojan@chromium.org>
 

trunk/Tools/EWebLauncher/main.c

@@ -635 +635 @@
 quit(Eina_Bool success, const char *msg)
 {
-    ewk_shutdown();
+    edje_shutdown();
+    ecore_evas_shutdown();
 
     if (msg)
@@ -846 +847 @@
     };
 
-    if (!ewk_init())
-        return quit(EINA_FALSE, "ERROR: could not initialize ewk.\n");
+    if (!ecore_evas_init())
+        return EXIT_FAILURE;
+
+    if (!edje_init()) {
+        ecore_evas_shutdown();
+        return EXIT_FAILURE;
+    }
 
     ecore_app_args_set(argc, (const char**) argv);
@@ -867 +873 @@
         return quit(EINA_FALSE, "ERROR: could not find theme.\n");
 
+    ewk_init();
     tmp = getenv("TMPDIR");
     if (!tmp)
@@ -884 +891 @@
     ecore_main_loop_begin();
 
+    ewk_shutdown();
+
     return quit(EINA_TRUE, NULL);
 }