* limitations under the License.
*/
-#include <ewk_chromium.h>
+#include <EWebKit.h>
+#include <EWebKit_internal.h>
#include <Elementary.h>
#include "common/command_line.h"
#include "common/logger.h"
#include "common/profiler.h"
+#include "extensions/renderer/xwalk_extension_renderer_controller.h"
#include "runtime/browser/runtime.h"
#include "runtime/common/constants.h"
#include "runtime/browser/prelauncher.h"
#include "runtime/browser/preload_manager.h"
+#include "runtime/browser/ui_runtime.h"
+
+using namespace extensions;
bool g_prelaunch = false;
#ifdef WATCH_FACE_FEATURE_SUPPORT
#ifdef WATCH_FACE_FEATURE_SUPPORT
} else {
if (appdata->app_type() == common::ApplicationData::WATCH) {
- ecore_wl_shutdown();
- ecore_wl_init(NULL);
+ // Below code will be enabled after testing
+ //ecore_wl_shutdown();
+ //ecore_wl_init(NULL);
}
#endif // WATCH_FACE_FEATURE_SUPPORT
}
std::unique_ptr<runtime::Runtime> runtime =
runtime::Runtime::MakeRuntime(appdata);
ret = runtime->Exec(argc, argv);
+ if (ret)
+ LOGGER(ERROR) << "Exec returns non zero.";
+ LOGGER(DEBUG) << "plugin_session_count : " <<
+ XWalkExtensionRendererController::plugin_session_count;
+ if (XWalkExtensionRendererController::plugin_session_count > 0) {
+ LOGGER(DEBUG) << "Defer termination of main loop";
+ ecore_main_loop_begin();
+ }
runtime.reset();
}
+ LOGGER(DEBUG) << "ewk_shutdown";
ewk_shutdown();
- exit(ret);
+ elm_shutdown();
+ elm_exit();
+ LOGGER(DEBUG) << "EXIT_SUCCESS";
return EXIT_SUCCESS;
}