Chromium Code Reviews Chromium Code Reviews
Issue 12255004:
Remove workaround in WebrtcBrowserTest.CallWithDataAndMedia. (Closed)
Base URL: svn://svn.chromium.org/chrome/trunk/src| OLD | NEW |
|---|---|
| 1 <html> | 1 <html> |
| 2 <head> | 2 <head> |
| 3 <script type="text/javascript"> | 3 <script type="text/javascript"> |
| 4 $ = function(id) { | 4 $ = function(id) { |
| 5 return document.getElementById(id); | 5 return document.getElementById(id); |
| 6 }; | 6 }; |
| 7 | 7 |
| 8 var gFirstConnection = null; | 8 var gFirstConnection = null; |
| 9 var gSecondConnection = null; | 9 var gSecondConnection = null; |
| 10 var gTestWithoutMsidAndBundle = false; | 10 var gTestWithoutMsidAndBundle = false; |
| (...skipping 87 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 98 eventOccured(); | 98 eventOccured(); |
| 99 } | 99 } |
| 100 | 100 |
| 101 // Event handler for when |gSecondConnection| receive a new dataChannel. | 101 // Event handler for when |gSecondConnection| receive a new dataChannel. |
| 102 gSecondConnection.ondatachannel = function (event) { | 102 gSecondConnection.ondatachannel = function (event) { |
| 103 var secondDataChannel = event.channel; | 103 var secondDataChannel = event.channel; |
| 104 | 104 |
| 105 // When |secondDataChannel| receive a message, send a message back. | 105 // When |secondDataChannel| receive a message, send a message back. |
| 106 secondDataChannel.onmessage = function(event) { | 106 secondDataChannel.onmessage = function(event) { |
| 107 expectEquals(event.data, sendDataString); | 107 expectEquals(event.data, sendDataString); |
| 108 // TODO(perkj): Currently we sometimes can't send a message here since | 108 expectEquals('open', secondDataChannel.readyState); |
| 109 // the the |dataChannel.readyState| has not transitioned to open yet. | |
| 110 // http://code.google.com/p/webrtc/issues/detail?id=1262 | |
| 111 if (secondDataChannel.readyState == "open") { | 109 if (secondDataChannel.readyState == "open") { |
|
phoglund_chromium
2013/02/13 10:34:47
Get rid of this if.
| |
| 112 secondDataChannel.send(sendDataString); | 110 secondDataChannel.send(sendDataString); |
| 113 } else { | 111 } |
| 114 secondDataChannel.onopen = function(event) { | |
| 115 expectEquals('open', secondDataChannel.readyState); | |
| 116 secondDataChannel.send(sendDataString); | |
| 117 } | |
| 118 } | |
| 119 } | 112 } |
| 120 } | 113 } |
| 121 } | 114 } |
| 122 | 115 |
| 123 function failedCallback(error) { | 116 function failedCallback(error) { |
| 124 document.title = 'getUserMedia request failed with code ' + error.code; | 117 document.title = 'getUserMedia request failed with code ' + error.code; |
| 125 } | 118 } |
| 126 | 119 |
| 127 function okCallback(localStream) { | 120 function okCallback(localStream) { |
| 128 var localStreamUrl = webkitURL.createObjectURL(localStream); | 121 var localStreamUrl = webkitURL.createObjectURL(localStream); |
| (...skipping 149 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 278 autoplay="autoplay"></video></td> | 271 autoplay="autoplay"></video></td> |
| 279 <td><canvas width="320" height="240" id="canvas"></canvas></td> | 272 <td><canvas width="320" height="240" id="canvas"></canvas></td> |
| 280 </tr> | 273 </tr> |
| 281 <tr> | 274 <tr> |
| 282 <td colspan="3">You should see the same animated feed in all three | 275 <td colspan="3">You should see the same animated feed in all three |
| 283 displays (the canvas will lag a bit). | 276 displays (the canvas will lag a bit). |
| 284 </td> | 277 </td> |
| 285 </table> | 278 </table> |
| 286 </body> | 279 </body> |
| 287 </html> | 280 </html> |
| OLD | NEW |
