Fixed some crashes in embedlite multiple view management. make test w…

…ith VIEW_COUNT=40 reproduce 100% bug 935846
sailfishos · Oct 22, 2014 · 9288146 · 9288146
1 parent 6fd383b
commit 9288146
Show file tree

Hide file tree

Showing 4 changed files with 26 additions and 11 deletions.
diff --git a/dom/events/EventStateManager.cpp b/dom/events/EventStateManager.cpp
@@ -5461,15 +5461,23 @@ bool EventStateManager::Prefs::sClickHoldContextMenu = false;
 int32_t EventStateManager::Prefs::sGenericAccessModifierKey = -1;
 int32_t EventStateManager::Prefs::sChromeAccessModifierMask = 0;
 int32_t EventStateManager::Prefs::sContentAccessModifierMask = 0;
+bool EventStateManager::Prefs::sPrefsAlreadyCached = false;
 
 // static
 void
 EventStateManager::Prefs::Init()
 {
-  DebugOnly<nsresult> rv =
-    Preferences::AddBoolVarCache(&sKeyCausesActivation,
-                                 "accessibility.accesskeycausesactivation",
-                                 sKeyCausesActivation);
+  DebugOnly<nsresult> rv = Preferences::RegisterCallback(OnChange, "dom.popup_allowed_events");
+  MOZ_ASSERT(NS_SUCCEEDED(rv),
+             "Failed to observe \"dom.popup_allowed_events\"");
+
+  if (sPrefsAlreadyCached) {
+    return;
+  }
+
+  rv = Preferences::AddBoolVarCache(&sKeyCausesActivation,
+                                    "accessibility.accesskeycausesactivation",
+                                    sKeyCausesActivation);
   MOZ_ASSERT(NS_SUCCEEDED(rv),
              "Failed to observe \"accessibility.accesskeycausesactivation\"");
   rv = Preferences::AddBoolVarCache(&sClickHoldContextMenu,
@@ -5492,10 +5500,7 @@ EventStateManager::Prefs::Init()
                                    sContentAccessModifierMask);
   MOZ_ASSERT(NS_SUCCEEDED(rv),
              "Failed to observe \"ui.key.contentAccess\"");
-
-  rv = Preferences::RegisterCallback(OnChange, "dom.popup_allowed_events");
-  MOZ_ASSERT(NS_SUCCEEDED(rv),
-             "Failed to observe \"dom.popup_allowed_events\"");
+  sPrefsAlreadyCached = true;
 }
 
 // static

diff --git a/dom/events/EventStateManager.h b/dom/events/EventStateManager.h
@@ -265,6 +265,7 @@ class EventStateManager : public nsSupportsWeakReference,
     static int32_t sContentAccessModifierMask;
 
     static int32_t GetAccessModifierMask(int32_t aItemType);
+    static bool sPrefsAlreadyCached;
   };
 
   /**

diff --git a/embedding/embedlite/embedthread/EmbedLiteCompositorParent.cpp b/embedding/embedlite/embedthread/EmbedLiteCompositorParent.cpp
@@ -143,7 +143,7 @@ EmbedLiteCompositorParent::Invalidate()
 
   UpdateTransformState();
 
-  if (!view->GetListener()->Invalidate()) {
+  if (view->GetListener() && !view->GetListener()->Invalidate()) {
     mCurrentCompositeTask = NewRunnableMethod(this, &EmbedLiteCompositorParent::RenderGL);
     MessageLoop::current()->PostDelayedTask(FROM_HERE, mCurrentCompositeTask, 16);
     return true;

diff --git a/embedding/embedlite/tests/embedLiteViewInitTest.cpp b/embedding/embedlite/tests/embedLiteViewInitTest.cpp
@@ -37,6 +37,8 @@ class MyListener : public EmbedLiteAppListener
     printf("DoDestroyApp\n");
     self->mApp->Stop();
   }
+  static void CreateView(void* aData);
+
   EmbedLiteApp* App() { return mApp; }
 
 private:
@@ -117,16 +119,23 @@ class MyViewListener : public EmbedLiteViewListener
   EmbedLiteView* mView;
 };
 
+void MyListener::CreateView(void* aData)
+{
+    MyListener* self = static_cast<MyListener*>(aData);
+    self->viewListeners.push_back(new MyViewListener(self));
+}
+
 void MyListener::Initialized()
 {
   printf("Embedding initialized, let's make view");
+
   int defaultViewCount = 2;
-  const char* viewsCount = getenv("VIEW_COUNT");
+  static const char* viewsCount = getenv("VIEW_COUNT");
   if (viewsCount != nullptr) {
     defaultViewCount = atoi(viewsCount);
   }
   for (int i = 0; i < defaultViewCount; ++i) {
-    viewListeners.push_back(new MyViewListener(this));
+    mApp->PostTask(&MyListener::CreateView, this, 500);
   }
 }