Changeset 131412 in webkit


Ignore:
Timestamp:
Oct 15, 2012 10:16:55 PM (12 years ago)
Author:
gyuyoung.kim@samsung.com
Message:

Unreviewed, rolling out r131349.
​http://trac.webkit.org/changeset/131349
​https://bugs.webkit.org/show_bug.cgi?id=97173

Revert r131349 because API test is broken by this commit.

Source/WebCore:

  • platform/efl/RunLoopEfl.cpp:

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

Source/WebKit2:

  • 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

    r131411 r131412  
     12012-10-15  Gyuyoung Kim  <gyuyoung.kim@samsung.com>
     2
     3        Unreviewed, rolling out r131349.
     4        http://trac.webkit.org/changeset/131349
     5        https://bugs.webkit.org/show_bug.cgi?id=97173
     6
     7        Revert r131349 because API test is broken by this commit.
     8
     9        * platform/efl/RunLoopEfl.cpp:
     10        (WebCore::RunLoop::RunLoop):
     11        (WebCore::RunLoop::~RunLoop):
     12
    1132012-10-15  Nate Chapin  <japhet@chromium.org>
    214

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

    r131349 r131412  
    2929
    3030#include <Ecore.h>
     31#include <Ecore_Evas.h>
     32#include <Ecore_File.h>
     33#include <Edje.h>
    3134#include <wtf/OwnPtr.h>
    3235#include <wtf/PassOwnPtr.h>
    … …  
    4043    : m_initEfl(false)
    4144{
     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
    4265    m_pipe = adoptPtr(ecore_pipe_add(wakeUpEvent, this));
    4366    m_initEfl = true;
     67
     68    return;
     69
     70errorEdje:
     71    ecore_file_shutdown();
     72errorEcoreFile:
     73    ecore_evas_shutdown();
     74errorEcoreEvas:
     75    ecore_shutdown();
    4476}
    4577
    4678RunLoop::~RunLoop()
    4779{
     80    if (m_initEfl) {
     81        edje_shutdown();
     82        ecore_file_shutdown();
     83        ecore_evas_shutdown();
     84        ecore_shutdown();
     85    }
    4886}
    4987

  • trunk/Source/WebKit2/ChangeLog

    r131401 r131412  
     12012-10-15  Gyuyoung Kim  <gyuyoung.kim@samsung.com>
     2
     3        Unreviewed, rolling out r131349.
     4        http://trac.webkit.org/changeset/131349
     5        https://bugs.webkit.org/show_bug.cgi?id=97173
     6
     7        Revert r131349 because API test is broken by this commit.
     8
     9        * UIProcess/API/efl/ewk_main.cpp:
     10        (ewk_init):
     11        (ewk_shutdown):
     12        * WebProcess/efl/WebProcessMainEfl.cpp:
     13        (WebKit::WebProcessMainEfl):
     14
    1152012-10-15  Jongseok Yang  <js45.yang@samsung.com>
    216

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

    r131349 r131412  
    8080#endif
    8181
    82     if (!edje_init()) {
    83         CRITICAL("could not init edje.");
    84         goto error_edje;
    85     }
    86 
    8782    g_type_init();
    8883
    … …  
    9590
    9691#ifdef HAVE_ECORE_X
    97 error_edje:
    98     ecore_x_shutdown();
    9992error_ecore_x:
    100     ecore_evas_shutdown();
    101 #else
    102 error_edje:
    10393    ecore_evas_shutdown();
    10494#endif
    … …  
    121111        return _ewkInitCount;
    122112
    123     edje_shutdown();
    124113#ifdef HAVE_ECORE_X
    125114    ecore_x_shutdown();

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

    r131349 r131412  
    3232#include "WKBase.h"
    3333#include <Ecore.h>
    34 #include <Ecore_Evas.h>
    35 #include <Edje.h>
    3634#include <Efreet.h>
    3735#include <WebCore/ResourceHandle.h>
    … …  
    6361    if (!ecore_init()) {
    6462        // 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();
    7863        eina_shutdown();
    7964        return 1;
    … …  
    121106    g_object_unref(soupCache);
    122107
    123     edje_shutdown();
    124     ecore_evas_shutdown();
    125     ecore_shutdown();
    126     eina_shutdown();
    127 
    128108    return 0;
    129109
Note: See TracChangeset for help on using the changeset viewer.