[M67 dev] Hotfix for fixing crashes during web app bringup

Below changes are needed temporarily for fixing crashes
during web app bringup. This patch will be reverted once
patches related to cookie and chromium shutdown are migrated.

Change-Id: I6ab9155af24f771a285921320052aead013fcf4c
Signed-off-by: Uzair <uzair.jaleel@samsung.com>

diff --git a/tizen_src/ewk/efl_integration/message_pump_for_ui_efl.cc b/tizen_src/ewk/efl_integration/message_pump_for_ui_efl.cc
index 68f3784..845a813 100644 (file)
--- a/tizen_src/ewk/efl_integration/message_pump_for_ui_efl.cc
+++ b/tizen_src/ewk/efl_integration/message_pump_for_ui_efl.cc
@@ -155,6 +155,15 @@ void MessagePumpForUIEfl::DoWork() {
   }
 
   Delegate* delegate = base::MessageLoopForUI::current();
+
+// Added as part M67 bringup need to check why
+// MessagePumpForUIEfl::DoWork is called even after
+// MessageLoop is destructed.
+#if defined(EWK_BRINGUP)  // FIXME: m67 bringup
+  if (!delegate)
+    return;
+#endif
+
   if (!run_loop_) {
     run_loop_ = new RunLoop();
     bool result = run_loop_->BeforeRun();

diff --git a/tizen_src/ewk/efl_integration/url_request_context_getter_efl.cc b/tizen_src/ewk/efl_integration/url_request_context_getter_efl.cc
index 9ee9ddf..5478dcb 100644 (file)
--- a/tizen_src/ewk/efl_integration/url_request_context_getter_efl.cc
+++ b/tizen_src/ewk/efl_integration/url_request_context_getter_efl.cc
@@ -268,7 +268,13 @@ void URLRequestContextGetterEfl::SetCookieStoragePath(
   }
 
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO));
-  if (file_storage == EWK_COOKIE_PERSISTENT_STORAGE_SQLITE) {
+  // Remove below "false" this was added as part of M67 Brinup to avoid
+  // crash related to CreateSQLitePersistentCookieStore
+  if (file_storage == EWK_COOKIE_PERSISTENT_STORAGE_SQLITE
+#if defined(EWK_BRINGUP)  // FIXME: m67 bringup
+      && false
+#endif
+      ) {
     CreateSQLitePersistentCookieStore(path, persist_session_cookies);
   } else {
     CreatePersistentCookieStore(path, persist_session_cookies);