warning_ and error_ functions are now wired to onunmute and onmute events

chrome/test/data/webrtc/manual/peerconnection_manual.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.
  */
 
  /**
  * See http://dev.w3.org/2011/webrtc/editor/getusermedia.html for more
  * information on getUserMedia. See
  * http://dev.w3.org/2011/webrtc/editor/webrtc.html for more information on
@@ skipping 218 matching lines @@
   }
 
   if ($('screencapture').checked) {
     var constraints = {
       audio: $('audio').checked,
       video: {mandatory: {chromeMediaSource: 'screen',
                           maxWidth: screen.width,
                           maxHeight: screen.height}}
     };
     if ($('audio').checked)
-      print_('Audio for screencapture is not implemented yet, please ' +
+      warning_('Audio for screencapture is not implemented yet, please ' +
             'try to set audio = false prior requesting screencapture');
   }
 
   $('getusermedia-constraints').value = JSON.stringify(constraints, null, ' ');
 }
 
 function showServerHelp() {
   alert('You need to build and run a peerconnection_server on some ' +
         'suitable machine. To build it in chrome, just run make/ninja ' +
         'peerconnection_server. Otherwise, read in https://code.google' +
@@ skipping 178 matching lines @@
   global.dtmfSender.insertDTMF(tones, duration, interToneGap);
 }
 
 function handleMessage(peerConnection, message) {
   var parsed_msg = JSON.parse(message);
   if (parsed_msg.type) {
     var session_description = new RTCSessionDescription(parsed_msg);
     peerConnection.setRemoteDescription(
         session_description,
         function() { success_('setRemoteDescription'); },
-        function(error) { failure_('setRemoteDescription', error); });
+        function(error) { error_('setRemoteDescription', error); });
     if (session_description.type == 'offer') {
       print_('createAnswer with constraints: ' +
             JSON.stringify(global.createAnswerConstraints, null, ' '));
       peerConnection.createAnswer(
           setLocalAndSendMessage_,
-          function(error) { failure_('createAnswer', error); },
+          function(error) { error_('createAnswer', error); },
           global.createAnswerConstraints);
     }
     return;
   } else if (parsed_msg.candidate) {
     var candidate = new RTCIceCandidate(parsed_msg);
     peerConnection.addIceCandidate(candidate,
         function() { success_('addIceCandidate'); },
-        function(error) { failure_('addIceCandidate', error); }
+        function(error) { error_('addIceCandidate', error); }
     );
     return;
   }
   error_('unknown message received');
 }
 
 /**
  * Sets the peerConnection constraints based on checkboxes.
  * TODO (jansson) Make it possible to use the text field for constraints like
  *     for getUserMedia.
@@ skipping 25 matching lines @@
   peerConnection.onicecandidate = iceCallback_;
   peerConnection.ondatachannel = onCreateDataChannelCallback_;
   return peerConnection;
 }
 
 function setupCall(peerConnection) {
   print_('createOffer with constraints: ' +
         JSON.stringify(global.createOfferConstraints, null, ' '));
   peerConnection.createOffer(
       setLocalAndSendMessage_,
-      function(error) { failure_('createOffer', error); },
+      function(error) { error_('createOffer', error); },
       global.createOfferConstraints);
 }
 
 function answerCall(peerConnection, message) {
   handleMessage(peerConnection, message);
 }
 
 function createDataChannel(peerConnection, label) {
   if (global.dataChannel != null && global.dataChannel.readyState != 'closed')
     error_('Creating DataChannel, but we already have one.');
@@ skipping 388 matching lines @@
     source.videoId = videoSelect.options[videoSelect.selectedIndex].value;
   }
   return source;
 }
 
 /**
  * @private
  * @param {NavigatorUserMediaError} error Error containing details.
  */
 function getUserMediaFailedCallback_(error) {
-  print_('GetUserMedia FAILED: Maybe the camera is in use by another process?');
-  gRequestWebcamAndMicrophoneResult = 'failed-with-error-' + error.name;
-  print_(gRequestWebcamAndMicrophoneResult);
+  error_('GetUserMedia failed with error: ' + error.name);
 }
 
 /** @private */
-function success_(method) {
-  $('messages').innerHTML += '<span style="color:green;">' + method +
-                             '(): success. </span><br>';
-}
-
-/** @private */
-function failure_(method, error) {
-  error_(method + '() failed: ' + JSON.stringify(error));
-}
-
-/** @private */
 function iceCallback_(event) {
   if (event.candidate)
     sendToPeer(global.remotePeerId, JSON.stringify(event.candidate));
 }
 
 /** @private */
 function setLocalAndSendMessage_(session_description) {
   session_description.sdp =
     global.transformOutgoingSdp(session_description.sdp);
   global.peerConnection.setLocalDescription(
     session_description,
     function() { success_('setLocalDescription'); },
-    function(error) { failure_('setLocalDescription', error); });
+    function(error) { error_('setLocalDescription', error); });
   print_('Sending SDP message:\n' + session_description.sdp);
   sendToPeer(global.remotePeerId, JSON.stringify(session_description));
 }
 
 /** @private */
 function addStreamCallback_(event) {
   print_('Receiving remote stream...');
   var videoTag = document.getElementById('remote-view');
   attachMediaStream(videoTag, event.stream);
 
@@ skipping 53 matching lines @@
     window.addEventListener('loadedmetadata', function() {
         displayVideoSize_(videoTag);}, true);
 
     // Throw an error when no video is sent from camera but gUM returns OK.
     stream.getVideoTracks()[0].onended = function() {
       error_(global.localStream + ' getUserMedia successful but ' +
              'MediaStreamTrack.onended event fired, no frames from camera.');
     };
 
     // Print information on track going to mute or back from it.
-    // TODO(mcasas): add a warning_() function and move the following print_()
-    // notifications to error_() and warning_(), respectively.
     stream.getVideoTracks()[0].onmute = function() {
-      print_(global.localStream + ' track onmute event has fired');
+      error_(global.localStream + ' MediaStreamTrack.onmute event has fired, ' +
+             'no frames to the track.');
     };
     stream.getVideoTracks()[0].onunmute = function() {
-      print_(global.localStream + ' track onunmute event has fired');
+      warning_(global.localStream + ' MediaStreamTrack.onunmute event has ' +
+               'fired.');
     };
   }
 }
 
 /**
  * @private
  * @param {string} videoTag The ID of the video tag + stream used to
  *     write the size to a HTML tag based on id if the div's exists.
  */
 function displayVideoSize_(videoTag) {
@@ skipping 98 matching lines @@
  * @private
  */
 function ensureHasPeerConnection_() {
   if (getReadyState_() == 'no-peer-connection') {
     preparePeerConnection();
   }
 }
 
 /**
  * @private
- * @param {string} message Text to print.
+ * @param {!string} message Text to print.

[mcasas, 2014/08/21 12:28:36]

What's the exclamation mark doing? Other methods don't have it.

[jansson, 2014/08/21 16:26:21]

It indicates that the there has to a non-nullable type passed as a parameter. I
think its mostly used for objects, but Google JS styleguide follows JSDoc,
http://usejsdoc.org/tags-type.html.  Example in there is for the number type,
not sure if it's really applicable for strings.

  */
 function print_(message) {
-  console.log(message);
-  $('messages').innerHTML += message + '<br>';
+  print_handler_(message, 'messages', 'black');
 }
 
 /**
  * @private
- * @param {string} message Text to print.
+ * @param {!string} message Text to print.
  */
-function debug_(message) {
-  console.log(message);
-  $('debug').innerHTML += message + '<br>';
+function success_(message) {
+  print_handler_(message, 'messages', 'green');
 }
 
 /**
- * Print error message in the debug log + JS console and throw an Error.
  * @private
- * @param {string} message Text to print in red.
+ * @param {!string} message Text to print.
  */
-function error_(message) {
-  $('debug').innerHTML += '<span style="color:red;">' + message + '</span><br>';
-  throw new Error(message);
+function warning_(message) {
+  print_handler_(message, 'debug', 'orange');
 }
 
 /**
+ * @private
+ * @param {!string} message Text to print.
+ */
+function error_(message) {
+  print_handler_(message, 'debug', 'red');
+}
+
+/**
+ * @private
+ * @param {!string} message Text to print.
+ * @param {!string} textField Element ID of where to print.
+ * @param {!string} color Color of the text.
+ */
+function print_handler_(message, textField, color) {
+  if ( color == 'green' )

[mcasas, 2014/08/21 12:28:36]

Remove space before |color|.

[jansson, 2014/08/21 16:26:21]

Done.

+    message += ' success';
+
+  $(textField).innerHTML += '<span style="color:' + color + ';">' + message +
+                            '</span><br>'
+  if (color == 'red' )

[mcasas, 2014/08/21 12:28:36]

I'd move this to first thing in print_handler_()

[jansson, 2014/08/21 16:26:21]

Done.

+    throw new Error(message);
+
+  console.log(message);
+}
+
+/**
  * @private
  * @param {string} stringRepresentation JavaScript as a string.
  * @return {Object} The PeerConnection constraints as a JavaScript dictionary.
  */
 function getEvaluatedJavaScript_(stringRepresentation) {
   try {
     var evaluatedJavaScript;
     eval('evaluatedJavaScript = ' + stringRepresentation);
     return evaluatedJavaScript;
   } catch (exception) {
@@ skipping 69 matching lines @@
 
   track.enabled = !track.enabled;
   print_('ok-' + audioOrVideo + '-toggled-to-' + track.enabled);
 }
 
 /** @private */
 function connectCallback_(request) {
   print_('Connect callback: ' + request.status + ', ' + request.readyState);
   if (request.status == 0) {
     print_('peerconnection_server doesn\'t seem to be up.');
-    print_('failed-to-connect');
+    error_('failed connecting to peerConnection server');
   }
   if (request.readyState == 4 && request.status == 200) {
     global.ourPeerId = parseOurPeerId_(request.responseText);
     global.remotePeerId = parseRemotePeerIdIfConnected_(request.responseText);
     startHangingGet_(global.serverUrl, global.ourPeerId);
     print_('ok-connected');
   }
 }
 
 /** @private */
@@ skipping 139 matching lines @@
 
 /** @private */
 function readResponseHeader_(request, key) {
   var value = request.getResponseHeader(key);
   if (value == null || value.length == 0) {
     error_('Received empty value ' + value +
            ' for response header key ' + key + '.');
   }
   return parseInt(value);
 }