LayoutTests/http/tests/websocket/tests/hybi/workers/worker-reload.html - Issue 10270006: Merge 113138

Side by Side Diff

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Side by Side Diff: LayoutTests/http/tests/websocket/tests/hybi/workers/worker-reload.html

Issue 10270006: Merge 113138 (Closed) Base URL: http://svn.webkit.org/repository/webkit/branches/chromium/1084/

Patch Set: Created 8 years, 7 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

View unified diff | Download patch

« no previous file with comments | « LayoutTests/http/tests/websocket/tests/hybi/workers/resources/worker-reload-iframe.html ('k') | LayoutTests/http/tests/websocket/tests/hybi/workers/worker-reload-expected.txt » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

OLD	NEW
1 <!DOCTYPE html>	1 <!DOCTYPE html>

2 <html>	2 <html>

3 <head>	3 <head>

4 <script src="../../../../../js-test-resources/js-test-pre.js"></script>	4 <script src="../../../../../js-test-resources/js-test-pre.js"></script>

5 </head>	5 </head>

6 <body>	6 <body>

7 <div id="description"></div>	7 <div id="description"></div>

8 <div id="console"></div>	8 <div id="console"></div>

9 <script type="text/javascript">	9 <script type="text/javascript">

10 description("Reload after WebSocket creation should not cause a crash.");	10 description("Reload after WebSocket creation should not cause a crash.");

11	11

12 window.jsTestIsAsync = true;	12 window.jsTestIsAsync = true;

13 if (window.layoutTestController)	13 if (window.layoutTestController)

14 layoutTestController.overridePreference("WebKitHixie76WebSocketProtocolEnabl ed", 0);	14 layoutTestController.overridePreference("WebKitHixie76WebSocketProtocolEnabl ed", 0);

15	15

16 document.iframeFinished = function()	16 document.iframeFinished = function()

17 {	17 {

18 testPassed("Test finished.");	18 testPassed("Test finished.");

19 finishJSTest();	19 finishJSTest();

20 };	20 };

21	21

22 var iframeElement = document.createElement("iframe");	22 var iframeElement = document.createElement("iframe");

23 iframeElement.src = "resources/worker-reload-iframe.html";	23 iframeElement.src = "resources/worker-reload-iframe.html";

24 document.body.appendChild(iframeElement);	24 document.body.appendChild(iframeElement);

25 testPassed("Inserted <iframe>.");	25 testPassed("Inserted <iframe>.");

26 </script>	26 </script>

27 <script src="../../../../../js-test-resources/js-test-post.js"></script>	27 <script src="../../../../../js-test-resources/js-test-post.js"></script>

28 </body>	28 </body>

29 </html>	29 </html>

OLD	NEW