Bug 808262- Otoro/unagi sometimes start up in landscape and can't be …

…switched to portrait. The working theory is that, for some reason, we can not access the fb. If that happens, just abort and try again later. r=dhylands a=blocking-basecamp
achronop · Dec 8, 2012 · 530943c · 530943c
1 parent 373f5b5
commit 530943c
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 3 deletions.
diff --git a/widget/gonk/Framebuffer.cpp b/widget/gonk/Framebuffer.cpp
@@ -133,7 +133,7 @@ Open()
 bool
 GetSize(nsIntSize *aScreenSize) {
     // If the framebuffer has been opened, we should always have the size.
-    if (0 <= sFd || sScreenSize) {
+    if (sScreenSize) {
         *aScreenSize = *sScreenSize;
         return true;
     }

diff --git a/widget/gonk/nsWindow.cpp b/widget/gonk/nsWindow.cpp
@@ -151,8 +151,10 @@ nsWindow::nsWindow()
         }
 
         nsIntSize screenSize;
-        mozilla::DebugOnly<bool> gotFB = Framebuffer::GetSize(&screenSize);
-        MOZ_ASSERT(gotFB);
+        bool gotFB = Framebuffer::GetSize(&screenSize);
+        if (!gotFB) {
+            NS_RUNTIMEABORT("Failed to get size from framebuffer, aborting...");
+        }
         gScreenBounds = nsIntRect(nsIntPoint(0, 0), screenSize);
 
         char propValue[PROPERTY_VALUE_MAX];