LayoutTests/http/tests/security/cross-frame-access-get.html - Issue 9895001: Merge 111098

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/security/cross-frame-access-get.html

Issue 9895001: Merge 111098 (Closed) Base URL: http://svn.webkit.org/repository/webkit/branches/chromium/1025/

Patch Set: Created 8 years, 8 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/security/cross-frame-access-call-expected.txt ('k') | LayoutTests/http/tests/security/cross-frame-access-get-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 <html>	1 <html>

2 <head>	2 <head>

3 <script src="resources/cross-frame-access.js"></script>	3 <script src="resources/cross-frame-access.js"></script>

4 <script>	4 <script>

5 var windowConstructorPropertiesNotAllowed = [	5 var windowConstructorPropertiesNotAllowed = [

6 "Attr",	6 "Attr",

7 "Audio",	7 "Audio",

8 "CDATASection",	8 "CDATASection",

9 "CSSPrimitiveValue",	9 "CSSPrimitiveValue",

10 "CSSRule",	10 "CSSRule",

(...skipping 115 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
126 "prompt",	126 "prompt",

127 "releaseEvents",	127 "releaseEvents",

128 "removeEventListener",	128 "removeEventListener",

129 "resizeBy",	129 "resizeBy",

130 "resizeTo",	130 "resizeTo",

131 "scroll",	131 "scroll",

132 "scrollBy",	132 "scrollBy",

133 "scrollTo",	133 "scrollTo",

134 "setInterval",	134 "setInterval",

135 "setTimeout",	135 "setTimeout",

136 // FIXME: This function is now implemented on mac and hence the expe cted output changes. Uncomment after adding a	136 "showModalDialog",

137 // mac specific test for showModalDialog. Bug# 39897

138 // "showModalDialog",

139 "stop"	137 "stop"

140 ];	138 ];

141	139

142 var windowAttributesPropertiesNotAllowed = [	140 var windowAttributesPropertiesNotAllowed = [

143 "clientInformation",	141 "clientInformation",

144 "console",	142 "console",

145 "crypto",	143 "crypto",

146 "defaultStatus",	144 "defaultStatus",

147 "defaultstatus",	145 "defaultstatus",

148 "devicePixelRatio",	146 "devicePixelRatio",

(...skipping 141 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
290 }	288 }

291 }	289 }

292 </script>	290 </script>

293 </head>	291 </head>

294 <body>	292 <body>

295 <p>This test checks cross-frame access security (rdar://problem/5251309).</p>	293 <p>This test checks cross-frame access security (rdar://problem/5251309).</p>

296 <iframe src="http://localhost:8000/security/resources/cross-frame-iframe-for-get -test.html" style=""></iframe>	294 <iframe src="http://localhost:8000/security/resources/cross-frame-iframe-for-get -test.html" style=""></iframe>

297 <pre id="console"></pre>	295 <pre id="console"></pre>

298 </body>	296 </body>

299 </html>	297 </html>

OLD	NEW