Introduce new interface for MediaInternals updates.

content/browser/resources/media/manager.js

 // Copyright 2013 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 Keeps track of all the existing PlayerInfo and
  * audio stream objects and is the entry-point for messages from the backend.
  *
  * The events captured by Manager (add, remove, update) are relayed
  * to the clientRenderer which it can choose to use to modify the UI.
  */
 var Manager = (function() {
   'use strict';
 
   function Manager(clientRenderer) {
     this.players_ = {};
-    this.audioStreams_ = {};
+    this.audioComponents_ = [];
     this.clientRenderer_ = clientRenderer;
   }
 
   Manager.prototype = {
     /**
-     * Adds an audio-stream to the dictionary of audio-streams to manage.
-     * @param id The unique-id of the audio-stream.
+     * Updates an audio-component.
+     * @param componentType Integer AudioComponent enum value; must match values
+     * from the AudioLogFactory::AudioComponent enum.
+     * @param componentId The unique-id of the audio-component.
+     * @param componentData The actual component data dictionary.
      */
-    addAudioStream: function(id) {
-      this.audioStreams_[id] = this.audioStreams_[id] || {};
-      this.clientRenderer_.audioStreamAdded(this.audioStreams_,
-                                            this.audioStreams_[id]);
-    },
-
-    /**
-     * Sets properties of an audiostream.
-     * @param id The unique-id of the audio-stream.
-     * @param properties A dictionary of properties to be added to the
-     * audio-stream.
-     */
-    updateAudioStream: function(id, properties) {
-      for (var key in properties) {
-        this.audioStreams_[id][key] = properties[key];
+    updateAudioComponent: function(componentType, componentId, componentData) {
+      if (!(componentType in this.audioComponents_))
+        this.audioComponents_[componentType] = {};
+      if (!(componentId in this.audioComponents_[componentType])) {
+        this.audioComponents_[componentType][componentId] = componentData;
+      } else {
+        for (var key in componentData) {
+          this.audioComponents_[componentType][componentId][key] =

[acolwell GONE FROM CHROMIUM, 2013/11/26 01:33:17]

We want to create a union of all key/values here? Why?

[DaleCurtis, 2013/11/26 03:02:21]

Because each update doesn't necessary contain all the key value pairs, that's
only sent during SendEverything().  Partial updates are sent after that.

+              componentData[key];
+        }
       }
-      this.clientRenderer_.audioStreamAdded(
-          this.audioStreams_, this.audioStreams_[id]);
+      this.clientRenderer_.audioComponentAdded(
+          componentType, this.audioComponents_[componentType]);
     },
 
     /**
      * Removes an audio-stream from the manager.
      * @param id The unique-id of the audio-stream.
      */
-    removeAudioStream: function(id) {
-      this.clientRenderer_.audioStreamRemoved(
-          this.audioStreams_, this.audioStreams_[id]);
-      delete this.audioStreams_[id];
+    removeAudioComponent: function(componentType, componentId) {
+      if (!(componentType in this.audioComponents_) ||
+          !(componentId in this.audioComponents_[componentType])) {

[acolwell GONE FROM CHROMIUM, 2013/11/26 01:33:17]

How can this happen? Isn't it a bug if it does?

[DaleCurtis, 2013/11/26 03:02:21]

It's possible the first update sent to JavaScript is "closed"

+        return;
+      }
+
+      delete this.audioComponents_[componentType][componentId];
+      this.clientRenderer_.audioComponentRemoved(
+          componentType, this.audioComponents_[componentType]);
     },
 
-
     /**
      * Adds a player to the list of players to manage.
      */
     addPlayer: function(id) {
       if (this.players_[id]) {
         return;
       }
       // Make the PlayerProperty and add it to the mapping
       this.players_[id] = new PlayerInfo(id);
       this.clientRenderer_.playerAdded(this.players_, this.players_[id]);
@@ skipping 38 matching lines @@
       this.players_[id].addProperty(timestamp, key, value);
       this.clientRenderer_.playerUpdated(this.players_,
                                          this.players_[id],
                                          key,
                                          value);
     }
   };
 
   return Manager;
 }());