Changeset 129872 in webkit
- Timestamp:
- Sep 28, 2012 3:49:05 AM (12 years ago)
- Location:
- trunk
- Files:
-
- 1 added
- 1 deleted
- 13 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/Source/WebCore/ChangeLog
r129869 r129872 1 2012-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 1 13 2012-09-28 Vsevolod Vlasov <vsevik@chromium.org> 2 14 -
trunk/Source/WebCore/platform/efl/RunLoopEfl.cpp
r129863 r129872 29 29 30 30 #include <Ecore.h> 31 #include <Ecore_Evas.h> 32 #include <Ecore_File.h> 33 #include <Edje.h> 31 34 #include <wtf/OwnPtr.h> 32 35 #include <wtf/PassOwnPtr.h> … … 40 43 : m_initEfl(false) 41 44 { 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 42 65 m_pipe = adoptPtr(ecore_pipe_add(wakeUpEvent, this)); 43 66 m_initEfl = true; 67 68 return; 69 70 errorEdje: 71 ecore_file_shutdown(); 72 errorEcoreFile: 73 ecore_evas_shutdown(); 74 errorEcoreEvas: 75 ecore_shutdown(); 44 76 } 45 77 46 78 RunLoop::~RunLoop() 47 79 { 80 if (m_initEfl) { 81 edje_shutdown(); 82 ecore_file_shutdown(); 83 ecore_evas_shutdown(); 84 ecore_shutdown(); 85 } 48 86 } 49 87 -
trunk/Source/WebKit2/ChangeLog
r129871 r129872 1 2012-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 1 25 2012-09-28 Christophe Dumez <christophe.dumez@intel.com> 2 26 -
trunk/Source/WebKit2/PlatformEfl.cmake
r129863 r129872 221 221 "${CMAKE_CURRENT_SOURCE_DIR}/UIProcess/API/efl/ewk_intent.h" 222 222 "${CMAKE_CURRENT_SOURCE_DIR}/UIProcess/API/efl/ewk_intent_service.h" 223 "${CMAKE_CURRENT_SOURCE_DIR}/UIProcess/API/efl/ewk_main.h" 223 224 "${CMAKE_CURRENT_SOURCE_DIR}/UIProcess/API/efl/ewk_navigation_policy_decision.h" 224 225 "${CMAKE_CURRENT_SOURCE_DIR}/UIProcess/API/efl/ewk_popup_menu_item.h" -
trunk/Source/WebKit2/UIProcess/API/efl/EWebKit2.h
r129863 r129872 37 37 #include "ewk_intent.h" 38 38 #include "ewk_intent_service.h" 39 #include "ewk_main.h" 39 40 #include "ewk_navigation_policy_decision.h" 40 41 #include "ewk_popup_menu_item.h" -
trunk/Source/WebKit2/UIProcess/API/efl/ewk_context.cpp
r129864 r129872 37 37 #include "ewk_download_job.h" 38 38 #include "ewk_download_job_private.h" 39 #include "ewk_main_private.h"40 39 #include <WebCore/FileSystem.h> 41 40 #include <wtf/HashMap.h> … … 87 86 , requestManager(WKContextGetSoupRequestManager(contextRef.get())) 88 87 { 89 ewk_init();90 91 88 #if ENABLE(BATTERY_STATUS) 92 89 WKBatteryManagerRef wkBatteryManager = WKContextGetBatteryManager(contextRef.get()); … … 127 124 for ( ; it != end; ++it) 128 125 ewk_download_job_unref(it->second); 129 130 ewk_shutdown();131 126 } 132 127 }; -
trunk/Source/WebKit2/UIProcess/API/efl/ewk_main.cpp
r129863 r129872 21 21 22 22 #include "config.h" 23 #include "ewk_main.h" 23 24 24 25 #include "ewk_private.h" … … 39 40 int _ewk_log_dom = -1; 40 41 41 /**42 * @internal43 * 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 failure47 */48 42 int ewk_init(void) 49 43 { … … 75 69 } 76 70 77 if (!edje_init()) {78 CRITICAL("could not init edje.");79 goto error_edje;80 }81 82 71 g_type_init(); 83 72 … … 89 78 return ++_ewkInitCount; 90 79 91 error_edje:92 ecore_evas_shutdown();93 80 error_ecore_evas: 94 81 ecore_shutdown(); … … 104 91 } 105 92 106 /**107 * @internal108 * 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 instance111 */112 93 int ewk_shutdown(void) 113 94 { … … 115 96 return _ewkInitCount; 116 97 117 edje_shutdown();118 98 ecore_evas_shutdown(); 119 99 ecore_shutdown(); -
trunk/Source/WebKit2/UIProcess/API/efl/tests/UnitTestUtils/EWK2UnitTestBase.cpp
r129863 r129872 46 46 void EWK2UnitTestBase::SetUp() 47 47 { 48 ASSERT_GT(ecore_evas_init(), 0);48 ewk_init(); 49 49 50 50 unsigned int width = environment->defaultWidth(); … … 72 72 evas_object_del(m_webView); 73 73 ecore_evas_free(m_ecoreEvas); 74 e core_evas_shutdown();74 ewk_shutdown(); 75 75 } 76 76 -
trunk/Source/WebKit2/WebProcess/efl/WebProcessMainEfl.cpp
r129863 r129872 32 32 #include "WKBase.h" 33 33 #include <Ecore.h> 34 #include <Ecore_Evas.h>35 #include <Edje.h>36 34 #include <Efreet.h> 37 35 #include <WebCore/ResourceHandle.h> … … 63 61 if (!ecore_init()) { 64 62 // 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();78 63 eina_shutdown(); 79 64 return 1; … … 121 106 g_object_unref(soupCache); 122 107 123 edje_shutdown();124 ecore_evas_shutdown();125 ecore_shutdown();126 eina_shutdown();127 128 108 return 0; 129 109 -
trunk/Tools/ChangeLog
r129870 r129872 1 2012-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 1 18 2012-09-28 Kai Koehne <kai.koehne@digia.com> 2 19 -
trunk/Tools/MiniBrowser/efl/main.c
r129863 r129872 201 201 quit(Eina_Bool success, const char *msg) 202 202 { 203 e core_evas_shutdown();203 ewk_shutdown(); 204 204 205 205 if (msg) … … 269 269 }; 270 270 271 if (!e core_evas_init())271 if (!ewk_init()) 272 272 return EXIT_FAILURE; 273 273 -
trunk/Tools/WebKitTestRunner/efl/PlatformWebViewEfl.cpp
r129863 r129872 33 33 static Ecore_Evas* initEcoreEvas() 34 34 { 35 if (!ecore_evas_init())36 return 0;37 38 35 Ecore_Evas* ecoreEvas = useX11Window ? ecore_evas_new(0, 0, 0, 800, 600, 0) : ecore_evas_buffer_new(800, 600); 39 36 if (!ecoreEvas) … … 61 58 evas_object_del(m_view); 62 59 ecore_evas_free(m_window); 63 ecore_evas_shutdown();64 60 } 65 61 -
trunk/Tools/WebKitTestRunner/efl/main.cpp
r129863 r129872 33 33 WTFInstallReportBacktraceOnCrashHook(); 34 34 35 if (!ewk_init()) 36 return 1; 37 35 38 #ifdef HAVE_ECORE_X 36 39 const char* display = getenv("DISPLAY"); 37 int in itialized = 0;40 int intialized = 0; 38 41 if (display) { 39 initialized = ecore_x_init(0); 40 if (!initialized) 42 intialized = ecore_x_init(0); 43 if (!intialized) { 44 ewk_shutdown(); 41 45 return 1; 46 } 42 47 } 43 48 #endif … … 47 52 48 53 #ifdef HAVE_ECORE_X 49 if (in itialized)54 if (intialized) 50 55 ecore_x_shutdown(); 51 56 #endif 57 58 ewk_shutdown(); 52 59 53 60 return 0;
Note: See TracChangeset
for help on using the changeset viewer.