Backed out changeset dfd7ec48d4fe (bug 1194049)
authorCarsten "Tomcat" Book <cbook@mozilla.com>
Wed, 14 Oct 2015 13:34:36 +0200
changeset 296419 67536020a820c822cfc6c133e929f9847f013d8a
parent 296418 352f179220345234014088227b723642d5843e22
child 296420 96042c38d46ccb874bd2227bd5d1638c3c0f448b
push id5245
push userraliiev@mozilla.com
push dateThu, 29 Oct 2015 11:30:51 +0000
treeherdermozilla-beta@dac831dc1bd0 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
bugs1194049
milestone43.0a2
backs outdfd7ec48d4fe9e5ee3509a6d15540c9a1ffc71d1
Backed out changeset dfd7ec48d4fe (bug 1194049)
dom/presentation/interfaces/nsITCPPresentationServer.idl
dom/presentation/provider/TCPPresentationServer.js
--- a/dom/presentation/interfaces/nsITCPPresentationServer.idl
+++ b/dom/presentation/interfaces/nsITCPPresentationServer.idl
@@ -16,17 +16,17 @@ interface nsITCPPresentationServerListen
    *          <other-error> on failure.
    */
   void onClose(in nsresult aReason);
 };
 
 /**
  * TCP presentation server which can be used by discovery services.
  */
-[scriptable, uuid(fcadc9fe-f1e9-4f74-b9d3-9cd6b74afc9e)]
+[scriptable, uuid(4fc57682-33d5-4793-b149-e2cc4714d70f)]
 interface nsITCPPresentationServer: nsISupports
 {
   /**
    * This method initializes a TCP presentation server.
    * @param   aId
    *          The unique Id for the device within the discovery scope. If aId
    *          is null, empty string or opt-out, the TCP presentation server
    *          should not work until the |id| is set appropriately.
@@ -60,37 +60,16 @@ interface nsITCPPresentationServer: nsIS
    */
   nsIPresentationDevice createTCPDevice(in AUTF8String aId,
                                         in AUTF8String aName,
                                         in AUTF8String aType,
                                         in AUTF8String aHost,
                                         in uint16_t aPort);
 
   /**
-   * Update TCPDevice for this server.
-   * @param   aId
-   *          The unique Id for the discovered device
-   * @param   aName
-   *          The human-readable name of the discovered device
-   * @param   aType
-   *          The category of the discovered device
-   * @param   aHost
-   *          The host of the provided control channel of the discovered device
-   * @param   aPort
-   *          The port of the provided control channel of the discovered device
-   * @returns The updated device
-   * @throws  NS_ERROR_INVALID_ARG if a TCPDevice with |aId| does not existed.
-   */
-  nsIPresentationDevice updateTCPDevice(in AUTF8String aId,
-                                        in AUTF8String aName,
-                                        in AUTF8String aType,
-                                        in AUTF8String aHost,
-                                        in uint16_t aPort);
-
-  /**
    * Get TCPDevice with |aID|.
    * @param   aId
    *          The unique Id for the query device
    * @returns The queried device; return |undefined|
    * @throws  NS_ERROR_INVALID_ARG if a TCPDevice with |aId| does not exist.
    */
   nsIPresentationDevice getTCPDevice(in AUTF8String aId);
 
--- a/dom/presentation/provider/TCPPresentationServer.js
+++ b/dom/presentation/provider/TCPPresentationServer.js
@@ -122,31 +122,16 @@ TCPPresentationServer.prototype = {
     this._devices.set(aId, new TCPDevice(this, {id: aId,
                                                 name: aName,
                                                 type: aType,
                                                 host: aHost,
                                                 port: aPort}));
     return this._devices.get(aId);
   },
 
-  updateTCPDevice: function(aId, aName, aType, aHost, aPort) {
-    DEBUG && log("TCPPresentationServer - updateTCPDevice with id: " + aId);
-    if (!this._devices.has(aId)) {
-      throw Cr.NS_ERROR_INVALID_ARG;
-    }
-
-    let device = this._devices.get(aId);
-    device.name = aName;
-    device.type = aType;
-    device.host = aHost;
-    device.port = aPort;
-
-    return device;
-  },
-
   getTCPDevice: function(aId) {
     DEBUG && log("TCPPresentationServer - getTCPDevice with id: " + aId);
     if (!this._devices.has(aId)) {
       throw Cr.NS_ERROR_INVALID_ARG;
     }
     return this._devices.get(aId);
   },