Bug 1180644: Fix crashes after enabling OOP on B2GDroid. r=snorp

mozilla-spidermonkey · Jul 6, 2015 · 682383f · 682383f
1 parent 3b16a67
commit 682383f
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 3 deletions.
diff --git a/dom/media/fmp4/MP4Decoder.cpp b/dom/media/fmp4/MP4Decoder.cpp
@@ -204,7 +204,7 @@ IsAndroidAvailable()
   return false;
 #else
   // We need android.media.MediaCodec which exists in API level 16 and higher.
-  return AndroidBridge::Bridge()->GetAPIVersion() >= 16;
+  return AndroidBridge::Bridge() && (AndroidBridge::Bridge()->GetAPIVersion() >= 16);
 #endif
 }
 

diff --git a/gfx/thebes/gfxAndroidPlatform.cpp b/gfx/thebes/gfxAndroidPlatform.cpp
@@ -415,7 +415,7 @@ gfxAndroidPlatform::UseAcceleratedSkiaCanvas()
 bool gfxAndroidPlatform::HaveChoiceOfHWAndSWCanvas()
 {
 #ifdef MOZ_WIDGET_ANDROID
-    if (AndroidBridge::Bridge()->GetAPIVersion() < 11) {
+    if (!AndroidBridge::Bridge() || AndroidBridge::Bridge()->GetAPIVersion() < 11) {
         // It's slower than software due to not having a compositing fast path
         return false;
     }

diff --git a/layout/ipc/RenderFrameParent.cpp b/layout/ipc/RenderFrameParent.cpp
@@ -218,7 +218,8 @@ class RemoteContentController : public GeckoContentController {
 
   virtual void PostDelayedTask(Task* aTask, int aDelayMs) override
   {
-    MessageLoop::current()->PostDelayedTask(FROM_HERE, aTask, aDelayMs);
+    (MessageLoop::current() ? MessageLoop::current() : mUILoop)->
+       PostDelayedTask(FROM_HERE, aTask, aDelayMs);
   }
 
   virtual bool GetTouchSensitiveRegion(CSSRect* aOutRegion) override