Chromium Code Reviews Chromium Code Reviews
Issue 12252004:
PPAPI/WS: use server providing hostname as test serevr hostname (Closed)
Base URL: svn://svn.chromium.org/chrome/trunk/src| OLD | NEW |
|---|---|
| 1 <html><head> | 1 <html><head> |
| 2 <meta http-equiv="Pragma" content="no-cache" /> | 2 <meta http-equiv="Pragma" content="no-cache" /> |
| 3 <meta http-equiv="Expires" content="-1" /> | 3 <meta http-equiv="Expires" content="-1" /> |
| 4 <link rel="stylesheet" href="test_page.css"> | 4 <link rel="stylesheet" href="test_page.css"> |
| 5 <script> | 5 <script> |
| 6 function AdjustHeight(frameWin) { | 6 function AdjustHeight(frameWin) { |
| 7 var div = frameWin.document.getElementsByTagName("div")[0]; | 7 var div = frameWin.document.getElementsByTagName("div")[0]; |
| 8 var height = frameWin.getComputedStyle(div).height; | 8 var height = frameWin.getComputedStyle(div).height; |
| 9 frameWin.frameElement.style.height = height; | 9 frameWin.frameElement.style.height = height; |
| 10 } | 10 } |
| (...skipping 15 matching lines...) Expand all Loading... | |
| 26 function AppendFrame(testcase, i) { | 26 function AppendFrame(testcase, i) { |
| 27 var p = document.createElement("P"); | 27 var p = document.createElement("P"); |
| 28 p.setAttribute("class", "frame-container"); | 28 p.setAttribute("class", "frame-container"); |
| 29 | 29 |
| 30 var title = document.createElement("H2"); | 30 var title = document.createElement("H2"); |
| 31 title.appendChild(document.createTextNode(testcase)); | 31 title.appendChild(document.createTextNode(testcase)); |
| 32 p.appendChild(title); | 32 p.appendChild(title); |
| 33 | 33 |
| 34 var frame = document.createElement("IFRAME"); | 34 var frame = document.createElement("IFRAME"); |
| 35 var mode = ExtractSearchParameter("mode"); | 35 var mode = ExtractSearchParameter("mode"); |
| 36 var websocket_host = ExtractSearchParameter("websocket_host"); | |
| 36 var websocket_port = ExtractSearchParameter("websocket_port"); | 37 var websocket_port = ExtractSearchParameter("websocket_port"); |
| 37 var ssl_server_port = ExtractSearchParameter("ssl_server_port"); | 38 var ssl_server_port = ExtractSearchParameter("ssl_server_port"); |
| 38 var src = "?testcase=" + testcase; | 39 var src = "?testcase=" + testcase; |
| 39 if (mode == "nacl") | 40 if (mode == "nacl") |
| 40 src += "&mode=nacl"; | 41 src += "&mode=nacl"; |
| 42 if (Websocket_host != "") | |
|
dmichael (off chromium)
2013/02/13 21:41:13
Websocket should be lower-case here
Takashi Toyoshima
2013/02/14 08:28:28
Thank you for finding this.
Fixed.
| |
| 43 src += "&websocket_host=" + websocket_host; | |
| 41 if (websocket_port != "") | 44 if (websocket_port != "") |
| 42 src += "&websocket_port=" + websocket_port; | 45 src += "&websocket_port=" + websocket_port; |
| 43 if (ssl_server_port != "") | 46 if (ssl_server_port != "") |
| 44 src += "&ssl_server_port=" + ssl_server_port; | 47 src += "&ssl_server_port=" + ssl_server_port; |
| 45 frame.setAttribute("src", src); | 48 frame.setAttribute("src", src); |
| 46 | 49 |
| 47 frame.setAttribute("onload", "LoadNext(" + (i + 1) + ")"); | 50 frame.setAttribute("onload", "LoadNext(" + (i + 1) + ")"); |
| 48 p.appendChild(frame); | 51 p.appendChild(frame); |
| 49 | 52 |
| 50 document.body.appendChild(p); | 53 document.body.appendChild(p); |
| (...skipping 191 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 242 } | 245 } |
| 243 } | 246 } |
| 244 if (obj) { | 247 if (obj) { |
| 245 obj.setAttribute("width", 80); | 248 obj.setAttribute("width", 80); |
| 246 obj.setAttribute("height", 80); | 249 obj.setAttribute("height", 80); |
| 247 obj.setAttribute("style", | 250 obj.setAttribute("style", |
| 248 "background-color:#AAAAAA;border:1px solid black;"); | 251 "background-color:#AAAAAA;border:1px solid black;"); |
| 249 obj.setAttribute("id", "plugin"); | 252 obj.setAttribute("id", "plugin"); |
| 250 obj.setAttribute("testcase", testcase); | 253 obj.setAttribute("testcase", testcase); |
| 251 obj.setAttribute("protocol", window.location.protocol); | 254 obj.setAttribute("protocol", window.location.protocol); |
| 255 var websocket_host = ExtractSearchParameter("websocket_host"); | |
| 256 if (websocket_host != "") | |
| 257 obj.setAttribute("websocket_host", websocket_host); | |
| 252 var websocket_port = ExtractSearchParameter("websocket_port"); | 258 var websocket_port = ExtractSearchParameter("websocket_port"); |
| 253 if (websocket_port != "") | 259 if (websocket_port != "") |
| 254 obj.setAttribute("websocket_port", websocket_port); | 260 obj.setAttribute("websocket_port", websocket_port); |
| 255 var ssl_server_port = ExtractSearchParameter("ssl_server_port"); | 261 var ssl_server_port = ExtractSearchParameter("ssl_server_port"); |
| 256 if (ssl_server_port != "") | 262 if (ssl_server_port != "") |
| 257 obj.setAttribute("ssl_server_port", ssl_server_port); | 263 obj.setAttribute("ssl_server_port", ssl_server_port); |
| 258 | 264 |
| 259 var container = document.getElementById("container"); | 265 var container = document.getElementById("container"); |
| 260 container.addEventListener("message", handleTestingMessage, true); | 266 container.addEventListener("message", handleTestingMessage, true); |
| 261 | 267 |
| (...skipping 48 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 310 InternalError("Bad MessageEvent.initMessageEvent called!"); | 316 InternalError("Bad MessageEvent.initMessageEvent called!"); |
| 311 } | 317 } |
| 312 | 318 |
| 313 </script> | 319 </script> |
| 314 </head><body> | 320 </head><body> |
| 315 <div> | 321 <div> |
| 316 <div id="container"></div> | 322 <div id="container"></div> |
| 317 <div id="console"><span class="load_msg">loading...</span></div> | 323 <div id="console"><span class="load_msg">loading...</span></div> |
| 318 </div> | 324 </div> |
| 319 </body></html> | 325 </body></html> |
| OLD | NEW |
