Separate host desktop related functionality into remoting.HostDesktop

remoting/webapp/browser_test/mock_client_plugin.js

 // Copyright 2014 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
  * Mock implementation of ClientPlugin for testing.
  * @suppress {checkTypes}
  */
 
 'use strict';
 
 /** @suppress {duplicate} */
 var remoting = remoting || {};
 
 /**
  * @constructor
  * @implements {remoting.ClientPlugin}
  */
 remoting.MockClientPlugin = function(container) {
   this.container_ = container;
   this.element_ = document.createElement('div');
   this.element_.style.backgroundImage = 'linear-gradient(45deg, blue, red)';
-  this.width_ = 640;
-  this.height_ = 480;
   this.connectionStatusUpdateHandler_ = null;
   this.desktopSizeUpdateHandler_ = null;
   this.container_.appendChild(this.element_);
+  this.hostDesktop_ = new remoting.MockClientPlugin.HostDesktop();
 };
 
 remoting.MockClientPlugin.prototype.dispose = function() {
   this.container_.removeChild(this.element_);
   this.element_ = null;
   this.connectionStatusUpdateHandler_ = null;
 };
 
-remoting.MockClientPlugin.prototype.getDesktopWidth = function() {
-  return this.width_;
-};
-
-remoting.MockClientPlugin.prototype.getDesktopHeight = function() {
-  return this.height_;
-};
-
-remoting.MockClientPlugin.prototype.getDesktopXDpi = function() {
-  return 96;
-};
-
-remoting.MockClientPlugin.prototype.getDesktopYDpi = function() {
-  return 96;
+remoting.MockClientPlugin.prototype.hostDesktop = function() {
+  return this.hostDesktop_;
 };
 
 remoting.MockClientPlugin.prototype.element = function() {
   return this.element_;
 };
 
 remoting.MockClientPlugin.prototype.initialize = function(onDone) {
   window.setTimeout(onDone.bind(null, true), 0);
 };
 
@@ skipping 10 matching lines @@
       0);
 };
 
 remoting.MockClientPlugin.prototype.injectKeyEvent =
     function(key, down) {};
 
 remoting.MockClientPlugin.prototype.remapKey = function(from, to) {};
 
 remoting.MockClientPlugin.prototype.releaseAllKeys = function() {};
 
-remoting.MockClientPlugin.prototype.notifyClientResolution =
-    function(width, height, dpi) {
-  this.width_ = width;
-  this.height_ = height;
-  if (this.desktopSizeUpdateHandler_) {
-    window.setTimeout(this.desktopSizeUpdateHandler_, 0);
-  }
-};
-
 remoting.MockClientPlugin.prototype.onIncomingIq = function(iq) {};
 
 remoting.MockClientPlugin.prototype.isSupportedVersion = function() {
   return true;
 };
 
 remoting.MockClientPlugin.prototype.hasFeature = function(feature) {
   return false;
 };
 
@@ skipping 39 matching lines @@
     function(handler) {
   this.connectionStatusUpdateHandler_ = handler;
 };
 
 remoting.MockClientPlugin.prototype.setRouteChangedHandler =
     function(handler) {};
 
 remoting.MockClientPlugin.prototype.setConnectionReadyHandler =
     function(handler) {};
 
-remoting.MockClientPlugin.prototype.setDesktopSizeUpdateHandler =
-    function(handler) {
-  this.desktopSizeUpdateHandler_ = handler;
-};
-
 remoting.MockClientPlugin.prototype.setCapabilitiesHandler =
     function(handler) {};
 
 remoting.MockClientPlugin.prototype.setGnubbyAuthHandler =
     function(handler) {};
 
 remoting.MockClientPlugin.prototype.setCastExtensionHandler =
     function(handler) {};
 
 remoting.MockClientPlugin.prototype.setMouseCursorHandler =
     function(handler) {};
 
 remoting.MockClientPlugin.prototype.setFetchThirdPartyTokenHandler =
     function(handler) {};
 
 remoting.MockClientPlugin.prototype.setFetchPinHandler =
     function(handler) {};
 
+/**
+ * @constructor
+ * @implements {remoting.HostDesktop}
+ */
+remoting.MockClientPlugin.HostDesktop = function() {
+  /** @private */
+  this.width_ = 0;
+  /** @private */
+  this.height_ = 0;
+  /** @private */
+  this.xDpi_ = 96;
+  /** @private */
+  this.yDpi_ = 96;
+  /** @private */
+  this.resizable_ = true;
+  this.defineEvents(Object.keys(remoting.ClientPlugin.HostDesktop.Events));
+};
+base.extend(remoting.MockClientPlugin.HostDesktop, base.EventSourceImpl);
+
+/**
+ * @return {{width:number, height:number, xDpi:number, yDpi:number}}
+ * @override
+ */
+remoting.MockClientPlugin.HostDesktop.prototype.getDimensions = function() {
+  return {
+    width: this.width_,
+    height: this.height_,
+    xDpi: this.xDpi_,
+    yDpi: this.yDpi_
+  };
+};
+
+/**
+ * @return {boolean}
+ * @override
+ */
+remoting.MockClientPlugin.HostDesktop.prototype.isResizable = function() {
+  return this.resizable_;
+};
+
+/**
+ * @return {boolean}
+ * @override
+ */
+remoting.MockClientPlugin.HostDesktop.prototype.hasResizeRateLimit =
+    function() {
+      return false;

[Jamie, 2015/02/18 23:06:19]

Nit: Indentation.

[kelvinp, 2015/02/19 20:58:14]

Done.

+    };
+
+/**
+ * @param {number} width
+ * @param {number} height
+ * @param {number} dpi
+ * @override
+ */
+remoting.MockClientPlugin.HostDesktop.prototype.resize = function(
+    width, height, device_scale) {

[Jamie, 2015/02/18 23:06:19]

s/device_scale/dpi/

[kelvinp, 2015/02/19 20:58:15]

The parameter is about device scale (1.0) instead of DPI (96) 

+  this.width_ = width;
+  this.height_ = height;
+  this.xDpi_ = this.yDpi_ = device_scale;
+  this.raiseEvent(remoting.ClientPlugin.HostDesktop.Events.sizeChanged);

[Jamie, 2015/02/18 23:06:19]

How does the event recipient know the new size? It seems like we should raise
the event with |this| as a data member, otherwise the handler needs an
independent reference to the HostDesktop. It can be a follow-up CL though.

[kelvinp, 2015/02/19 20:58:15]

Done.  In order to hook this event, the client already need a reference to
|this| so I don't think it will be a big problem.

+};
 
 /**
  * @constructor
  * @extends {remoting.ClientPluginFactory}
  */
 remoting.MockClientPluginFactory = function() {};
 
 remoting.MockClientPluginFactory.prototype.createPlugin =
     function(container, onExtensionMessage) {
   return new remoting.MockClientPlugin(container);
 };
 
 remoting.MockClientPluginFactory.prototype.preloadPlugin = function() {};