Add screen capture constraints, video tag resize and removed auto video resize

chrome/test/data/webrtc/getusermedia.js

 /**
  * Copyright (c) 2012 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.
  */
@@ skipping 17 matching lines @@
  */
 var gRequestWebcamAndMicrophoneResult = 'not-called-yet';
 
 /**
  * This function asks permission to use the webcam and mic from the browser. It
  * will return ok-requested to PyAuto. This does not mean the request was
  * approved though. The test will then have to click past the dialog that
  * appears in Chrome, which will run either the OK or failed callback as a
  * a result. To see which callback was called, use obtainGetUserMediaResult().
  *
- * @param{string} constraints Defines what to be requested, with mandatory
+ * @param {string} constraints Defines what to be requested, with mandatory
  *     and optional constraints defined. The contents of this parameter depends
  *     on the WebRTC version. This should be JavaScript code that we eval().
  */
 function getUserMedia(constraints) {
   if (!navigator.webkitGetUserMedia) {
     returnToTest('Browser does not support WebRTC.');
     return;
   }
   try {
     var evaluatedConstraints;
@@ skipping 28 matching lines @@
                    'but media access is not granted.');
 
   gLocalStream.stop();
   returnToTest('ok-stopped');
 }
 
 // Functions callable from other JavaScript modules.
 
 /**
  * Adds the current local media stream to a peer connection.
- * @param{RTCPeerConnection} peerConnection
+ * @param {RTCPeerConnection} peerConnection
  */
 function addLocalStreamToPeerConnection(peerConnection) {
   if (gLocalStream == null)
     throw failTest('Tried to add local stream to peer connection, ' +
                    'but there is no stream yet.');
   try {
     peerConnection.addStream(gLocalStream, gAddStreamConstraints);
   } catch (exception) {
     throw failTest('Failed to add stream with constraints ' +
                    gAddStreamConstraints + ': ' + exception);
   }
   debug('Added local stream.');
 }
 
 /**
  * Removes the local stream from the peer connection.
- * @param{rtcpeerconnection} peerconnection
+ * @param {rtcpeerconnection} peerConnection
  */
 function removeLocalStreamFromPeerConnection(peerConnection) {
   if (gLocalStream == null)
     throw failTest('Tried to remove local stream from peer connection, ' +
                    'but there is no stream yet.');
   try {
     peerConnection.removeStream(gLocalStream);
   } catch (exception) {
     throw failTest('Could not remove stream: ' + exception);
   }
@@ skipping 12 matching lines @@
 /**
  * @private
  * @param {MediaStream} stream Media stream.
  */
 function getUserMediaOkCallback_(stream) {
   gLocalStream = stream;
   var videoTag = $('local-view');
   videoTag.src = webkitURL.createObjectURL(stream);
 
   // Due to crbug.com/110938 the size is 0 when onloadedmetadata fires.
   // videoTag.onloadedmetadata = updateVideoTagSize_('local-view');

[kjellander_chromium, 2013/03/25 13:33:58]

Update this line (meant to be the code used when 110938 is fixed) to read:
// videoTag.onloadedmetadata = displayVideoSize(videoTag);

[jansson, 2013/04/05 10:29:42]

Done.

[kjellander_chromium, 2013/04/08 14:19:51]

You must have missed this, it's still not updated. 

On 2013/04/05 10:29:42, jansson wrote:

   // Use setTimeout as a workaround for now.
-  setTimeout(function() {updateVideoTagSize_('local-view')}, 500);
+  // setTimeout(function() {updateVideoTagSize_('local-view')}, 500);

[kjellander_chromium, 2013/03/25 13:33:58]

Clean out the old code instead of commenting it.

[jansson, 2013/04/05 10:29:42]

Done.

   gRequestWebcamAndMicrophoneResult = 'ok-got-stream';
+  setTimeout(function() {displayVideoSize(videoTag);}, 500);
 }
 
 /**
  * @private
  * @param {string} videoTagId The ID of the video tag to update.
+ * @param {string} width The width of the video to update the video

[kjellander_chromium, 2013/03/25 13:33:58]

The implementation is not exactly as documented, as if one is set to 0 and not
the other, both width and height of the video tag will be set to
videoWidth/videoHeight.

[jansson, 2013/04/05 10:29:42]

Done.

+ * tag, if 0 size will be taken from videoTag.videoWidth.
+ * @param {string} height The height of the video to update the video
+ * tag, if 0 size will be taken from the videoTag.videoHeight.
  */
-function updateVideoTagSize_(videoTagId) {
+function updateVideoTagSize_(videoTagId, width, height) {
   var videoTag = $(videoTagId);
-  // Don't update if sizes are 0 (happens for Chrome M23).
-  if (videoTag.videoWidth > 0 && videoTag.videoHeight > 0) {
-    debug('Set video tag "' + videoTagId + '" width and height to ' +
-      videoTag.videoWidth + 'x' + videoTag.videoHeight);
+  if (width && height > 0) {

[kjellander_chromium, 2013/03/25 13:33:58]

This is confusing since width is probably always true if specified.
I suggest changing to (width > 0 && height > 0)

[jansson, 2013/04/05 10:29:42]

Done.

+    videoTag.width = width;
+    videoTag.height = height;
+  }
+  else {
     videoTag.width = videoTag.videoWidth;
     videoTag.height = videoTag.videoHeight;
   }
+  debug('Set video tag "' + videoTagId + '" width and height to ' +

[kjellander_chromium, 2013/03/25 13:33:58]

I prefer replacing "width and height" with just "size".

[jansson, 2013/04/05 10:29:42]

Done.

+        videoTag.width + 'x' + videoTag.height);
+  displayVideoSize(videoTag);
 }
 
 /**
+ * @private
+ * @param {string} videoTag The ID of the video tag + stream to
+ * write the size to a HTML tag based on id.
+ */
+function displayVideoSize(videoTag) {

[kjellander_chromium, 2013/03/25 13:33:58]

private functions shall end with underscore.
http://google-styleguide.googlecode.com/svn/trunk/javascriptguide.xml?showone...

[jansson, 2013/04/05 10:29:42]

Done.

[kjellander_chromium, 2013/04/08 14:19:51]

Move underscore to the end of the function name, not as a prefix.

On 2013/04/05 10:29:42, jansson wrote:

[jansson, 2013/04/10 12:11:47]

Done.

[jansson, 2013/04/10 12:11:47]

Done.

+  $(videoTag.id + '-stream-size').innerHTML = '(stream size: ' +
+                                               videoTag.videoWidth + 'x' +
+                                               videoTag.videoHeight + ' )';

[kjellander_chromium, 2013/03/25 13:33:58]

Skip the white space at the end of the string, before the closing parenthesis. 

[jansson, 2013/04/05 10:29:42]

Done.

+  $(videoTag.id + '-size').innerHTML = videoTag.width + 'x' + videoTag.height;
+}
+
+/**
  * @private
  * @param {NavigatorUserMediaError} error Error containing details.
  */
 function getUserMediaFailedCallback_(error) {
   debug('GetUserMedia FAILED: Maybe the camera is in use by another process?');
   gRequestWebcamAndMicrophoneResult = 'failed-with-error-' + error.code;
 }
 
 $ = function(id) {
   return document.getElementById(id);
 };