diff options
| author | jamiewalch@google.com <jamiewalch@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-10-26 18:10:45 +0000 |
|---|---|---|
| committer | jamiewalch@google.com <jamiewalch@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-10-26 18:10:45 +0000 |
| commit | f66a521ff7c53953a8d92d685896ae339e383ba1 (patch) | |
| tree | f9aaafcc469f1de6b1656a758f6c910e33d0f11a /remoting | |
| parent | 205f96dad5e9e4000957d0b1ad94a52523435ff9 (diff) | |
| download | chromium_src-f66a521ff7c53953a8d92d685896ae339e383ba1.zip chromium_src-f66a521ff7c53953a8d92d685896ae339e383ba1.tar.gz chromium_src-f66a521ff7c53953a8d92d685896ae339e383ba1.tar.bz2 | |
Fixed javascript to compile again.
BUG=None
TEST=None
Review URL: http://codereview.chromium.org/8395032
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@107388 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'remoting')
| -rw-r--r-- | remoting/client/plugin/chromoting_scriptable_object.h | 6 | ||||
| -rw-r--r-- | remoting/webapp/me2mom/viewer_plugin_proto.js | 3 |
2 files changed, 6 insertions, 3 deletions
diff --git a/remoting/client/plugin/chromoting_scriptable_object.h b/remoting/client/plugin/chromoting_scriptable_object.h index 311ee81..7d15744 100644 --- a/remoting/client/plugin/chromoting_scriptable_object.h +++ b/remoting/client/plugin/chromoting_scriptable_object.h @@ -73,10 +73,12 @@ // // Latency for capturing in milliseconds. // readonly attribute int videoCaptureLatency; // // Latency for video encoding in milliseconds. -// readonly attribute int videoEncodeLatency; -// // Latency for video decoding in milliseconds. // readonly attribute int videoDecodeLatency; // // Latency for rendering in milliseconds. +// readonly attribute int videoEncodeLatency; +// // Latency for video encoding in milliseconds. +// readonly attribute int videoFramerate; +// // The number of frames received per second. // readonly attribute int videoRenderLatency; // // Latency between an event is sent and a corresponding video packet is // // received. diff --git a/remoting/webapp/me2mom/viewer_plugin_proto.js b/remoting/webapp/me2mom/viewer_plugin_proto.js index 6f31153..79cf4e5 100644 --- a/remoting/webapp/me2mom/viewer_plugin_proto.js +++ b/remoting/webapp/me2mom/viewer_plugin_proto.js @@ -57,7 +57,8 @@ remoting.ViewerPlugin.prototype.connect = /** @type {number} */ remoting.ViewerPlugin.prototype.videoBandwidth; /** @type {number} */ remoting.ViewerPlugin.prototype.videoCaptureLatency; -/** @type {number} */ remoting.ViewerPlugin.prototype.videoEncodeLatency; /** @type {number} */ remoting.ViewerPlugin.prototype.videoDecodeLatency; +/** @type {number} */ remoting.ViewerPlugin.prototype.videoEncodeLatency; +/** @type {number} */ remoting.ViewerPlugin.prototype.videoFramerate; /** @type {number} */ remoting.ViewerPlugin.prototype.videoRenderLatency; /** @type {number} */ remoting.ViewerPlugin.prototype.roundTripLatency; |