Separate host desktop related functionality into remoting.HostDesktop

remoting/webapp/crd/js/desktop_connected_view.js

 // Copyright 2015 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
  * Class handling user-facing aspects of the client session.
  */
 
 'use strict';
@@ skipping 96 matching lines @@
   // Bump-scroll test variables. Override to use a fake value for the width
   // and height of the client plugin so that bump-scrolling can be tested
   // without relying on the actual size of the host desktop.
   /** @type {number} @private */
   this.pluginWidthForBumpScrollTesting_ = 0;
   /** @type {number} @private */
   this.pluginHeightForBumpScrollTesting_ = 0;
 
   /** @type {remoting.VideoFrameRecorder} @private */
   this.videoFrameRecorder_ = null;
+
+  /** @private {base.Disposables} */
+  this.eventHooks_ = null;
 };
 
 base.extend(remoting.DesktopConnectedView, base.EventSourceImpl);
 
 /** @enum {string} */
 remoting.DesktopConnectedView.Events = {
   bumpScrollStarted: 'bumpScrollStarted',
   bumpScrollStopped: 'bumpScrollStopped'
 };
 
@@ skipping 70 matching lines @@
   this.pluginHeightForBumpScrollTesting_ = height;
 }
 
 /**
  * Notifies the host of the client's current dimensions and DPI.
  * Also takes into account per-host scaling factor, if configured.
  * TODO: private
  */
 remoting.DesktopConnectedView.prototype.notifyClientResolution_ = function() {
   var clientArea = this.getClientArea_();
-  this.plugin_.notifyClientResolution(clientArea.width * this.desktopScale_,
-                                      clientArea.height * this.desktopScale_,
-                                      window.devicePixelRatio);
+  this.plugin_.hostDesktop().resize(clientArea.width * this.desktopScale_,
+                                    clientArea.height * this.desktopScale_,
+                                    window.devicePixelRatio);
 };
 
 /**
  * Adds <embed> element to the UI container and readies the session object.
  *
  * @param {function(string, string):boolean} onExtensionMessage The handler for
  *     protocol extension messages. Returns true if a message is recognized;
  *     false otherwise.
  * @param {Array<string>} requiredCapabilities A list of capabilities
  *     required by this application.
@@ skipping 76 matching lines @@
     this.applyRemapKeys_(true);
   }
 
   // TODO(wez): Only allow mouse lock if the app has the pointerLock permission.
   // Enable automatic mouse-lock.
   if (remoting.enableMouseLock &&
       this.plugin_.hasFeature(remoting.ClientPlugin.Feature.ALLOW_MOUSE_LOCK)) {
     this.plugin_.allowMouseLock();
   }
 
-  this.plugin_.setDesktopShapeUpdateHandler(
-      this.onDesktopShapeChanged_.bind(this));
-  this.plugin_.setDesktopSizeUpdateHandler(
-      this.onDesktopSizeChanged_.bind(this));
+  base.dispose(this.eventHooks_);
+  var hostDesktop = this.plugin_.hostDesktop();
+  this.eventHooks_ = new base.Disposables(
+      new base.EventHook(
+        hostDesktop, remoting.HostDesktop.Events.sizeChanged,
+        this.onDesktopSizeChanged_.bind(this)),
+      new base.EventHook(
+        hostDesktop, remoting.HostDesktop.Events.shapeChanged,
+        this.onDesktopShapeChanged_.bind(this)));
+
   this.plugin_.setMouseCursorHandler(this.updateMouseCursorImage_.bind(this));
 
   this.onInitialized_(remoting.Error.NONE, this.plugin_);
 };
 
 /**
  * This is a callback that gets called when the plugin notifies us of a change
  * in the size of the remote desktop.
  *
  * @return {void} Nothing.
  * @private
  */
 remoting.DesktopConnectedView.prototype.onDesktopSizeChanged_ = function() {
+  var desktop = this.plugin_.hostDesktop().getDimensions();
   console.log('desktop size changed: ' +
-              this.plugin_.getDesktopWidth() + 'x' +
-              this.plugin_.getDesktopHeight() +' @ ' +
-              this.plugin_.getDesktopXDpi() + 'x' +
-              this.plugin_.getDesktopYDpi() + ' DPI');
+              desktop.width + 'x' +
+              desktop.height +' @ ' +
+              desktop.xDpi + 'x' +
+              desktop.yDpi + ' DPI');
   this.updateDimensions();
   this.updateScrollbarVisibility();
 };
 
 /**
  * Sets the non-click-through area of the client in response to notifications
  * from the plugin of desktop shape changes.
  *
  * @param {Array<Array<number>>} rects List of rectangles comprising the
  *     desktop shape.
@@ skipping 25 matching lines @@
   this.updateDimensions();
 
   if (this.notifyClientResolutionTimer_) {
     window.clearTimeout(this.notifyClientResolutionTimer_);
     this.notifyClientResolutionTimer_ = null;
   }
 
   // Defer notifying the host of the change until the window stops resizing, to
   // avoid overloading the control channel with notifications.
   if (this.resizeToClient_) {
-    var kResizeRateLimitMs = 1000;
-    if (this.session_.hasCapability(
-        remoting.ClientSession.Capability.RATE_LIMIT_RESIZE_REQUESTS)) {
-      kResizeRateLimitMs = 250;
-    }
+    var kResizeRateLimitMs = 250;
     var clientArea = this.getClientArea_();
     this.notifyClientResolutionTimer_ = window.setTimeout(
         this.notifyClientResolution_.bind(this),
         kResizeRateLimitMs);
   }
 
   // If bump-scrolling is enabled, adjust the plugin margins to fully utilize
   // the new window area.
   this.resetScroll_();
 
@@ skipping 16 matching lines @@
 
 /**
  * Deletes the <embed> element from the container, without sending a
  * session_terminate request.  This is to be called when the session was
  * disconnected by the Host.
  *
  * @return {void} Nothing.
  */
 remoting.DesktopConnectedView.prototype.removePlugin = function() {
   if (this.plugin_) {
+    base.dispose(this.eventHooks_);
+    this.eventHooks_ = null;
     this.plugin_.element().removeEventListener(
         'focus', this.callPluginGotFocus_, false);
     this.plugin_.element().removeEventListener(
         'blur', this.callPluginLostFocus_, false);
     this.plugin_.dispose();
     this.plugin_ = null;
   }
 
   this.updateClientSessionUi_(null);
 };
@@ skipping 313 matching lines @@
   return stopX.stop && stopY.stop;
 };
 
 /**
  * Refreshes the plugin's dimensions, taking into account the sizes of the
  * remote desktop and client window, and the current scale-to-fit setting.
  *
  * @return {void} Nothing.
  */
 remoting.DesktopConnectedView.prototype.updateDimensions = function() {
-  if (this.plugin_.getDesktopWidth() == 0 ||
-      this.plugin_.getDesktopHeight() == 0) {
+  var desktopSize = this.plugin_.hostDesktop().getDimensions();
+
+  if (desktopSize.width === 0 ||
+      desktopSize.height === 0) {
     return;
   }
 
-  var desktopSize = { width: this.plugin_.getDesktopWidth(),
-                      height: this.plugin_.getDesktopHeight() };
-  var desktopDpi = { x: this.plugin_.getDesktopXDpi(),
-                     y: this.plugin_.getDesktopYDpi() };
+  var desktopDpi = { x: desktopSize.xDpi,
+                     y: desktopSize.yDpi };
   var newSize = remoting.DesktopConnectedView.choosePluginSize(
       this.getClientArea_(), window.devicePixelRatio,
       desktopSize, desktopDpi, this.desktopScale_,
       remoting.fullscreen.isActive(), this.shrinkToFit_);
 
   // Resize the plugin if necessary.
   console.log('plugin dimensions:' + newSize.width + 'x' + newSize.height);
   this.plugin_.element().style.width = newSize.width + 'px';
   this.plugin_.element().style.height = newSize.height + 'px';
 
@@ skipping 147 matching lines @@
   if (!scroller) {
     return;
   }
 
   var needsVerticalScroll = false;
   var needsHorizontalScroll = false;
   if (!this.shrinkToFit_) {
     // Determine whether or not horizontal or vertical scrollbars are
     // required, taking into account their width.
     var clientArea = this.getClientArea_();
-    needsVerticalScroll = clientArea.height < this.plugin_.getDesktopHeight();
-    needsHorizontalScroll = clientArea.width < this.plugin_.getDesktopWidth();
+    var desktopSize = this.plugin_.hostDesktop().getDimensions();
+    needsVerticalScroll = clientArea.height < desktopSize.height;
+    needsHorizontalScroll = clientArea.width < desktopSize.width;
     var kScrollBarWidth = 16;
     if (needsHorizontalScroll && !needsVerticalScroll) {
       needsVerticalScroll =
-          clientArea.height - kScrollBarWidth < this.plugin_.getDesktopHeight();
+          clientArea.height - kScrollBarWidth < desktopSize.height;
     } else if (!needsHorizontalScroll && needsVerticalScroll) {
       needsHorizontalScroll =
-          clientArea.width - kScrollBarWidth < this.plugin_.getDesktopWidth();
+          clientArea.width - kScrollBarWidth < desktopSize.width;
     }
   }
 
   if (needsHorizontalScroll) {
     scroller.classList.remove('no-horizontal-scroll');
   } else {
     scroller.classList.add('no-horizontal-scroll');
   }
   if (needsVerticalScroll) {
     scroller.classList.remove('no-vertical-scroll');
@@ skipping 156 matching lines @@
  * @param {Object} message The parsed extension message data.
  * @return {boolean} True if the message was recognized, false otherwise.
  */
 remoting.DesktopConnectedView.prototype.handleExtensionMessage =
     function(type, message) {
   if (this.videoFrameRecorder_) {
     return this.videoFrameRecorder_.handleMessage(type, message);
   }
   return false;
 };