Changeset 129872 in webkit


Ignore:
Timestamp:
Sep 28, 2012 3:49:05 AM (12 years ago)
Author:
gyuyoung.kim@samsung.com
Message:

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

Source/WebCore:

WK2 layout test on debug is broken by this patch.

  • platform/efl/RunLoopEfl.cpp:

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

Source/WebKit2:

Broken debug WK2 layout test

  • PlatformEfl.cmake:
  • UIProcess/API/efl/EWebKit2.h:
  • UIProcess/API/efl/ewk_context.cpp:

(_Ewk_Context::_Ewk_Context):
(_Ewk_Context::~_Ewk_Context):

  • UIProcess/API/efl/ewk_main.cpp:

(ewk_init):
(ewk_shutdown):

  • UIProcess/API/efl/ewk_main.h: Added.
  • UIProcess/API/efl/ewk_main_private.h: Removed.
  • UIProcess/API/efl/tests/UnitTestUtils/EWK2UnitTestBase.cpp:

(EWK2UnitTest::EWK2UnitTestBase::SetUp):
(EWK2UnitTest::EWK2UnitTestBase::TearDown):

  • WebProcess/efl/WebProcessMainEfl.cpp:

(WebKit::WebProcessMainEfl):

Tools:

Broken debug WK2 layout test

  • MiniBrowser/efl/main.c:

(quit):
(main):

  • WebKitTestRunner/efl/PlatformWebViewEfl.cpp:

(WTR::initEcoreEvas):
(WTR::PlatformWebView::~PlatformWebView):

  • WebKitTestRunner/efl/main.cpp:

(main):

Location:
trunk
Files:
1 added
1 deleted
13 edited

Legend:

Unmodified
Added
Removed
  • trunk/Source/WebCore/ChangeLog

    r129869 r129872  
     12012-09-28  Gyuyoung Kim  <gyuyoung.kim@samsung.com>
     2
     3        Unreviewed, rolling out r129863.
     4        http://trac.webkit.org/changeset/129863
     5        https://bugs.webkit.org/show_bug.cgi?id=97173
     6
     7        WK2 layout test on debug is broken by this patch.
     8
     9        * platform/efl/RunLoopEfl.cpp:
     10        (WebCore::RunLoop::RunLoop):
     11        (WebCore::RunLoop::~RunLoop):
     12
    1132012-09-28  Vsevolod Vlasov  <vsevik@chromium.org>
    214
  • trunk/Source/WebCore/platform/efl/RunLoopEfl.cpp

    r129863 r129872  
    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

    r129871 r129872  
     12012-09-28  Gyuyoung Kim  <gyuyoung.kim@samsung.com>
     2
     3        Unreviewed, rolling out r129863.
     4        http://trac.webkit.org/changeset/129863
     5        https://bugs.webkit.org/show_bug.cgi?id=97173
     6
     7        Broken debug WK2 layout test
     8
     9        * PlatformEfl.cmake:
     10        * UIProcess/API/efl/EWebKit2.h:
     11        * UIProcess/API/efl/ewk_context.cpp:
     12        (_Ewk_Context::_Ewk_Context):
     13        (_Ewk_Context::~_Ewk_Context):
     14        * UIProcess/API/efl/ewk_main.cpp:
     15        (ewk_init):
     16        (ewk_shutdown):
     17        * UIProcess/API/efl/ewk_main.h: Added.
     18        * UIProcess/API/efl/ewk_main_private.h: Removed.
     19        * UIProcess/API/efl/tests/UnitTestUtils/EWK2UnitTestBase.cpp:
     20        (EWK2UnitTest::EWK2UnitTestBase::SetUp):
     21        (EWK2UnitTest::EWK2UnitTestBase::TearDown):
     22        * WebProcess/efl/WebProcessMainEfl.cpp:
     23        (WebKit::WebProcessMainEfl):
     24
    1252012-09-28  Christophe Dumez  <christophe.dumez@intel.com>
    226
  • trunk/Source/WebKit2/PlatformEfl.cmake

    r129863 r129872  
    221221    "${CMAKE_CURRENT_SOURCE_DIR}/UIProcess/API/efl/ewk_intent.h"
    222222    "${CMAKE_CURRENT_SOURCE_DIR}/UIProcess/API/efl/ewk_intent_service.h"
     223    "${CMAKE_CURRENT_SOURCE_DIR}/UIProcess/API/efl/ewk_main.h"
    223224    "${CMAKE_CURRENT_SOURCE_DIR}/UIProcess/API/efl/ewk_navigation_policy_decision.h"
    224225    "${CMAKE_CURRENT_SOURCE_DIR}/UIProcess/API/efl/ewk_popup_menu_item.h"
  • trunk/Source/WebKit2/UIProcess/API/efl/EWebKit2.h

    r129863 r129872  
    3737#include "ewk_intent.h"
    3838#include "ewk_intent_service.h"
     39#include "ewk_main.h"
    3940#include "ewk_navigation_policy_decision.h"
    4041#include "ewk_popup_menu_item.h"
  • trunk/Source/WebKit2/UIProcess/API/efl/ewk_context.cpp

    r129864 r129872  
    3737#include "ewk_download_job.h"
    3838#include "ewk_download_job_private.h"
    39 #include "ewk_main_private.h"
    4039#include <WebCore/FileSystem.h>
    4140#include <wtf/HashMap.h>
     
    8786        , requestManager(WKContextGetSoupRequestManager(contextRef.get()))
    8887    {
    89         ewk_init();
    90 
    9188#if ENABLE(BATTERY_STATUS)
    9289        WKBatteryManagerRef wkBatteryManager = WKContextGetBatteryManager(contextRef.get());
     
    127124        for ( ; it != end; ++it)
    128125            ewk_download_job_unref(it->second);
    129 
    130         ewk_shutdown();
    131126    }
    132127};
  • trunk/Source/WebKit2/UIProcess/API/efl/ewk_main.cpp

    r129863 r129872  
    2121
    2222#include "config.h"
     23#include "ewk_main.h"
    2324
    2425#include "ewk_private.h"
     
    3940int _ewk_log_dom = -1;
    4041
    41 /**
    42  * @internal
    43  * Initializes WebKit's instance.
    44  * - initializes components needed by EFL,
    45  * - increases a reference count of WebKit's instance.
    46  * Returns a reference count of WebKit's instance on success or 0 on failure
    47  */
    4842int ewk_init(void)
    4943{
     
    7569    }
    7670
    77     if (!edje_init()) {
    78         CRITICAL("could not init edje.");
    79         goto error_edje;
    80     }
    81 
    8271    g_type_init();
    8372
     
    8978    return ++_ewkInitCount;
    9079
    91 error_edje:
    92     ecore_evas_shutdown();
    9380error_ecore_evas:
    9481    ecore_shutdown();
     
    10491}
    10592
    106 /**
    107  * @internal
    108  * Decreases a reference count of WebKit's instance, possibly destroying it.
    109  * If the reference count reaches 0, WebKit's instance is destroyed.
    110  * Returns a reference count of WebKit's instance
    111  */
    11293int ewk_shutdown(void)
    11394{
     
    11596        return _ewkInitCount;
    11697
    117     edje_shutdown();
    11898    ecore_evas_shutdown();
    11999    ecore_shutdown();
  • trunk/Source/WebKit2/UIProcess/API/efl/tests/UnitTestUtils/EWK2UnitTestBase.cpp

    r129863 r129872  
    4646void EWK2UnitTestBase::SetUp()
    4747{
    48     ASSERT_GT(ecore_evas_init(), 0);
     48    ewk_init();
    4949
    5050    unsigned int width = environment->defaultWidth();
     
    7272    evas_object_del(m_webView);
    7373    ecore_evas_free(m_ecoreEvas);
    74     ecore_evas_shutdown();
     74    ewk_shutdown();
    7575}
    7676
  • trunk/Source/WebKit2/WebProcess/efl/WebProcessMainEfl.cpp

    r129863 r129872  
    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
  • trunk/Tools/ChangeLog

    r129870 r129872  
     12012-09-28  Gyuyoung Kim  <gyuyoung.kim@samsung.com>
     2
     3        Unreviewed, rolling out r129863.
     4        http://trac.webkit.org/changeset/129863
     5        https://bugs.webkit.org/show_bug.cgi?id=97173
     6
     7        Broken debug WK2 layout test
     8
     9        * MiniBrowser/efl/main.c:
     10        (quit):
     11        (main):
     12        * WebKitTestRunner/efl/PlatformWebViewEfl.cpp:
     13        (WTR::initEcoreEvas):
     14        (WTR::PlatformWebView::~PlatformWebView):
     15        * WebKitTestRunner/efl/main.cpp:
     16        (main):
     17
    1182012-09-28  Kai Koehne  <kai.koehne@digia.com>
    219
  • trunk/Tools/MiniBrowser/efl/main.c

    r129863 r129872  
    201201quit(Eina_Bool success, const char *msg)
    202202{
    203     ecore_evas_shutdown();
     203    ewk_shutdown();
    204204
    205205    if (msg)
     
    269269    };
    270270
    271     if (!ecore_evas_init())
     271    if (!ewk_init())
    272272        return EXIT_FAILURE;
    273273
  • trunk/Tools/WebKitTestRunner/efl/PlatformWebViewEfl.cpp

    r129863 r129872  
    3333static Ecore_Evas* initEcoreEvas()
    3434{
    35     if (!ecore_evas_init())
    36         return 0;
    37 
    3835    Ecore_Evas* ecoreEvas = useX11Window ? ecore_evas_new(0, 0, 0, 800, 600, 0) : ecore_evas_buffer_new(800, 600);
    3936    if (!ecoreEvas)
     
    6158    evas_object_del(m_view);
    6259    ecore_evas_free(m_window);
    63     ecore_evas_shutdown();
    6460}
    6561
  • trunk/Tools/WebKitTestRunner/efl/main.cpp

    r129863 r129872  
    3333    WTFInstallReportBacktraceOnCrashHook();
    3434
     35    if (!ewk_init())
     36        return 1;
     37
    3538#ifdef HAVE_ECORE_X
    3639    const char* display = getenv("DISPLAY");
    37     int initialized = 0;
     40    int intialized = 0;
    3841    if (display) {
    39         initialized = ecore_x_init(0);
    40         if (!initialized)
     42        intialized = ecore_x_init(0);
     43        if (!intialized) {
     44            ewk_shutdown();
    4145            return 1;
     46        }
    4247    }
    4348#endif
     
    4752
    4853#ifdef HAVE_ECORE_X
    49     if (initialized)
     54    if (intialized)
    5055        ecore_x_shutdown();
    5156#endif
     57
     58    ewk_shutdown();
    5259
    5360    return 0;
Note: See TracChangeset for help on using the changeset viewer.