Bug 1074693 - Loop desktop room preview to use fullscreen local videostream. r=Standard8 a=loop-only
authorNicolas Perriault <nperriault@gmail.com>
Wed, 12 Nov 2014 15:20:55 +0000
changeset 233922 8d58f30a3c74cd7352c4c7131d82b47ce9d43254
parent 233921 f84c4f1cdcad8ef308b4658c4c30884587489a4f
child 233923 555f6f98a7db5057617889be83c4b0bdabed8f9d
push id4187
push userbhearsum@mozilla.com
push dateFri, 28 Nov 2014 15:29:12 +0000
treeherdermozilla-beta@f23cc6a30c11 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersStandard8, loop-only
bugs1074693
milestone35.0a2
Bug 1074693 - Loop desktop room preview to use fullscreen local videostream. r=Standard8 a=loop-only
browser/components/loop/content/js/roomViews.js
browser/components/loop/content/js/roomViews.jsx
browser/components/loop/content/shared/css/conversation.css
--- a/browser/components/loop/content/js/roomViews.js
+++ b/browser/components/loop/content/js/roomViews.js
@@ -222,17 +222,18 @@ loop.roomViews = (function(mozL10n) {
     render: function() {
       if (this.state.roomName) {
         this.setTitle(this.state.roomName);
       }
 
       var localStreamClasses = React.addons.classSet({
         local: true,
         "local-stream": true,
-        "local-stream-audio": !this.state.videoMuted
+        "local-stream-audio": !this.state.videoMuted,
+        "room-preview": this.state.roomState !== ROOM_STATES.HAS_PARTICIPANTS
       });
 
       switch(this.state.roomState) {
         case ROOM_STATES.FAILED: {
           return loop.conversation.GenericFailureView({
             cancelCall: this.closeWindow}
           );
         }
--- a/browser/components/loop/content/js/roomViews.jsx
+++ b/browser/components/loop/content/js/roomViews.jsx
@@ -222,17 +222,18 @@ loop.roomViews = (function(mozL10n) {
     render: function() {
       if (this.state.roomName) {
         this.setTitle(this.state.roomName);
       }
 
       var localStreamClasses = React.addons.classSet({
         local: true,
         "local-stream": true,
-        "local-stream-audio": !this.state.videoMuted
+        "local-stream-audio": !this.state.videoMuted,
+        "room-preview": this.state.roomState !== ROOM_STATES.HAS_PARTICIPANTS
       });
 
       switch(this.state.roomState) {
         case ROOM_STATES.FAILED: {
           return <loop.conversation.GenericFailureView
             cancelCall={this.closeWindow}
           />;
         }
--- a/browser/components/loop/content/shared/css/conversation.css
+++ b/browser/components/loop/content/shared/css/conversation.css
@@ -470,16 +470,27 @@
   /* next two lines are workaround for lack of object-fit; see bug 1020445 */
   max-width: 140px;
   width: 30%;
   height: 28%;
   max-height: 105px;
   box-shadow: 0px 2px 4px rgba(0, 0, 0, 0.5);
 }
 
+.fx-embedded .local-stream.room-preview {
+  top: 0px;
+  left: 0px;
+  right: 0px;
+  bottom: 0px;
+  height: 100%;
+  width: 100%;
+  max-width: none;
+  max-height: none;
+}
+
 .conversation .media.nested .remote {
   display: inline-block;
   position: absolute; /* workaround for lack of object-fit; see bug 1020445 */
   width: 100%;
   top: 0;
   bottom: 0;
   left: 0;
   right: 0;