Merge pull request mozilla-b2g#6798 from alivedise/bugzilla/816647

Bug 816647 - mozFullScreen meets inline activity
dscravag · Dec 6, 2012 · c458b50 · c458b50
2 parents 669e1f3 + e7a1a2d
commit c458b50
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 3 deletions.
diff --git a/apps/system/js/statusbar.js b/apps/system/js/statusbar.js
@@ -55,7 +55,7 @@ var StatusBar = {
   /* For other modules to acquire */
   get height() {
     if (this.screen.classList.contains('fullscreen-app') ||
-        document.querySelector('#screen:-moz-full-screen-ancestor')) {
+        document.mozFullScreen) {
       return 0;
     } else if (this.screen.classList.contains('active-statusbar')) {
       return this.attentionBar.offsetHeight;

diff --git a/apps/system/js/window_manager.js b/apps/system/js/window_manager.js
@@ -230,8 +230,14 @@ var WindowManager = (function() {
     var frame = inlineActivityFrame;
 
     frame.style.width = appFrame.style.width;
-    frame.style.height = appFrame.style.height;
-    frame.style.top = appFrame.offsetTop + 'px';
+
+    if (document.mozFullScreen) {
+      frame.style.height = window.innerHeight + 'px';
+      frame.style.top = '0px';
+    } else {
+      frame.style.height = appFrame.style.height;
+      frame.style.top = appFrame.offsetTop + 'px';
+    }
   }
 
   function setFrameBackgroundBlob(frame, blob, transparent) {

diff --git a/apps/system/style/zindex.css b/apps/system/style/zindex.css
@@ -182,6 +182,7 @@
 
 /* We promotes the following overlays on top of the fullscreen web content. */
 
+#screen:-moz-full-screen-ancestor > [data-z-index-level="app"] > iframe.appWindow.inlineActivity,
 #screen:-moz-full-screen-ancestor > [data-z-index-level="sleep-menu"],
 #screen:-moz-full-screen-ancestor > [data-z-index-level="list-menu"],
 #screen.locked:-moz-full-screen-ancestor > [data-z-index-level="statusbar"],