Fix scaling calculation.

remoting/webapp/me2mom/client_session.js

 // Copyright (c) 2011 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 /**
  * @fileoverview
  * Session class that handles creation and teardown of a remoting session.
  *
  * This abstracts a <embed> element and controls the plugin which does the
  * actual remoting work.  There should be no UI code inside this class.  It
@@ skipping 349 matching lines @@
 };
 
 /**
  * Informs the plugin that it should scale itself.
  *
  * @param {boolean} shouldScale If the plugin should scale itself.
  * @return {void} Nothing.
  */
 remoting.ClientSession.prototype.toggleScaleToFit = function(shouldScale) {
   if (shouldScale) {
-    remoting.debug.log('scale to fit is turned on.');
-
     if (this.plugin.desktopWidth == 0 ||
         this.plugin.desktopHeight == 0) {
       remoting.debug.log('desktop size is not known yet.');
       return;
     }
 
     // Make sure both width and height are multiples of two.
     var width = window.innerWidth;
     var height = window.innerHeight;
     if (width % 2 == 1)
       --width;
     if (height % 2 == 1)
       --height;
 
-    var scale = 1.0;
-    if (width < height)
-      scale = 1.0 * height / this.plugin.desktopHeight;
-    else
-      scale = 1.0 * width / this.plugin.desktopWidth;
-
+    var scaleFitHeight = 1.0 * height / this.plugin.desktopHeight;
+    var scaleFitWidth = 1.0 * width / this.plugin.desktopWidth;

[Jamie, 2011/08/13 02:24:51]

I'd be tempted to guard against either width or height being zero.

[Lambros, 2011/08/15 20:03:45]

Already covered by line 370, I think?

+    var scale = Math.min(scaleFitHeight, scaleFitWidth);
     if (scale > 1.0) {
       remoting.debug.log('scale up is not supported');
-      return;
+      scale = 1.0;
     }
 
     this.plugin.width = this.plugin.desktopWidth * scale;
     this.plugin.height = this.plugin.desktopHeight * scale;
   } else {
-    remoting.debug.log('scale to fit is turned off.');
     this.plugin.width = this.plugin.desktopWidth;
     this.plugin.height = this.plugin.desktopHeight;
   }
   remoting.debug.log('plugin size is now: ' +
                      this.plugin.width + ' x ' + this.plugin.height + '.');
   this.plugin.setScaleToFit(shouldScale);
+  remoting.debug.log('scale to fit is now: ' + shouldScale);
 };
 
 /**
  * Returns an associative array with a set of stats for this connection.
  *
  * @return {Object} The connection statistics.
  */
 remoting.ClientSession.prototype.stats = function() {
   return {
     'video_bandwidth': this.plugin.videoBandwidth,
     'capture_latency': this.plugin.videoCaptureLatency,
     'encode_latency': this.plugin.videoEncodeLatency,
     'decode_latency': this.plugin.videoDecodeLatency,
     'render_latency': this.plugin.videoRenderLatency,
     'roundtrip_latency': this.plugin.roundTripLatency
   };
 };
 
 }());