Fixed double EmbedLiteApp initialization in process backend

Fixed start and shutdown with full cleanup in process backend
sailfishos · Jan 4, 2015 · a890591 · a890591
1 parent 4d1cd19
commit a890591
Show file tree

Hide file tree

Showing 6 changed files with 8 additions and 8 deletions.
diff --git a/embedding/embedlite/EmbedLiteView.cpp b/embedding/embedlite/EmbedLiteView.cpp
@@ -39,9 +39,8 @@ EmbedLiteView::EmbedLiteView(EmbedLiteApp* aApp, PEmbedLiteViewParent* aViewImpl
 EmbedLiteView::~EmbedLiteView()
 {
   LOGT("impl:%p", mViewImpl);
-  if (mViewImpl && mApp->GetType() == EmbedLiteApp::EMBED_THREAD) {
-    EmbedLiteViewThreadParent* impl = static_cast<EmbedLiteViewThreadParent*>(mViewImpl);
-    unused << impl->SendDestroy();
+  if (mViewImpl) {
+    unused << mViewParent->SendDestroy();
   } else {
     LOGNI();
   }

diff --git a/embedding/embedlite/embedprocess/EmbedLiteAppProcessChild.cpp b/embedding/embedlite/embedprocess/EmbedLiteAppProcessChild.cpp
@@ -112,8 +112,6 @@ EmbedLiteAppProcessChild::InitXPCOM()
   mozilla::DebugOnly<nsresult> rv = InitAppService();
   MOZ_ASSERT(NS_SUCCEEDED(rv));
 
-  SendInitialized();
-
   nsCOMPtr<nsIObserverService> observerService =
     do_GetService(NS_OBSERVERSERVICE_CONTRACTID);
 

diff --git a/embedding/embedlite/embedshared/EmbedLiteAppBaseChild.cpp b/embedding/embedlite/embedshared/EmbedLiteAppBaseChild.cpp
@@ -33,6 +33,8 @@ using namespace mozilla::layers;
 namespace mozilla {
 namespace embedlite {
 
+NS_GENERIC_FACTORY_CONSTRUCTOR(EmbedLiteJSON)
+
 static EmbedLiteAppBaseChild* sAppBaseChild = nullptr;
 
 EmbedLiteAppBaseChild*

diff --git a/embedding/embedlite/modules/EmbedLiteAppService.cpp b/embedding/embedlite/modules/EmbedLiteAppService.cpp
@@ -112,10 +112,10 @@ void EmbedLiteAppService::UnregisterView(uint32_t aId)
   std::map<uint64_t, uint32_t>::iterator it;
   for (it = mIDMap.begin(); it != mIDMap.end(); ++it) {
     if (aId == it->second) {
+      mIDMap.erase(it);
       break;
     }
   }
-  mIDMap.erase(it);
 }
 
 NS_IMETHODIMP

diff --git a/embedding/embedlite/modules/EmbedLiteJSON.h b/embedding/embedlite/modules/EmbedLiteJSON.h
@@ -23,8 +23,6 @@ class EmbedLiteJSON : public nsIEmbedLiteJSON
   virtual ~EmbedLiteJSON();
 };
 
-NS_GENERIC_FACTORY_CONSTRUCTOR(EmbedLiteJSON)
-
 #define NS_EMBED_LITE_JSON_CONTRACTID "@mozilla.org/embedlite-json;1"
 #define NS_EMBED_LITE_JSON_SERVICE_CLASSNAME "EmbedLite JSON Component"
 #define NS_EMBED_LITE_JSON_SERVICE_CID NS_IEMBEDLITEJSON_IID

diff --git a/embedding/embedlite/tests/embedLiteViewInitTest.cpp b/embedding/embedlite/tests/embedLiteViewInitTest.cpp
@@ -127,6 +127,9 @@ void MyListener::CreateView(void* aData)
 
 void MyListener::Initialized()
 {
+  static bool sAppInititalized = false;
+  MOZ_ASSERT(!sAppInititalized, "EmbedliteApp sent Initialized notification twice\n");
+  sAppInititalized = true;
   printf("Embedding initialized, let's make view");
 
   int defaultViewCount = 2;