Changeset 85142 in webkit
- Timestamp:
- Apr 27, 2011 8:18:18 PM (13 years ago)
- Location:
- trunk
- Files:
-
- 6 added
- 10 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/LayoutTests/ChangeLog
r85141 r85142 1 2011-04-27 Robert Hogan <robert@webkit.org> 2 3 Reviewed by Adam Barth. 4 5 Allow shadowing of history object 6 https://bugs.webkit.org/show_bug.cgi?id=55965 7 8 * fast/dom/Window/get-set-properties-expected.txt: 9 * fast/dom/Window/get-set-properties.html: 10 * fast/dom/Window/window-property-shadowing-expected.txt: 11 * fast/dom/Window/window-property-shadowing.html: 12 * fast/js/var-declarations-shadowing-expected.txt: 13 * fast/js/var-declarations-shadowing.html: 14 * http/tests/history/cross-origin-replace-history-object-child-expected.txt: Added. 15 * http/tests/history/cross-origin-replace-history-object-child.html: Added. 16 * http/tests/history/cross-origin-replace-history-object-expected.txt: Added. 17 * http/tests/history/cross-origin-replace-history-object.html: Added. 18 * http/tests/history/resources/cross-origin-replaces-history-object-child-iframe.html: Added. 19 * http/tests/history/resources/cross-origin-replaces-history-object-iframe.html: Added. 20 * http/tests/security/cross-frame-access-put-expected.txt: Note that a window property with 21 the DoNotCheckDomainSecurityOnGet attribute generates two cross-origin JS warnings. Amended 22 expected results to include the additional extra warning for the history object. 23 1 24 2011-04-27 Dirk Pranke <dpranke@chromium.org> 2 25 -
trunk/LayoutTests/fast/dom/Window/get-set-properties-expected.txt
r39097 r85142 218 218 PASS: canGet('frames') should be 'true' and is. 219 219 PASS: canSet('frames') should be 'true' and is. 220 PASS: canGet('history') should be 'true' and is. 221 PASS: canSet('history') should be 'true' and is. 220 222 PASS: canGet('innerHeight') should be 'true' and is. 221 223 PASS: canSet('innerHeight') should be 'true' and is. … … 271 273 PASS: canGet('document') should be 'true' and is. 272 274 PASS: canSet('document') should be 'false' and is. 273 PASS: canGet('history') should be 'true' and is.274 PASS: canSet('history') should be 'false' and is.275 275 PASS: canGet('pageXOffset') should be 'true' and is. 276 276 PASS: canSet('pageXOffset') should be 'false' and is. -
trunk/LayoutTests/fast/dom/Window/get-set-properties.html
r30238 r85142 177 177 "event", 178 178 "frames", 179 "history", 179 180 "innerHeight", 180 181 "innerWidth", … … 205 206 "closed", 206 207 "document", 207 "history",208 208 "pageXOffset", 209 209 "pageYOffset", -
trunk/LayoutTests/fast/dom/Window/window-property-shadowing-expected.txt
r67100 r85142 30 30 PASS: self successfully shadowed 31 31 PASS: top successfully shadowed 32 PASS: history successfully shadowed 32 33 PASS: getSelection successfully shadowed 33 34 PASS: getComputedStyle successfully shadowed -
trunk/LayoutTests/fast/dom/Window/window-property-shadowing.html
r67100 r85142 78 78 var top = 1; 79 79 log(top == 1 ? "PASS: top successfully shadowed" : "FAIL: top was not shadowed"); 80 var history = 1; 81 log(history == 1 ? "PASS: history successfully shadowed" : "FAIL: history was not shadowed"); 80 82 81 83 // Window functions -
trunk/LayoutTests/fast/js/var-declarations-shadowing-expected.txt
r67100 r85142 83 83 PASS: screen == marker should be true and is. 84 84 PASS: eval('screen == marker') should be true and is. 85 PASS: history == marker should be true and is. 86 PASS: eval('history == marker') should be true and is. 85 87 ----- 86 PASS: history == marker should be false and is.87 PASS: eval('history == marker') should be false and is.88 88 PASS: frameElement == marker should be false and is. 89 89 PASS: eval('frameElement == marker') should be false and is. -
trunk/LayoutTests/fast/js/var-declarations-shadowing.html
r67100 r85142 260 260 shouldBe(eval('screen == marker'), "eval('screen == marker')", true); 261 261 262 try { 263 eval("var history = marker"); 264 } catch(e) { } 265 shouldBe(history == marker, "history == marker", true); 266 shouldBe(eval('history == marker'), "eval('history == marker')", true); 267 262 268 log("-----"); 263 264 try {265 eval("var history = marker");266 } catch(e) { }267 shouldBe(history == marker, "history == marker", false);268 shouldBe(eval('history == marker'), "eval('history == marker')", false);269 269 270 270 try { -
trunk/LayoutTests/http/tests/security/cross-frame-access-put-expected.txt
r78330 r85142 1 1 CONSOLE MESSAGE: line 1: Unsafe JavaScript attempt to access frame with URL http://127.0.0.1:8000/security/cross-frame-access-put.html from frame with URL http://localhost:8000/security/resources/cross-frame-iframe-for-put-test.html. Domains, protocols and ports must match. 2 3 CONSOLE MESSAGE: line 1: Unsafe JavaScript attempt to access frame with URL http://localhost:8000/security/resources/cross-frame-iframe-for-put-test.html from frame with URL http://127.0.0.1:8000/security/cross-frame-access-put.html. Domains, protocols and ports must match. 2 4 3 5 CONSOLE MESSAGE: line 1: Unsafe JavaScript attempt to access frame with URL http://localhost:8000/security/resources/cross-frame-iframe-for-put-test.html from frame with URL http://127.0.0.1:8000/security/cross-frame-access-put.html. Domains, protocols and ports must match. -
trunk/Source/WebCore/ChangeLog
r85136 r85142 1 2011-04-27 Robert Hogan <robert@webkit.org> 2 3 Reviewed by Adam Barth. 4 5 Allow shadowing of history object 6 https://bugs.webkit.org/show_bug.cgi?id=55965 7 8 Tests: http/tests/history/cross-origin-replace-history-object-child.html 9 http/tests/history/cross-origin-replace-history-object.html 10 11 * page/DOMWindow.idl: 12 1 13 2011-04-27 James Robinson <jamesr@chromium.org> 2 14 -
trunk/Source/WebCore/page/DOMWindow.idl
r84991 r85142 46 46 // DOM Level 0 47 47 attribute [Replaceable] Screen screen; 48 readonly attribute [DoNotCheckDomainSecurity, JSCCustomGetter] History history;48 attribute [Replaceable, DoNotCheckDomainSecurityOnGet, JSCCustomGetter] History history; 49 49 attribute [Replaceable] BarInfo locationbar; 50 50 attribute [Replaceable] BarInfo menubar;
Note: See TracChangeset
for help on using the changeset viewer.