Changeset 131349 in webkit


Ignore:
Timestamp:
Oct 15, 2012 1:36:24 PM (12 years ago)
Author:
commit-queue@webkit.org
Message:

[EFL][WK2] Refactoring initialization and shutdown codes of EFL libraries.
​https://bugs.webkit.org/show_bug.cgi?id=97173

Patch by Eunmi Lee <​eunmi15.lee@samsung.com> on 2012-10-15
Reviewed by Gyuyoung Kim.

Source/WebCore:

Remove codes to initialize and shutdown the EFL libraries from
RunLoopEfl.cpp. Initialization and shutdown will be done in the
ewk_main.cpp for ui process and WebProcessMainEfl.cpp for web
process.

No new tests. This patch doesn't change behavior.

  • platform/efl/RunLoopEfl.cpp:

(WebCore::RunLoop::RunLoop):
(WebCore::RunLoop::~RunLoop):

Source/WebKit2:

Initialize and shutdown the EFL libraries in the ewk_main.cpp for ui
process and WebProcessMainEfl.cpp for web process.

  • UIProcess/API/efl/ewk_main.cpp:

(ewk_init):
(ewk_shutdown):

  • WebProcess/efl/WebProcessMainEfl.cpp:

(WebKit::WebProcessMainEfl):

Location:
trunk/Source
Files:
5 edited

Legend:

Unmodified
Added
Removed

  • trunk/Source/WebCore/ChangeLog

    r131348 r131349  
     12012-10-15  Eunmi Lee  <eunmi15.lee@samsung.com>
     2
     3        [EFL][WK2] Refactoring initialization and shutdown codes of EFL libraries.
     4        https://bugs.webkit.org/show_bug.cgi?id=97173
     5
     6        Reviewed by Gyuyoung Kim.
     7
     8        Remove codes to initialize and shutdown the EFL libraries from
     9        RunLoopEfl.cpp. Initialization and shutdown will be done in the
     10        ewk_main.cpp for ui process and WebProcessMainEfl.cpp for web
     11        process.
     12
     13        No new tests. This patch doesn't change behavior.
     14
     15        * platform/efl/RunLoopEfl.cpp:
     16        (WebCore::RunLoop::RunLoop):
     17        (WebCore::RunLoop::~RunLoop):
     18
    1192012-10-15  Mihnea Ovidenie  <mihnea@adobe.com>
    220

  • trunk/Source/WebCore/platform/efl/RunLoopEfl.cpp

    r130622 r131349  
    2929
    3030#include <Ecore.h>
    31 #include <Ecore_Evas.h>
    32 #include <Ecore_File.h>
    33 #include <Edje.h>
    3431#include <wtf/OwnPtr.h>
    3532#include <wtf/PassOwnPtr.h>
    … …  
    4340    : m_initEfl(false)
    4441{
    45     if (!ecore_init()) {
    46         LOG_ERROR("could not init ecore.");
    47         return;
    48     }
    49 
    50     if (!ecore_evas_init()) {
    51         LOG_ERROR("could not init ecore_evas.");
    52         goto errorEcoreEvas;
    53     }
    54 
    55     if (!ecore_file_init()) {
    56         LOG_ERROR("could not init ecore_file.");
    57         goto errorEcoreFile;
    58     }
    59 
    60     if (!edje_init()) {
    61         LOG_ERROR("could not init edje.");
    62         goto errorEdje;
    63     }
    64 
    6542    m_pipe = adoptPtr(ecore_pipe_add(wakeUpEvent, this));
    6643    m_initEfl = true;
    67 
    68     return;
    69 
    70 errorEdje:
    71     ecore_file_shutdown();
    72 errorEcoreFile:
    73     ecore_evas_shutdown();
    74 errorEcoreEvas:
    75     ecore_shutdown();
    7644}
    7745
    7846RunLoop::~RunLoop()
    7947{
    80     if (m_initEfl) {
    81         edje_shutdown();
    82         ecore_file_shutdown();
    83         ecore_evas_shutdown();
    84         ecore_shutdown();
    85     }
    8648}
    8749

  • trunk/Source/WebKit2/ChangeLog

    r131347 r131349  
     12012-10-15  Eunmi Lee  <eunmi15.lee@samsung.com>
     2
     3        [EFL][WK2] Refactoring initialization and shutdown codes of EFL libraries.
     4        https://bugs.webkit.org/show_bug.cgi?id=97173
     5
     6        Reviewed by Gyuyoung Kim.
     7
     8        Initialize and shutdown the EFL libraries in the ewk_main.cpp for ui
     9        process and WebProcessMainEfl.cpp for web process.
     10
     11        * UIProcess/API/efl/ewk_main.cpp:
     12        (ewk_init):
     13        (ewk_shutdown):
     14        * WebProcess/efl/WebProcessMainEfl.cpp:
     15        (WebKit::WebProcessMainEfl):
     16
    1172012-10-15  Jinwoo Song  <jinwoo7.song@samsung.com>
    218

  • trunk/Source/WebKit2/UIProcess/API/efl/ewk_main.cpp

    r130390 r131349  
    8080#endif
    8181
     82    if (!edje_init()) {
     83        CRITICAL("could not init edje.");
     84        goto error_edje;
     85    }
     86
    8287    g_type_init();
    8388
    … …  
    9095
    9196#ifdef HAVE_ECORE_X
     97error_edje:
     98    ecore_x_shutdown();
    9299error_ecore_x:
     100    ecore_evas_shutdown();
     101#else
     102error_edje:
    93103    ecore_evas_shutdown();
    94104#endif
    … …  
    111121        return _ewkInitCount;
    112122
     123    edje_shutdown();
    113124#ifdef HAVE_ECORE_X
    114125    ecore_x_shutdown();

  • trunk/Source/WebKit2/WebProcess/efl/WebProcessMainEfl.cpp

    r129872 r131349  
    3232#include "WKBase.h"
    3333#include <Ecore.h>
     34#include <Ecore_Evas.h>
     35#include <Edje.h>
    3436#include <Efreet.h>
    3537#include <WebCore/ResourceHandle.h>
    … …  
    6163    if (!ecore_init()) {
    6264        // Could not init ecore.
     65        eina_shutdown();
     66        return 1;
     67    }
     68
     69    if (!ecore_evas_init()) {
     70        ecore_shutdown();
     71        eina_shutdown();
     72        return 1;
     73    }
     74
     75    if (!edje_init()) {
     76        ecore_evas_shutdown();
     77        ecore_shutdown();
    6378        eina_shutdown();
    6479        return 1;
    … …  
    106121    g_object_unref(soupCache);
    107122
     123    edje_shutdown();
     124    ecore_evas_shutdown();
     125    ecore_shutdown();
     126    eina_shutdown();
     127
    108128    return 0;
    109129
Note: See TracChangeset for help on using the changeset viewer.