From 0c7685086b2b3efffe8d3a29e4c95d7837c983c7 Mon Sep 17 00:00:00 2001 From: "arv@chromium.org" Date: Fri, 24 Feb 2012 06:21:32 +0000 Subject: [PATCH] Rename DOMWindow to Window in the bindings https://bugs.webkit.org/show_bug.cgi?id=78721 Reviewed by Adam Barth. Source/WebCore: Covered by existing tests. * inspector/front-end/DetailedHeapshotGridNodes.js: (WebInspector.HeapSnapshotGenericObjectNode): (WebInspector.HeapSnapshotGenericObjectNode.prototype.isWindow): * inspector/front-end/HeapSnapshot.js: (WebInspector.HeapSnapshotNode.prototype.get isWindow): (WebInspector.HeapSnapshot.prototype._calculateObjectToWindowDistance): (WebInspector.HeapSnapshot.prototype._markQueriableHeapObjects): * page/DOMWindow.idl: LayoutTests: * fast/dom/Window/atob-btoa-expected.txt: * fast/dom/Window/atob-btoa.html: * fast/dom/Window/window-lookup-precedence-expected.txt: * fast/dom/Window/window-lookup-precedence.html: * fast/dom/Window/window-postmessage-args-expected.txt: * fast/dom/Window/window-properties-expected.txt: * fast/dom/Window/window-property-descriptors-expected.txt: * fast/dom/dom-constructors-expected.txt: * fast/dom/dom-constructors.html: * fast/dom/prototype-inheritance-2-expected.txt: * fast/dom/script-tests/prototype-inheritance-2.js: (pushPropertyValuesWithUnseenTypes): * fast/dom/wrapper-classes-expected.txt: * fast/dom/wrapper-classes.html: * fast/events/device-orientation-crash-expected.txt: * fast/events/device-orientation-crash.html: * fast/events/event-trace-expected.txt: * fast/events/event-view-toString-expected.txt: * fast/events/popup-blocked-to-post-blank-expected.txt: * fast/events/popup-blocked-to-post-blank.html: * fast/js/eval-cross-window-expected.txt: * fast/js/eval-keyword-vs-function-expected.txt: * fast/js/function-bind-expected.txt: * fast/js/mozilla/strict/10.4.3-expected.txt: * fast/js/mozilla/strict/15.3.4.5-expected.txt: * fast/js/mozilla/strict/this-for-function-expression-recursion-expected.txt: * fast/js/script-tests/function-bind.js: * fast/js/toString-and-valueOf-override-expected.txt: * http/tests/inspector-enabled/console-clear-arguments-on-frame-remove-expected.txt: * http/tests/security/cross-frame-access-custom-expected.txt: * http/tests/security/cross-frame-access-custom.html: * http/tests/security/cross-frame-access-put-expected.txt: * http/tests/security/document-all-expected.txt: * inspector/console/console-dir-global-expected.txt: * inspector/debugger/debugger-expand-scope-expected.txt: * inspector/profiler/heap-snapshot-test.js: (initialize_HeapSnapshotTest.InspectorTest.createHeapSnapshotMockWithDOM): (initialize_HeapSnapshotTest): * inspector/profiler/heap-snapshot.html: * java/lc3/JSObject/ToJSObject-001-expected.txt: * java/lc3/JSObject/ToObject-001-expected.txt: * java/lc3/JSObject/ToString-001-expected.txt: * platform/chromium-mac/fast/events/event-view-toString-expected.txt: * platform/chromium-win/fast/events/event-view-toString-expected.txt: * platform/chromium-win/fast/js/README: * platform/chromium/fast/dom/Window/window-lookup-precedence-expected.txt: * platform/chromium/fast/dom/Window/window-postmessage-args-expected.txt: * platform/chromium/fast/dom/wrapper-classes-expected.txt: * platform/chromium/fast/js/mozilla/strict/15.3.4.5-expected.txt: * platform/chromium/fast/js/toString-and-valueOf-override-expected.txt: * platform/chromium/http/tests/security/cross-frame-access-call-expected.txt: * platform/chromium/http/tests/security/cross-frame-access-put-expected.txt: * platform/chromium/inspector/console/console-dir-global-expected.txt: * platform/chromium/inspector/debugger/debugger-expand-scope-expected.txt: * platform/gtk/fast/dom/Window/window-properties-expected.txt: * platform/gtk/fast/dom/prototype-inheritance-2-expected.txt: * platform/gtk/fast/js/global-constructors-expected.txt: * platform/gtk/http/tests/security/cross-frame-access-put-expected.txt: * platform/mac/fast/dom/Window/window-properties-expected.txt: * platform/mac/fast/dom/Window/window-property-descriptors-expected.txt: * platform/mac/fast/dom/prototype-inheritance-2-expected.txt: * platform/mac/fast/dom/wrapper-classes-objc.html: * platform/mac/fast/js/global-constructors-expected.txt: * platform/qt-5.0-wk2/fast/dom/Window/window-properties-expected.txt: * platform/qt-5.0-wk2/fast/dom/Window/window-property-descriptors-expected.txt: * platform/qt-5.0-wk2/fast/dom/prototype-inheritance-2-expected.txt: * platform/qt-arm/fast/dom/Window/window-property-descriptors-expected.txt: * platform/qt/fast/dom/Window/window-properties-expected.txt: * platform/qt/fast/dom/prototype-inheritance-2-expected.txt: * platform/qt/fast/js/global-constructors-expected.txt: * platform/qt/http/tests/security/cross-frame-access-put-expected.txt: * platform/win/fast/dom/Window/window-properties-expected.txt: * platform/win/fast/dom/Window/window-property-descriptors-expected.txt: * platform/win/fast/dom/prototype-inheritance-2-expected.txt: * sputnik/Conformance/11_Expressions/11.1_Primary_Expressions/11.1.1_The_this_Keyword/S11.1.1_A2-expected.txt: * sputnik/Conformance/15_Native_Objects/15.1_The_Global_Object/S15.1_A1_T1-expected.txt: * sputnik/Conformance/15_Native_Objects/15.1_The_Global_Object/S15.1_A1_T2-expected.txt: * sputnik/Conformance/15_Native_Objects/15.1_The_Global_Object/S15.1_A2_T1-expected.txt: git-svn-id: http://svn.webkit.org/repository/webkit/trunk@108729 268f45cc-cd09-0410-ab3c-d52691b4dbfc --- LayoutTests/ChangeLog | 86 +++++++++++++++++++++ LayoutTests/fast/dom/Window/atob-btoa-expected.txt | 2 +- LayoutTests/fast/dom/Window/atob-btoa.html | 2 +- .../Window/window-lookup-precedence-expected.txt | 22 +++--- .../fast/dom/Window/window-lookup-precedence.html | 2 +- .../Window/window-postmessage-args-expected.txt | 4 +- .../fast/dom/Window/window-properties-expected.txt | 6 +- .../window-property-descriptors-expected.txt | 1 + LayoutTests/fast/dom/dom-constructors-expected.txt | 2 +- LayoutTests/fast/dom/dom-constructors.html | 2 +- .../fast/dom/prototype-inheritance-2-expected.txt | 6 +- .../dom/script-tests/prototype-inheritance-2.js | 2 +- LayoutTests/fast/dom/wrapper-classes-expected.txt | 6 +- LayoutTests/fast/dom/wrapper-classes.html | 2 +- .../events/device-orientation-crash-expected.txt | 2 +- .../fast/events/device-orientation-crash.html | 2 +- LayoutTests/fast/events/event-trace-expected.txt | 4 +- .../fast/events/event-view-toString-expected.txt | 4 +- .../popup-blocked-to-post-blank-expected.txt | 2 +- .../fast/events/popup-blocked-to-post-blank.html | 2 +- LayoutTests/fast/js/eval-cross-window-expected.txt | 4 +- .../fast/js/eval-keyword-vs-function-expected.txt | 8 +- LayoutTests/fast/js/function-bind-expected.txt | 2 +- .../fast/js/mozilla/strict/10.4.3-expected.txt | 4 +- .../fast/js/mozilla/strict/15.3.4.5-expected.txt | 4 +- ...-for-function-expression-recursion-expected.txt | 2 +- LayoutTests/fast/js/script-tests/function-bind.js | 2 +- .../js/toString-and-valueOf-override-expected.txt | 16 ++-- ...le-clear-arguments-on-frame-remove-expected.txt | 4 +- .../cross-frame-access-custom-expected.txt | 2 +- .../tests/security/cross-frame-access-custom.html | 2 +- .../security/cross-frame-access-put-expected.txt | 6 +- .../http/tests/security/document-all-expected.txt | 2 +- .../console/console-dir-global-expected.txt | 2 +- .../debugger/debugger-expand-scope-expected.txt | 6 +- .../inspector/profiler/heap-snapshot-test.js | 12 +-- LayoutTests/inspector/profiler/heap-snapshot.html | 2 +- .../java/lc3/JSObject/ToJSObject-001-expected.txt | 2 +- .../java/lc3/JSObject/ToObject-001-expected.txt | 2 +- .../java/lc3/JSObject/ToString-001-expected.txt | 4 +- .../fast/events/event-view-toString-expected.txt | 2 +- .../fast/events/event-view-toString-expected.txt | 2 +- LayoutTests/platform/chromium-win/fast/js/README | 2 +- .../Window/window-lookup-precedence-expected.txt | 22 +++--- .../Window/window-postmessage-args-expected.txt | 4 +- .../chromium/fast/dom/wrapper-classes-expected.txt | 6 +- .../fast/js/mozilla/strict/15.3.4.5-expected.txt | 4 +- .../js/toString-and-valueOf-override-expected.txt | 16 ++-- .../security/cross-frame-access-call-expected.txt | 2 +- .../security/cross-frame-access-put-expected.txt | 6 +- .../console/console-dir-global-expected.txt | 2 +- .../debugger/debugger-expand-scope-expected.txt | 4 +- .../fast/dom/Window/window-properties-expected.txt | 6 +- .../fast/dom/prototype-inheritance-2-expected.txt | 6 +- .../gtk/fast/js/global-constructors-expected.txt | 2 +- .../security/cross-frame-access-put-expected.txt | 6 +- .../fast/dom/Window/window-properties-expected.txt | 89 +++++++++++----------- .../window-property-descriptors-expected.txt | 1 + .../fast/dom/prototype-inheritance-2-expected.txt | 6 +- .../mac/fast/dom/wrapper-classes-objc.html | 2 +- .../mac/fast/js/global-constructors-expected.txt | 1 + .../fast/dom/Window/window-properties-expected.txt | 6 +- .../window-property-descriptors-expected.txt | 1 + .../fast/dom/prototype-inheritance-2-expected.txt | 6 +- .../window-property-descriptors-expected.txt | 1 + .../fast/dom/Window/window-properties-expected.txt | 6 +- .../fast/dom/prototype-inheritance-2-expected.txt | 6 +- .../qt/fast/js/global-constructors-expected.txt | 2 +- .../security/cross-frame-access-put-expected.txt | 6 +- .../fast/dom/Window/window-properties-expected.txt | 6 +- .../window-property-descriptors-expected.txt | 1 + .../fast/dom/prototype-inheritance-2-expected.txt | 6 +- .../S11.1.1_A2-expected.txt | 2 +- .../S15.1_A1_T1-expected.txt | 2 +- .../S15.1_A1_T2-expected.txt | 2 +- .../S15.1_A2_T1-expected.txt | 2 +- Source/WebCore/ChangeLog | 18 +++++ .../front-end/DetailedHeapshotGridNodes.js | 6 +- Source/WebCore/inspector/front-end/HeapSnapshot.js | 12 +-- Source/WebCore/page/DOMWindow.idl | 3 +- 80 files changed, 323 insertions(+), 211 deletions(-) diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog index d8b12e7..801a1ee 100644 --- a/LayoutTests/ChangeLog +++ b/LayoutTests/ChangeLog @@ -1,3 +1,89 @@ +2012-02-23 Erik Arvidsson + + Rename DOMWindow to Window in the bindings + https://bugs.webkit.org/show_bug.cgi?id=78721 + + Reviewed by Adam Barth. + + * fast/dom/Window/atob-btoa-expected.txt: + * fast/dom/Window/atob-btoa.html: + * fast/dom/Window/window-lookup-precedence-expected.txt: + * fast/dom/Window/window-lookup-precedence.html: + * fast/dom/Window/window-postmessage-args-expected.txt: + * fast/dom/Window/window-properties-expected.txt: + * fast/dom/Window/window-property-descriptors-expected.txt: + * fast/dom/dom-constructors-expected.txt: + * fast/dom/dom-constructors.html: + * fast/dom/prototype-inheritance-2-expected.txt: + * fast/dom/script-tests/prototype-inheritance-2.js: + (pushPropertyValuesWithUnseenTypes): + * fast/dom/wrapper-classes-expected.txt: + * fast/dom/wrapper-classes.html: + * fast/events/device-orientation-crash-expected.txt: + * fast/events/device-orientation-crash.html: + * fast/events/event-trace-expected.txt: + * fast/events/event-view-toString-expected.txt: + * fast/events/popup-blocked-to-post-blank-expected.txt: + * fast/events/popup-blocked-to-post-blank.html: + * fast/js/eval-cross-window-expected.txt: + * fast/js/eval-keyword-vs-function-expected.txt: + * fast/js/function-bind-expected.txt: + * fast/js/mozilla/strict/10.4.3-expected.txt: + * fast/js/mozilla/strict/15.3.4.5-expected.txt: + * fast/js/mozilla/strict/this-for-function-expression-recursion-expected.txt: + * fast/js/script-tests/function-bind.js: + * fast/js/toString-and-valueOf-override-expected.txt: + * http/tests/inspector-enabled/console-clear-arguments-on-frame-remove-expected.txt: + * http/tests/security/cross-frame-access-custom-expected.txt: + * http/tests/security/cross-frame-access-custom.html: + * http/tests/security/cross-frame-access-put-expected.txt: + * http/tests/security/document-all-expected.txt: + * inspector/console/console-dir-global-expected.txt: + * inspector/debugger/debugger-expand-scope-expected.txt: + * inspector/profiler/heap-snapshot-test.js: + (initialize_HeapSnapshotTest.InspectorTest.createHeapSnapshotMockWithDOM): + (initialize_HeapSnapshotTest): + * inspector/profiler/heap-snapshot.html: + * java/lc3/JSObject/ToJSObject-001-expected.txt: + * java/lc3/JSObject/ToObject-001-expected.txt: + * java/lc3/JSObject/ToString-001-expected.txt: + * platform/chromium-mac/fast/events/event-view-toString-expected.txt: + * platform/chromium-win/fast/events/event-view-toString-expected.txt: + * platform/chromium-win/fast/js/README: + * platform/chromium/fast/dom/Window/window-lookup-precedence-expected.txt: + * platform/chromium/fast/dom/Window/window-postmessage-args-expected.txt: + * platform/chromium/fast/dom/wrapper-classes-expected.txt: + * platform/chromium/fast/js/mozilla/strict/15.3.4.5-expected.txt: + * platform/chromium/fast/js/toString-and-valueOf-override-expected.txt: + * platform/chromium/http/tests/security/cross-frame-access-call-expected.txt: + * platform/chromium/http/tests/security/cross-frame-access-put-expected.txt: + * platform/chromium/inspector/console/console-dir-global-expected.txt: + * platform/chromium/inspector/debugger/debugger-expand-scope-expected.txt: + * platform/gtk/fast/dom/Window/window-properties-expected.txt: + * platform/gtk/fast/dom/prototype-inheritance-2-expected.txt: + * platform/gtk/fast/js/global-constructors-expected.txt: + * platform/gtk/http/tests/security/cross-frame-access-put-expected.txt: + * platform/mac/fast/dom/Window/window-properties-expected.txt: + * platform/mac/fast/dom/Window/window-property-descriptors-expected.txt: + * platform/mac/fast/dom/prototype-inheritance-2-expected.txt: + * platform/mac/fast/dom/wrapper-classes-objc.html: + * platform/mac/fast/js/global-constructors-expected.txt: + * platform/qt-5.0-wk2/fast/dom/Window/window-properties-expected.txt: + * platform/qt-5.0-wk2/fast/dom/Window/window-property-descriptors-expected.txt: + * platform/qt-5.0-wk2/fast/dom/prototype-inheritance-2-expected.txt: + * platform/qt-arm/fast/dom/Window/window-property-descriptors-expected.txt: + * platform/qt/fast/dom/Window/window-properties-expected.txt: + * platform/qt/fast/dom/prototype-inheritance-2-expected.txt: + * platform/qt/fast/js/global-constructors-expected.txt: + * platform/qt/http/tests/security/cross-frame-access-put-expected.txt: + * platform/win/fast/dom/Window/window-properties-expected.txt: + * platform/win/fast/dom/Window/window-property-descriptors-expected.txt: + * platform/win/fast/dom/prototype-inheritance-2-expected.txt: + * sputnik/Conformance/11_Expressions/11.1_Primary_Expressions/11.1.1_The_this_Keyword/S11.1.1_A2-expected.txt: + * sputnik/Conformance/15_Native_Objects/15.1_The_Global_Object/S15.1_A1_T1-expected.txt: + * sputnik/Conformance/15_Native_Objects/15.1_The_Global_Object/S15.1_A1_T2-expected.txt: + * sputnik/Conformance/15_Native_Objects/15.1_The_Global_Object/S15.1_A2_T1-expected.txt: + 2012-02-23 Dan Bernstein REGRESSION: Assertion failure in Document::setCompatibilityMode() (!m_styleSheets->length()) in fast/dynamic/crash-paint-no-documentElement-renderer.html diff --git a/LayoutTests/fast/dom/Window/atob-btoa-expected.txt b/LayoutTests/fast/dom/Window/atob-btoa-expected.txt index 232b118..ef1b98e 100644 --- a/LayoutTests/fast/dom/Window/atob-btoa-expected.txt +++ b/LayoutTests/fast/dom/Window/atob-btoa-expected.txt @@ -15,7 +15,7 @@ PASS window.btoa() is "dW5kZWZpbmVk" PASS window.btoa("") is "" PASS window.btoa(null) is "" PASS window.btoa(undefined) is "dW5kZWZpbmVk" -PASS window.btoa(window) is "W29iamVjdCBET01XaW5kb3dd" +PASS window.btoa(window) is "W29iamVjdCBXaW5kb3dd" PASS window.btoa("éé") is "6ek=" PASS window.btoa("\u0080\u0081") is "gIE=" PASS window.btoa("тест") threw exception Error: INVALID_CHARACTER_ERR: DOM Exception 5. diff --git a/LayoutTests/fast/dom/Window/atob-btoa.html b/LayoutTests/fast/dom/Window/atob-btoa.html index 701598b..50e81d4 100644 --- a/LayoutTests/fast/dom/Window/atob-btoa.html +++ b/LayoutTests/fast/dom/Window/atob-btoa.html @@ -23,7 +23,7 @@ shouldBe('window.btoa()', '"dW5kZWZpbmVk"'); shouldBe('window.btoa("")', '""'); shouldBe('window.btoa(null)', '""'); shouldBe('window.btoa(undefined)', '"dW5kZWZpbmVk"'); -shouldBe('window.btoa(window)', '"W29iamVjdCBET01XaW5kb3dd"'); // "[object DOMWindow]" +shouldBe('window.btoa(window)', '"W29iamVjdCBXaW5kb3dd"'); // "[object Window]" shouldBe('window.btoa("éé")', '"6ek="'); shouldBe('window.btoa("\\u0080\\u0081")', '"gIE="'); shouldThrow('window.btoa("тест")'); diff --git a/LayoutTests/fast/dom/Window/window-lookup-precedence-expected.txt b/LayoutTests/fast/dom/Window/window-lookup-precedence-expected.txt index 92224ca..2e8673b 100644 --- a/LayoutTests/fast/dom/Window/window-lookup-precedence-expected.txt +++ b/LayoutTests/fast/dom/Window/window-lookup-precedence-expected.txt @@ -1,4 +1,4 @@ -Tests lookup precedence for properties on DOMWindow objects in the presence of a child frame, and that IDL properties defined in the prototype (window.location, window.focus, etc) have higher lookup precedence than named document elements (such as input elements). +Tests lookup precedence for properties on Window objects in the presence of a child frame, and that IDL properties defined in the prototype (window.location, window.focus, etc) have higher lookup precedence than named document elements (such as input elements). On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE". @@ -322,16 +322,16 @@ PASS win['XSLTProcessor'] == '[object XSLTProcessorConstructor]' is true PASS win['XSLTProcessor'] == '[object XSLTProcessorConstructor]' is true PASS win['onload'] is null PASS win['onload'] is null -PASS win['frames'] == '[object DOMWindow]' is true -PASS win['frames'] == '[object DOMWindow]' is true -PASS win['parent'] == '[object DOMWindow]' is true -PASS win['parent'] == '[object DOMWindow]' is true -PASS win['self'] == '[object DOMWindow]' is true -PASS win['self'] == '[object DOMWindow]' is true -PASS win['top'] == '[object DOMWindow]' is true -PASS win['top'] == '[object DOMWindow]' is true -PASS win['window'] == '[object DOMWindow]' is true -PASS win['window'] == '[object DOMWindow]' is true +PASS win['frames'] == '[object Window]' is true +PASS win['frames'] == '[object Window]' is true +PASS win['parent'] == '[object Window]' is true +PASS win['parent'] == '[object Window]' is true +PASS win['self'] == '[object Window]' is true +PASS win['self'] == '[object Window]' is true +PASS win['top'] == '[object Window]' is true +PASS win['top'] == '[object Window]' is true +PASS win['window'] == '[object Window]' is true +PASS win['window'] == '[object Window]' is true PASS win['locationbar'] == '[object BarInfo]' is true PASS win['locationbar'] == '[object BarInfo]' is true PASS win['menubar'] == '[object BarInfo]' is true diff --git a/LayoutTests/fast/dom/Window/window-lookup-precedence.html b/LayoutTests/fast/dom/Window/window-lookup-precedence.html index 44a9d62..2f90d17 100644 --- a/LayoutTests/fast/dom/Window/window-lookup-precedence.html +++ b/LayoutTests/fast/dom/Window/window-lookup-precedence.html @@ -17,7 +17,7 @@
" target="_blank"> diff --git a/LayoutTests/fast/js/eval-cross-window-expected.txt b/LayoutTests/fast/js/eval-cross-window-expected.txt index 9ab8d69..35c703c 100644 --- a/LayoutTests/fast/js/eval-cross-window-expected.txt +++ b/LayoutTests/fast/js/eval-cross-window-expected.txt @@ -33,8 +33,8 @@ PASS: frames[0].eval("z = 4; top.z") should be EvalError and is. ----- This Object: ----- -PASS: window.eval("this") should be [object DOMWindow] and is. -PASS: frames[0].eval("this") should be [object DOMWindow] and is. +PASS: window.eval("this") should be [object Window] and is. +PASS: frames[0].eval("this") should be [object Window] and is. PASS: window.eval("this") should be EvalError and is. PASS: frames[0].eval("this") should be EvalError and is. diff --git a/LayoutTests/fast/js/eval-keyword-vs-function-expected.txt b/LayoutTests/fast/js/eval-keyword-vs-function-expected.txt index 7156758..2d9b6dd 100644 --- a/LayoutTests/fast/js/eval-keyword-vs-function-expected.txt +++ b/LayoutTests/fast/js/eval-keyword-vs-function-expected.txt @@ -33,8 +33,8 @@ PASS: (function() { var eval = window.eval; return eval("z = 5; window.z"); })() ----- This Object: ----- PASS: eval("this") should be ["this" object passed to .call()] and is. -PASS: window.eval("this") should be [object DOMWindow] and is. -PASS: globalEval("this") should be [object DOMWindow] and is. -PASS: localEval("this") should be [object DOMWindow] and is. -PASS: (function() { var eval = window.eval; return eval("this"); })() should be [object DOMWindow] and is. +PASS: window.eval("this") should be [object Window] and is. +PASS: globalEval("this") should be [object Window] and is. +PASS: localEval("this") should be [object Window] and is. +PASS: (function() { var eval = window.eval; return eval("this"); })() should be [object Window] and is. diff --git a/LayoutTests/fast/js/function-bind-expected.txt b/LayoutTests/fast/js/function-bind-expected.txt index 5a4764c..a2e6dd9 100644 --- a/LayoutTests/fast/js/function-bind-expected.txt +++ b/LayoutTests/fast/js/function-bind-expected.txt @@ -3,7 +3,7 @@ Tests Function.bind. On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE". -PASS result is "[object DOMWindow] -> x:1, y:2" +PASS result is "[object Window] -> x:1, y:2" PASS result is "'a' -> x:'b', y:1" PASS result is "'a' -> x:'b', y:'c'" PASS result is "[object Object] -> x:1, y:2" diff --git a/LayoutTests/fast/js/mozilla/strict/10.4.3-expected.txt b/LayoutTests/fast/js/mozilla/strict/10.4.3-expected.txt index bf2e889..91af2fd 100644 --- a/LayoutTests/fast/js/mozilla/strict/10.4.3-expected.txt +++ b/LayoutTests/fast/js/mozilla/strict/10.4.3-expected.txt @@ -14,8 +14,8 @@ PASS === PASS true === true PASS true === true PASS true === true -PASS [object DOMWindow] === [object DOMWindow] -PASS [object DOMWindow] === [object DOMWindow] +PASS [object Window] === [object Window] +PASS [object Window] === [object Window] PASS [object Object] === [object Object] PASS true === true PASS true === true diff --git a/LayoutTests/fast/js/mozilla/strict/15.3.4.5-expected.txt b/LayoutTests/fast/js/mozilla/strict/15.3.4.5-expected.txt index e355d99..0e196af 100644 --- a/LayoutTests/fast/js/mozilla/strict/15.3.4.5-expected.txt +++ b/LayoutTests/fast/js/mozilla/strict/15.3.4.5-expected.txt @@ -7,8 +7,8 @@ PASS [object Object] === [object Object] PASS true === true PASS true === true PASS true === true -PASS [object DOMWindow] === [object DOMWindow] -PASS [object DOMWindow] === [object DOMWindow] +PASS [object Window] === [object Window] +PASS [object Window] === [object Window] PASS [object Object] === [object Object] PASSED! PASS successfullyParsed is true diff --git a/LayoutTests/fast/js/mozilla/strict/this-for-function-expression-recursion-expected.txt b/LayoutTests/fast/js/mozilla/strict/this-for-function-expression-recursion-expected.txt index b5075f8..bd4d553 100644 --- a/LayoutTests/fast/js/mozilla/strict/this-for-function-expression-recursion-expected.txt +++ b/LayoutTests/fast/js/mozilla/strict/this-for-function-expression-recursion-expected.txt @@ -1,5 +1,5 @@ 611276: JSOP_CALLEE should push undefined, not null, for this -PASS [object DOMWindow] === [object DOMWindow] +PASS [object Window] === [object Window] PASS undefined === undefined PASSED! All tests passed! diff --git a/LayoutTests/fast/js/script-tests/function-bind.js b/LayoutTests/fast/js/script-tests/function-bind.js index 0d45e2a..583ccf6 100644 --- a/LayoutTests/fast/js/script-tests/function-bind.js +++ b/LayoutTests/fast/js/script-tests/function-bind.js @@ -11,7 +11,7 @@ G = F.bind("'a'", "'b'"); H = G.bind("'Cannot rebind this!'", "'c'"); F(1,2); -shouldBe("result", '"[object DOMWindow] -> x:1, y:2"'); +shouldBe("result", '"[object Window] -> x:1, y:2"'); G(1,2); shouldBe("result", '"\'a\' -> x:\'b\', y:1"'); H(1,2); diff --git a/LayoutTests/fast/js/toString-and-valueOf-override-expected.txt b/LayoutTests/fast/js/toString-and-valueOf-override-expected.txt index b8a2588..3cd01d3 100644 --- a/LayoutTests/fast/js/toString-and-valueOf-override-expected.txt +++ b/LayoutTests/fast/js/toString-and-valueOf-override-expected.txt @@ -80,14 +80,14 @@ Exception Unmodified window -window : [object DOMWindow] -[window] : [object DOMWindow] -String(window) : [object DOMWindow] -String([window]) : [object DOMWindow] -window.toString() : [object DOMWindow] -[window].toString() : [object DOMWindow] -window.valueOf() : [object DOMWindow] -[window].valueOf() : [object DOMWindow] +window : [object Window] +[window] : [object Window] +String(window) : [object Window] +String([window]) : [object Window] +window.toString() : [object Window] +[window].toString() : [object Window] +window.valueOf() : [object Window] +[window].valueOf() : [object Window] window with modified toString and valueOf window : valueOf diff --git a/LayoutTests/http/tests/inspector-enabled/console-clear-arguments-on-frame-remove-expected.txt b/LayoutTests/http/tests/inspector-enabled/console-clear-arguments-on-frame-remove-expected.txt index 13eef8b..a879393 100644 --- a/LayoutTests/http/tests/inspector-enabled/console-clear-arguments-on-frame-remove-expected.txt +++ b/LayoutTests/http/tests/inspector-enabled/console-clear-arguments-on-frame-remove-expected.txt @@ -1,9 +1,9 @@ CONSOLE MESSAGE: line 2: A message with first argument string CONSOLE MESSAGE: line 3: 2011 -CONSOLE MESSAGE: line 4: [object DOMWindow] +CONSOLE MESSAGE: line 4: [object Window] Tests that console message arguments will be cleared when iframe where the messages were created is removed. resources/console-clear-arguments-iframe.html:2A message with first argument string resources/console-clear-arguments-iframe.html:32011 -resources/console-clear-arguments-iframe.html:4[object DOMWindow] +resources/console-clear-arguments-iframe.html:4[object Window] diff --git a/LayoutTests/http/tests/security/cross-frame-access-custom-expected.txt b/LayoutTests/http/tests/security/cross-frame-access-custom-expected.txt index 94d745e..a69bae8 100644 --- a/LayoutTests/http/tests/security/cross-frame-access-custom-expected.txt +++ b/LayoutTests/http/tests/security/cross-frame-access-custom-expected.txt @@ -51,5 +51,5 @@ PASS: canGet('targetWindow.objectPrototypeCustomProperty') should be 'false' and PASS: canSet('targetWindow.objectPrototypeCustomProperty') should be 'false' and is. PASS: canGet('targetWindow.toString') should be 'true' and is. PASS: canSet('targetWindow.toString') should be 'false' and is. -PASS: toString('targetWindow', '') should be '[object DOMWindow]' and is. +PASS: toString('targetWindow', '') should be '[object Window]' and is. diff --git a/LayoutTests/http/tests/security/cross-frame-access-custom.html b/LayoutTests/http/tests/security/cross-frame-access-custom.html index 2a2bdcb..4dbab03 100644 --- a/LayoutTests/http/tests/security/cross-frame-access-custom.html +++ b/LayoutTests/http/tests/security/cross-frame-access-custom.html @@ -40,7 +40,7 @@ window.onload = function() // window object itself shouldBeTrue("canGet('targetWindow.toString')"); shouldBeFalse("canSet('targetWindow.toString')"); - shouldBe("toString('targetWindow', '')", "'[object DOMWindow]'"); + shouldBe("toString('targetWindow', '')", "'[object Window]'"); // Work around DRT bug that causes subsequent tests to fail. window.stop(); diff --git a/LayoutTests/http/tests/security/cross-frame-access-put-expected.txt b/LayoutTests/http/tests/security/cross-frame-access-put-expected.txt index a971605..7492a42 100644 --- a/LayoutTests/http/tests/security/cross-frame-access-put-expected.txt +++ b/LayoutTests/http/tests/security/cross-frame-access-put-expected.txt @@ -478,7 +478,7 @@ ALERT: PASS: window.event should be 'undefined' and is. CONSOLE MESSAGE: 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. ALERT: PASS: window.frameElement should be 'undefined' and is. -ALERT: PASS: window.frames should be '[object DOMWindow]' and is. +ALERT: PASS: window.frames should be '[object Window]' and is. ALERT: PASS: window.history should be '[object History]' and is. ALERT: PASS: window.images should be 'undefined' and is. ALERT: PASS: window.innerHeight should be '150' and is. @@ -529,11 +529,11 @@ ALERT: PASS: window.screenY matched the expected value. ALERT: PASS: window.scrollbars should be '[object BarInfo]' and is. ALERT: PASS: window.scrollX should be '0' and is. ALERT: PASS: window.scrollY should be '0' and is. -ALERT: PASS: window.self should be '[object DOMWindow]' and is. +ALERT: PASS: window.self should be '[object Window]' and is. ALERT: PASS: window.status should be '' and is. ALERT: PASS: window.statusbar should be '[object BarInfo]' and is. ALERT: PASS: window.toolbar should be '[object BarInfo]' and is. -ALERT: PASS: window.window should be '[object DOMWindow]' and is. +ALERT: PASS: window.window should be '[object Window]' and is. ALERT: PASS: window.parent should be parentOld and is. ALERT: PASS: window.top should be topOld and is. ALERT: PASS: window.addEventListener should be 'function addEventListener() { [native code]}' and is. diff --git a/LayoutTests/http/tests/security/document-all-expected.txt b/LayoutTests/http/tests/security/document-all-expected.txt index 421b073..822ebef 100644 --- a/LayoutTests/http/tests/security/document-all-expected.txt +++ b/LayoutTests/http/tests/security/document-all-expected.txt @@ -1,2 +1,2 @@ -CONSOLE MESSAGE: line 1: TypeError: '[object DOMWindowConstructor]' is not a function (evaluating 'obj.alert.constructor("return document.body.innerHTML")') +CONSOLE MESSAGE: line 1: TypeError: '[object WindowConstructor]' is not a function (evaluating 'obj.alert.constructor("return document.body.innerHTML")') diff --git a/LayoutTests/inspector/console/console-dir-global-expected.txt b/LayoutTests/inspector/console/console-dir-global-expected.txt index 86c3bb6..5ace2bd 100644 --- a/LayoutTests/inspector/console/console-dir-global-expected.txt +++ b/LayoutTests/inspector/console/console-dir-global-expected.txt @@ -1,4 +1,4 @@ -CONSOLE MESSAGE: line 9: [object DOMWindow] +CONSOLE MESSAGE: line 9: [object Window] Tests that console dumps global object with properties. { diff --git a/LayoutTests/inspector/debugger/debugger-expand-scope-expected.txt b/LayoutTests/inspector/debugger/debugger-expand-scope-expected.txt index d475a8e..8b64712 100644 --- a/LayoutTests/inspector/debugger/debugger-expand-scope-expected.txt +++ b/LayoutTests/inspector/debugger/debugger-expand-scope-expected.txt @@ -9,15 +9,15 @@ Dump scope sections: Local arguments: Arguments[1] innerFunctionLocalVar: 2012 - this: DOMWindow + this: Window x: 2010 -DOMWindowWith Block +WindowWith Block innerFunction: function innerFunction(x) { Closure arguments: Arguments[1] makeClosureLocalVar: "local.TextParam" n: "TextParam" -DOMWindowGlobal +WindowGlobal
Script execution resumed. Debugger was disabled. diff --git a/LayoutTests/inspector/profiler/heap-snapshot-test.js b/LayoutTests/inspector/profiler/heap-snapshot-test.js index 3084dbe..9054b23 100644 --- a/LayoutTests/inspector/profiler/heap-snapshot-test.js +++ b/LayoutTests/inspector/profiler/heap-snapshot-test.js @@ -73,11 +73,11 @@ InspectorTest.createHeapSnapshotMockWithDOM = function() nodes: [ { fields: ["type", "name", "id", "children_count", "children"], types: [["hidden", "object"], "", "", "", { fields: ["type", "name_or_index", "to_node"], types: [["element", "hidden", "internal"], "", ""] }] }, - // A tree with DOMWindow objects. + // A tree with Window objects. // - // |----->DOMWindow--->A + // |----->Window--->A // | \ - // |----->DOMWindow--->B--->C + // |----->Window--->B--->C // | | \ // (root) hidden --->D--internal / "native"-->N // | \ | @@ -86,8 +86,8 @@ InspectorTest.createHeapSnapshotMockWithDOM = function() // |----->F--->G------>M // /* (root) */ 0, 0, 1, 4, 0, 1, 17, 0, 2, 27, 0, 3, 40, 0, 4, 44, - /* DOMWindow */ 1, 11, 2, 2, 0, 1, 51, 0, 2, 55, - /* DOMWindow */ 1, 11, 3, 3, 0, 1, 55, 0, 2, 62, 1, 3, 72, + /* Window */ 1, 11, 2, 2, 0, 1, 51, 0, 2, 55, + /* Window */ 1, 11, 3, 3, 0, 1, 55, 0, 2, 62, 1, 3, 72, /* E */ 1, 5, 4, 0, /* F */ 1, 6, 5, 1, 0, 1, 76, /* A */ 1, 1, 6, 0, @@ -99,7 +99,7 @@ InspectorTest.createHeapSnapshotMockWithDOM = function() /* N */ 1, 10, 12, 0, /* M */ 1, 9, 13, 0 ], - strings: ["", "A", "B", "C", "D", "E", "F", "G", "H", "M", "N", "DOMWindow", "native"] + strings: ["", "A", "B", "C", "D", "E", "F", "G", "H", "M", "N", "Window", "native"] }; }; diff --git a/LayoutTests/inspector/profiler/heap-snapshot.html b/LayoutTests/inspector/profiler/heap-snapshot.html index 307c065..67271ec 100644 --- a/LayoutTests/inspector/profiler/heap-snapshot.html +++ b/LayoutTests/inspector/profiler/heap-snapshot.html @@ -163,7 +163,7 @@ function test() "H": false, "M": false, "N": false, - "DOMWindow": true + "Window": true }; for (var nodes = snapshot._allNodes; nodes.hasNext(); nodes.next()) { var node = nodes.item; diff --git a/LayoutTests/java/lc3/JSObject/ToJSObject-001-expected.txt b/LayoutTests/java/lc3/JSObject/ToJSObject-001-expected.txt index ec53744..d061775 100644 --- a/LayoutTests/java/lc3/JSObject/ToJSObject-001-expected.txt +++ b/LayoutTests/java/lc3/JSObject/ToJSObject-001-expected.txt @@ -14,7 +14,7 @@ FAIL jsoc.setJSObject( MyObject ); jsoc.PUB_JSOBJECT should be function MyObject } (of type object). PASS jsoc.setJSObject( MyObject ); jsoc.getJSObject() is MyObject PASS jsoc.getJSObject().constructor is Function -FAIL jsoc.setJSObject( THIS ); jsoc.PUB_JSOBJECT should be [object DOMWindow]. Was [object DOMWindow]. +FAIL jsoc.setJSObject( THIS ); jsoc.PUB_JSOBJECT should be [object Window]. Was [object Window]. PASS jsoc.setJSObject( THIS ); jsoc.getJSObject() is this PASS jsoc.getJSObject().constructor is this.constructor FAIL jsoc.setJSObject( Math ); jsoc.PUB_JSOBJECT should be [object Math]. Was [object Math]. diff --git a/LayoutTests/java/lc3/JSObject/ToObject-001-expected.txt b/LayoutTests/java/lc3/JSObject/ToObject-001-expected.txt index b0cf125..aceab8b 100644 --- a/LayoutTests/java/lc3/JSObject/ToObject-001-expected.txt +++ b/LayoutTests/java/lc3/JSObject/ToObject-001-expected.txt @@ -41,7 +41,7 @@ FAIL dt.setObject( MyObject ); dt.PUB_OBJECT should be function MyObject(stringV } (of type object). PASS dt.setObject( MyObject ); dt.getObject() is MyObject PASS dt.getObject().constructor is Function -FAIL dt.setObject( THIS ); dt.PUB_OBJECT should be [object DOMWindow]. Was [object DOMWindow]. +FAIL dt.setObject( THIS ); dt.PUB_OBJECT should be [object Window]. Was [object Window]. PASS dt.setObject( THIS ); dt.getObject() is this PASS dt.getObject().constructor is this.constructor FAIL dt.setObject( Math ); dt.PUB_OBJECT should be [object Math]. Was [object Math]. diff --git a/LayoutTests/java/lc3/JSObject/ToString-001-expected.txt b/LayoutTests/java/lc3/JSObject/ToString-001-expected.txt index 43288d6..a353304 100644 --- a/LayoutTests/java/lc3/JSObject/ToString-001-expected.txt +++ b/LayoutTests/java/lc3/JSObject/ToString-001-expected.txt @@ -33,8 +33,8 @@ FAIL java.lang.Class.forName("java.lang.String"): ReferenceError: Can't find var PASS dt.setStringObject( MyObject ); dt.PUB_STRING +'' is MyObject.toString() PASS dt.setStringObject( MyObject ); dt.getStringObject() +'' is MyObject.toString() FAIL java.lang.Class.forName("java.lang.String"): ReferenceError: Can't find variable: java -FAIL dt.setStringObject( THIS ); dt.PUB_STRING +'' should be [object global]. Was [object DOMWindow]. -FAIL dt.setStringObject( THIS ); dt.getStringObject() +'' should be [object global]. Was [object DOMWindow]. +FAIL dt.setStringObject( THIS ); dt.PUB_STRING +'' should be [object global]. Was [object Window]. +FAIL dt.setStringObject( THIS ); dt.getStringObject() +'' should be [object global]. Was [object Window]. FAIL java.lang.Class.forName("java.lang.String"): ReferenceError: Can't find variable: java PASS dt.setStringObject( Math ); dt.PUB_STRING +'' is "[object Math]" PASS dt.setStringObject( Math ); dt.getStringObject() +'' is "[object Math]" diff --git a/LayoutTests/platform/chromium-mac/fast/events/event-view-toString-expected.txt b/LayoutTests/platform/chromium-mac/fast/events/event-view-toString-expected.txt index 53fc1b0..6292d01 100644 --- a/LayoutTests/platform/chromium-mac/fast/events/event-view-toString-expected.txt +++ b/LayoutTests/platform/chromium-mac/fast/events/event-view-toString-expected.txt @@ -3,5 +3,5 @@ Test for toString on event.view. This test simulates a click when run via DumpRe event.view : document: [object HTMLDocument] proto: [object Object] -Success getting [object DOMWindow] +Success getting [object Window] diff --git a/LayoutTests/platform/chromium-win/fast/events/event-view-toString-expected.txt b/LayoutTests/platform/chromium-win/fast/events/event-view-toString-expected.txt index 53fc1b0..6292d01 100644 --- a/LayoutTests/platform/chromium-win/fast/events/event-view-toString-expected.txt +++ b/LayoutTests/platform/chromium-win/fast/events/event-view-toString-expected.txt @@ -3,5 +3,5 @@ Test for toString on event.view. This test simulates a click when run via DumpRe event.view : document: [object HTMLDocument] proto: [object Object] -Success getting [object DOMWindow] +Success getting [object Window] diff --git a/LayoutTests/platform/chromium-win/fast/js/README b/LayoutTests/platform/chromium-win/fast/js/README index 6f60da1..c489695 100644 --- a/LayoutTests/platform/chromium-win/fast/js/README +++ b/LayoutTests/platform/chromium-win/fast/js/README @@ -40,7 +40,7 @@ Output format of an empty function is different. toString-and-valueOf-override-diff-win.txt -------------------------- This test differs only in text. V8 typeerror messages are slightly -different, and the global object is of type global instead of 'DOMWindow' +different, and the global object is of type global instead of 'Window' kde\crash-2-expected.txt -------------------------- diff --git a/LayoutTests/platform/chromium/fast/dom/Window/window-lookup-precedence-expected.txt b/LayoutTests/platform/chromium/fast/dom/Window/window-lookup-precedence-expected.txt index f18658f..c73a959 100644 --- a/LayoutTests/platform/chromium/fast/dom/Window/window-lookup-precedence-expected.txt +++ b/LayoutTests/platform/chromium/fast/dom/Window/window-lookup-precedence-expected.txt @@ -1,4 +1,4 @@ -Tests lookup precedence for properties on DOMWindow objects in the presence of a child frame, and that IDL properties defined in the prototype (window.location, window.focus, etc) have higher lookup precedence than named document elements (such as input elements). +Tests lookup precedence for properties on Window objects in the presence of a child frame, and that IDL properties defined in the prototype (window.location, window.focus, etc) have higher lookup precedence than named document elements (such as input elements). On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE". @@ -322,16 +322,16 @@ PASS 'function XSLTProcessor() { [native code] }' is 'function XSLTProcessor() { PASS 'function XSLTProcessor() { [native code] }' is 'function XSLTProcessor() { [native code] }' PASS win['onload'] is null PASS win['onload'] is null -PASS win['frames'] == '[object DOMWindow]' is true -PASS win['frames'] == '[object DOMWindow]' is true -PASS win['parent'] == '[object DOMWindow]' is true -PASS win['parent'] == '[object DOMWindow]' is true -PASS win['self'] == '[object DOMWindow]' is true -PASS win['self'] == '[object DOMWindow]' is true -PASS win['top'] == '[object DOMWindow]' is true -PASS win['top'] == '[object DOMWindow]' is true -PASS win['window'] == '[object DOMWindow]' is true -PASS win['window'] == '[object DOMWindow]' is true +PASS win['frames'] == '[object Window]' is true +PASS win['frames'] == '[object Window]' is true +PASS win['parent'] == '[object Window]' is true +PASS win['parent'] == '[object Window]' is true +PASS win['self'] == '[object Window]' is true +PASS win['self'] == '[object Window]' is true +PASS win['top'] == '[object Window]' is true +PASS win['top'] == '[object Window]' is true +PASS win['window'] == '[object Window]' is true +PASS win['window'] == '[object Window]' is true PASS win['locationbar'] == '[object BarInfo]' is true PASS win['locationbar'] == '[object BarInfo]' is true PASS win['menubar'] == '[object BarInfo]' is true diff --git a/LayoutTests/platform/chromium/fast/dom/Window/window-postmessage-args-expected.txt b/LayoutTests/platform/chromium/fast/dom/Window/window-postmessage-args-expected.txt index cd6f248..c20bea6 100644 --- a/LayoutTests/platform/chromium/fast/dom/Window/window-postmessage-args-expected.txt +++ b/LayoutTests/platform/chromium/fast/dom/Window/window-postmessage-args-expected.txt @@ -6,8 +6,8 @@ PASS: Posting message ('2', c): threw exception TypeError: TransferArray argumen PASS: Posting message ('2', c): threw exception TypeError: TransferArray argument must be an object PASS: Posting message ('3', [object Object]): threw exception TypeError: TransferArray argument has no length attribute PASS: Posting message ('3', [object Object]): threw exception TypeError: TransferArray argument has no length attribute -PASS: Posting message ('4', [object DOMWindow]) did not throw an exception -PASS: Posting message ('4', [object DOMWindow]) did not throw an exception +PASS: Posting message ('4', [object Window]) did not throw an exception +PASS: Posting message ('4', [object Window]) did not throw an exception PASS: Posting message ('4a', *) did not throw an exception PASS: Posting message ('4a', *) did not throw an exception PASS: Posting message ('5', null) did not throw an exception diff --git a/LayoutTests/platform/chromium/fast/dom/wrapper-classes-expected.txt b/LayoutTests/platform/chromium/fast/dom/wrapper-classes-expected.txt index 3348d1a..13eac24 100644 --- a/LayoutTests/platform/chromium/fast/dom/wrapper-classes-expected.txt +++ b/LayoutTests/platform/chromium/fast/dom/wrapper-classes-expected.txt @@ -128,9 +128,9 @@ FAIL jsWrapperClass(document.evaluate('//*', document, document.createNSResolver Other -FAIL jsWrapperClass(window) should be DOMWindow. Was global. -FAIL jsWrapperClass(window.__proto__) should be DOMWindowPrototype. Was Object. -FAIL jsWrapperClass(window.constructor) should be DOMWindowConstructor. Was Function. +FAIL jsWrapperClass(window) should be Window. Was global. +FAIL jsWrapperClass(window.__proto__) should be WindowPrototype. Was Object. +FAIL jsWrapperClass(window.constructor) should be WindowConstructor. Was Function. HTML DOM diff --git a/LayoutTests/platform/chromium/fast/js/mozilla/strict/15.3.4.5-expected.txt b/LayoutTests/platform/chromium/fast/js/mozilla/strict/15.3.4.5-expected.txt index e355d99..0e196af 100644 --- a/LayoutTests/platform/chromium/fast/js/mozilla/strict/15.3.4.5-expected.txt +++ b/LayoutTests/platform/chromium/fast/js/mozilla/strict/15.3.4.5-expected.txt @@ -7,8 +7,8 @@ PASS [object Object] === [object Object] PASS true === true PASS true === true PASS true === true -PASS [object DOMWindow] === [object DOMWindow] -PASS [object DOMWindow] === [object DOMWindow] +PASS [object Window] === [object Window] +PASS [object Window] === [object Window] PASS [object Object] === [object Object] PASSED! PASS successfullyParsed is true diff --git a/LayoutTests/platform/chromium/fast/js/toString-and-valueOf-override-expected.txt b/LayoutTests/platform/chromium/fast/js/toString-and-valueOf-override-expected.txt index e5596d9..c2d23fb 100644 --- a/LayoutTests/platform/chromium/fast/js/toString-and-valueOf-override-expected.txt +++ b/LayoutTests/platform/chromium/fast/js/toString-and-valueOf-override-expected.txt @@ -80,14 +80,14 @@ Exception Unmodified window -window : [object DOMWindow] -[window] : [object DOMWindow] -String(window) : [object DOMWindow] -String([window]) : [object DOMWindow] -window.toString() : [object DOMWindow] -[window].toString() : [object DOMWindow] -window.valueOf() : [object DOMWindow] -[window].valueOf() : [object DOMWindow] +window : [object Window] +[window] : [object Window] +String(window) : [object Window] +String([window]) : [object Window] +window.toString() : [object Window] +[window].toString() : [object Window] +window.valueOf() : [object Window] +[window].valueOf() : [object Window] window with modified toString and valueOf window : valueOf diff --git a/LayoutTests/platform/chromium/http/tests/security/cross-frame-access-call-expected.txt b/LayoutTests/platform/chromium/http/tests/security/cross-frame-access-call-expected.txt index 29703cf..eac8c75 100644 --- a/LayoutTests/platform/chromium/http/tests/security/cross-frame-access-call-expected.txt +++ b/LayoutTests/platform/chromium/http/tests/security/cross-frame-access-call-expected.txt @@ -67,7 +67,7 @@ PASS: window.getMatchedCSSRules.call(targetWindow, document.body, '') should be PASS: window.openDatabase.call(targetWindow, 'name', '1.0', 'description', 0) should be 'undefined' and is. PASS: window.atob.call(targetWindow, 'string') should be 'undefined' and is. PASS: window.btoa.call(targetWindow, 'string') should be 'undefined' and is. -*** FAIL: window.open.call(targetWindow, '') should be 'undefined' but instead is [object DOMWindow]. *** +*** FAIL: window.open.call(targetWindow, '') should be 'undefined' but instead is [object Window]. *** PASS: window.addEventListener.call(targetWindow, 'load', null, false); should be 'undefined' and is. PASS: window.removeEventListener.call(targetWindow, 'load', null, false); should be 'undefined' and is. PASS: window.clearTimeout.call(targetWindow, 0); should be 'undefined' and is. diff --git a/LayoutTests/platform/chromium/http/tests/security/cross-frame-access-put-expected.txt b/LayoutTests/platform/chromium/http/tests/security/cross-frame-access-put-expected.txt index 728c530..9f6d8f6 100644 --- a/LayoutTests/platform/chromium/http/tests/security/cross-frame-access-put-expected.txt +++ b/LayoutTests/platform/chromium/http/tests/security/cross-frame-access-put-expected.txt @@ -488,7 +488,7 @@ ALERT: PASS: window.event should be 'undefined' and is. CONSOLE MESSAGE: 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. ALERT: PASS: window.frameElement should be 'undefined' and is. -ALERT: PASS: window.frames should be '[object DOMWindow]' and is. +ALERT: PASS: window.frames should be '[object Window]' and is. ALERT: PASS: window.history should be '[object History]' and is. ALERT: PASS: window.images should be 'undefined' and is. ALERT: PASS: window.innerHeight should be '150' and is. @@ -539,11 +539,11 @@ ALERT: PASS: window.screenY matched the expected value. ALERT: PASS: window.scrollbars should be '[object BarInfo]' and is. ALERT: PASS: window.scrollX should be '0' and is. ALERT: PASS: window.scrollY should be '0' and is. -ALERT: PASS: window.self should be '[object DOMWindow]' and is. +ALERT: PASS: window.self should be '[object Window]' and is. ALERT: PASS: window.status should be '' and is. ALERT: PASS: window.statusbar should be '[object BarInfo]' and is. ALERT: PASS: window.toolbar should be '[object BarInfo]' and is. -ALERT: PASS: window.window should be '[object DOMWindow]' and is. +ALERT: PASS: window.window should be '[object Window]' and is. ALERT: PASS: window.parent should be parentOld and is. ALERT: PASS: window.top should be topOld and is. ALERT: PASS: window.addEventListener should be 'function addEventListener() { [native code] }' and is. diff --git a/LayoutTests/platform/chromium/inspector/console/console-dir-global-expected.txt b/LayoutTests/platform/chromium/inspector/console/console-dir-global-expected.txt index 18232e9..39ed53a 100644 --- a/LayoutTests/platform/chromium/inspector/console/console-dir-global-expected.txt +++ b/LayoutTests/platform/chromium/inspector/console/console-dir-global-expected.txt @@ -1,4 +1,4 @@ -CONSOLE MESSAGE: line 9: [object DOMWindow] +CONSOLE MESSAGE: line 9: [object Window] Tests that console dumps global object with properties. { diff --git a/LayoutTests/platform/chromium/inspector/debugger/debugger-expand-scope-expected.txt b/LayoutTests/platform/chromium/inspector/debugger/debugger-expand-scope-expected.txt index 76da94a..841f03a 100644 --- a/LayoutTests/platform/chromium/inspector/debugger/debugger-expand-scope-expected.txt +++ b/LayoutTests/platform/chromium/inspector/debugger/debugger-expand-scope-expected.txt @@ -8,12 +8,12 @@ Script execution paused. Dump scope sections: Local innerFunctionLocalVar: 2012 - this: DOMWindow + this: Window x: 2010 Closure makeClosureLocalVar: "local.TextParam" n: "TextParam" -DOMWindowGlobal +WindowGlobal
Script execution resumed. Debugger was disabled. diff --git a/LayoutTests/platform/gtk/fast/dom/Window/window-properties-expected.txt b/LayoutTests/platform/gtk/fast/dom/Window/window-properties-expected.txt index 5300309..86bb6bf 100644 --- a/LayoutTests/platform/gtk/fast/dom/Window/window-properties-expected.txt +++ b/LayoutTests/platform/gtk/fast/dom/Window/window-properties-expected.txt @@ -1,6 +1,6 @@ This test dumps all of the properties that are reachable from the window object, along with their types. -window [object DOMWindow] +window [object Window] window.Array [function] window.Attr [object AttrConstructor] window.Attr.prototype [object AttrPrototype] @@ -2246,8 +2246,8 @@ window.WebSocket.prototype.removeEventListener [function] window.WebSocket.prototype.send [function] window.WheelEvent [object WheelEventConstructor] window.WheelEvent.prototype [printed above as window.Event.prototype] -window.Window [object DOMWindowConstructor] -window.Window.prototype [object DOMWindowPrototype] +window.Window [object WindowConstructor] +window.Window.prototype [object WindowPrototype] window.Window.prototype.addEventListener [function] window.Window.prototype.alert [function] window.Window.prototype.atob [function] diff --git a/LayoutTests/platform/gtk/fast/dom/prototype-inheritance-2-expected.txt b/LayoutTests/platform/gtk/fast/dom/prototype-inheritance-2-expected.txt index 54cd3f8..8e2c7d2 100644 --- a/LayoutTests/platform/gtk/fast/dom/prototype-inheritance-2-expected.txt +++ b/LayoutTests/platform/gtk/fast/dom/prototype-inheritance-2-expected.txt @@ -81,9 +81,9 @@ PASS DOMStringMapPrototype from inner.document.forms.testForm.0.dataset.__proto_ PASS DOMTokenList from inner.document.forms.testForm.0.0.classList PASS DOMTokenListConstructor from inner.document.forms.testForm.0.classList.constructor PASS DOMTokenListPrototype from inner.document.forms.testForm.0.0.classList.__proto__ -PASS DOMWindow from inner -PASS DOMWindowConstructor from inner.document.forms.testForm.0.ownerDocument.defaultView.constructor -PASS DOMWindowPrototype from inner.document.forms.testForm.0.ownerDocument.defaultView.__proto__ +PASS Window from inner +PASS WindowConstructor from inner.document.forms.testForm.0.ownerDocument.defaultView.constructor +PASS WindowPrototype from inner.document.forms.testForm.0.ownerDocument.defaultView.__proto__ PASS DocumentPrototype from inner.document.forms.testForm.0.ownerDocument.__proto__.__proto__ PASS ElementPrototype from inner.document.forms.testForm.0.__proto__.__proto__.__proto__ PASS Function from inner.document.createElement diff --git a/LayoutTests/platform/gtk/fast/js/global-constructors-expected.txt b/LayoutTests/platform/gtk/fast/js/global-constructors-expected.txt index f3733ed..d9dfc2d 100644 --- a/LayoutTests/platform/gtk/fast/js/global-constructors-expected.txt +++ b/LayoutTests/platform/gtk/fast/js/global-constructors-expected.txt @@ -322,7 +322,7 @@ PASS WebKitPoint.toString() is '[object WebKitPointConstructor]' PASS WebKitTransitionEvent.toString() is '[object WebKitTransitionEventConstructor]' PASS WebSocket.toString() is '[object WebSocketConstructor]' PASS WheelEvent.toString() is '[object WheelEventConstructor]' -FAIL Window.toString() should be [object WindowConstructor]. Was [object DOMWindowConstructor]. +FAIL Window.toString() should be [object WindowConstructor]. Was [object WindowConstructor]. PASS Worker.toString() is '[object WorkerConstructor]' PASS XMLDocument.toString() is '[object DocumentConstructor]' PASS XMLHttpRequest.toString() is '[object XMLHttpRequestConstructor]' diff --git a/LayoutTests/platform/gtk/http/tests/security/cross-frame-access-put-expected.txt b/LayoutTests/platform/gtk/http/tests/security/cross-frame-access-put-expected.txt index a971605..7492a42 100644 --- a/LayoutTests/platform/gtk/http/tests/security/cross-frame-access-put-expected.txt +++ b/LayoutTests/platform/gtk/http/tests/security/cross-frame-access-put-expected.txt @@ -478,7 +478,7 @@ ALERT: PASS: window.event should be 'undefined' and is. CONSOLE MESSAGE: 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. ALERT: PASS: window.frameElement should be 'undefined' and is. -ALERT: PASS: window.frames should be '[object DOMWindow]' and is. +ALERT: PASS: window.frames should be '[object Window]' and is. ALERT: PASS: window.history should be '[object History]' and is. ALERT: PASS: window.images should be 'undefined' and is. ALERT: PASS: window.innerHeight should be '150' and is. @@ -529,11 +529,11 @@ ALERT: PASS: window.screenY matched the expected value. ALERT: PASS: window.scrollbars should be '[object BarInfo]' and is. ALERT: PASS: window.scrollX should be '0' and is. ALERT: PASS: window.scrollY should be '0' and is. -ALERT: PASS: window.self should be '[object DOMWindow]' and is. +ALERT: PASS: window.self should be '[object Window]' and is. ALERT: PASS: window.status should be '' and is. ALERT: PASS: window.statusbar should be '[object BarInfo]' and is. ALERT: PASS: window.toolbar should be '[object BarInfo]' and is. -ALERT: PASS: window.window should be '[object DOMWindow]' and is. +ALERT: PASS: window.window should be '[object Window]' and is. ALERT: PASS: window.parent should be parentOld and is. ALERT: PASS: window.top should be topOld and is. ALERT: PASS: window.addEventListener should be 'function addEventListener() { [native code]}' and is. diff --git a/LayoutTests/platform/mac/fast/dom/Window/window-properties-expected.txt b/LayoutTests/platform/mac/fast/dom/Window/window-properties-expected.txt index 2b5134e..0733d83 100644 --- a/LayoutTests/platform/mac/fast/dom/Window/window-properties-expected.txt +++ b/LayoutTests/platform/mac/fast/dom/Window/window-properties-expected.txt @@ -1,6 +1,6 @@ This test dumps all of the properties that are reachable from the window object, along with their types. -window [object DOMWindow] +window [object Window] window.Array [function] window.Attr [object AttrConstructor] window.Attr.prototype [object AttrPrototype] @@ -2260,6 +2260,49 @@ window.WebSocket.prototype.removeEventListener [function] window.WebSocket.prototype.send [function] window.WheelEvent [object WheelEventConstructor] window.WheelEvent.prototype [printed above as window.Event.prototype] +window.Window [object WindowConstructor] +window.Window.prototype [object WindowPrototype] +window.Window.prototype.addEventListener [function] +window.Window.prototype.alert [function] +window.Window.prototype.atob [function] +window.Window.prototype.blur [function] +window.Window.prototype.btoa [function] +window.Window.prototype.captureEvents [function] +window.Window.prototype.clearInterval [function] +window.Window.prototype.clearTimeout [function] +window.Window.prototype.close [function] +window.Window.prototype.confirm [function] +window.Window.prototype.dispatchEvent [function] +window.Window.prototype.find [function] +window.Window.prototype.focus [function] +window.Window.prototype.getComputedStyle [function] +window.Window.prototype.getMatchedCSSRules [function] +window.Window.prototype.getSelection [function] +window.Window.prototype.matchMedia [function] +window.Window.prototype.moveBy [function] +window.Window.prototype.moveTo [function] +window.Window.prototype.open [function] +window.Window.prototype.openDatabase [function] +window.Window.prototype.postMessage [function] +window.Window.prototype.print [function] +window.Window.prototype.prompt [function] +window.Window.prototype.releaseEvents [function] +window.Window.prototype.removeEventListener [function] +window.Window.prototype.resizeBy [function] +window.Window.prototype.resizeTo [function] +window.Window.prototype.scroll [function] +window.Window.prototype.scrollBy [function] +window.Window.prototype.scrollTo [function] +window.Window.prototype.setInterval [function] +window.Window.prototype.setTimeout [function] +window.Window.prototype.showModalDialog [function] +window.Window.prototype.stop [function] +window.Window.prototype.webkitCancelAnimationFrame [function] +window.Window.prototype.webkitCancelRequestAnimationFrame [function] +window.Window.prototype.webkitConvertPointFromNodeToPage [function] +window.Window.prototype.webkitConvertPointFromPageToNode [function] +window.Window.prototype.webkitPostMessage [function] +window.Window.prototype.webkitRequestAnimationFrame [function] window.Worker [object WorkerConstructor] window.Worker.length [number] window.Worker.prototype [object WorkerPrototype] @@ -2431,49 +2474,7 @@ window.console.timeEnd [function] window.console.timeStamp [function] window.console.trace [function] window.console.warn [function] -window.constructor [object DOMWindowConstructor] -window.constructor.prototype [object DOMWindowPrototype] -window.constructor.prototype.addEventListener [function] -window.constructor.prototype.alert [function] -window.constructor.prototype.atob [function] -window.constructor.prototype.blur [function] -window.constructor.prototype.btoa [function] -window.constructor.prototype.captureEvents [function] -window.constructor.prototype.clearInterval [function] -window.constructor.prototype.clearTimeout [function] -window.constructor.prototype.close [function] -window.constructor.prototype.confirm [function] -window.constructor.prototype.dispatchEvent [function] -window.constructor.prototype.find [function] -window.constructor.prototype.focus [function] -window.constructor.prototype.getComputedStyle [function] -window.constructor.prototype.getMatchedCSSRules [function] -window.constructor.prototype.getSelection [function] -window.constructor.prototype.matchMedia [function] -window.constructor.prototype.moveBy [function] -window.constructor.prototype.moveTo [function] -window.constructor.prototype.open [function] -window.constructor.prototype.openDatabase [function] -window.constructor.prototype.postMessage [function] -window.constructor.prototype.print [function] -window.constructor.prototype.prompt [function] -window.constructor.prototype.releaseEvents [function] -window.constructor.prototype.removeEventListener [function] -window.constructor.prototype.resizeBy [function] -window.constructor.prototype.resizeTo [function] -window.constructor.prototype.scroll [function] -window.constructor.prototype.scrollBy [function] -window.constructor.prototype.scrollTo [function] -window.constructor.prototype.setInterval [function] -window.constructor.prototype.setTimeout [function] -window.constructor.prototype.showModalDialog [function] -window.constructor.prototype.stop [function] -window.constructor.prototype.webkitCancelAnimationFrame [function] -window.constructor.prototype.webkitCancelRequestAnimationFrame [function] -window.constructor.prototype.webkitConvertPointFromNodeToPage [function] -window.constructor.prototype.webkitConvertPointFromPageToNode [function] -window.constructor.prototype.webkitPostMessage [function] -window.constructor.prototype.webkitRequestAnimationFrame [function] +window.constructor [printed above as window.Window] window.crypto [object Crypto] window.crypto.getRandomValues [function] window.decodeURI [function] diff --git a/LayoutTests/platform/mac/fast/dom/Window/window-property-descriptors-expected.txt b/LayoutTests/platform/mac/fast/dom/Window/window-property-descriptors-expected.txt index b7ecd68..3074353 100644 --- a/LayoutTests/platform/mac/fast/dom/Window/window-property-descriptors-expected.txt +++ b/LayoutTests/platform/mac/fast/dom/Window/window-property-descriptors-expected.txt @@ -342,6 +342,7 @@ PASS typeof Object.getOwnPropertyDescriptor(window, 'WebKitPoint') is 'object' PASS typeof Object.getOwnPropertyDescriptor(window, 'WebKitTransitionEvent') is 'object' PASS typeof Object.getOwnPropertyDescriptor(window, 'WebSocket') is 'object' PASS typeof Object.getOwnPropertyDescriptor(window, 'WheelEvent') is 'object' +PASS typeof Object.getOwnPropertyDescriptor(window, 'Window') is 'object' PASS typeof Object.getOwnPropertyDescriptor(window, 'Worker') is 'object' PASS typeof Object.getOwnPropertyDescriptor(window, 'XMLDocument') is 'object' PASS typeof Object.getOwnPropertyDescriptor(window, 'XMLHttpRequest') is 'object' diff --git a/LayoutTests/platform/mac/fast/dom/prototype-inheritance-2-expected.txt b/LayoutTests/platform/mac/fast/dom/prototype-inheritance-2-expected.txt index ba2d873..b64c30c 100644 --- a/LayoutTests/platform/mac/fast/dom/prototype-inheritance-2-expected.txt +++ b/LayoutTests/platform/mac/fast/dom/prototype-inheritance-2-expected.txt @@ -81,9 +81,6 @@ PASS DOMStringMapPrototype from inner.document.forms.testForm.0.dataset.__proto_ PASS DOMTokenList from inner.document.forms.testForm.0.0.classList PASS DOMTokenListConstructor from inner.document.forms.testForm.0.classList.constructor PASS DOMTokenListPrototype from inner.document.forms.testForm.0.0.classList.__proto__ -PASS DOMWindow from inner -PASS DOMWindowConstructor from inner.document.forms.testForm.0.ownerDocument.defaultView.constructor -PASS DOMWindowPrototype from inner.document.forms.testForm.0.ownerDocument.defaultView.__proto__ PASS DocumentPrototype from inner.document.forms.testForm.0.ownerDocument.__proto__.__proto__ PASS ElementPrototype from inner.document.forms.testForm.0.__proto__.__proto__.__proto__ PASS Function from inner.document.createElement @@ -233,6 +230,9 @@ PASS WebKitCSSKeyframeRulePrototype from inner.document.getElementById("dummySty PASS WebKitCSSKeyframesRule from inner.document.getElementById("dummyStyle").sheet.cssRules.6 PASS WebKitCSSKeyframesRuleConstructor from inner.document.getElementById("dummyStyle").sheet.cssRules.6.constructor PASS WebKitCSSKeyframesRulePrototype from inner.document.getElementById("dummyStyle").sheet.cssRules.6.__proto__ +PASS Window from inner +PASS WindowConstructor from inner.document.forms.testForm.0.ownerDocument.defaultView.constructor +PASS WindowPrototype from inner.document.forms.testForm.0.ownerDocument.defaultView.__proto__ Never found Audio Never found AudioContext Never found AudioPannerNode diff --git a/LayoutTests/platform/mac/fast/dom/wrapper-classes-objc.html b/LayoutTests/platform/mac/fast/dom/wrapper-classes-objc.html index 8674462..e5ce62a 100644 --- a/LayoutTests/platform/mac/fast/dom/wrapper-classes-objc.html +++ b/LayoutTests/platform/mac/fast/dom/wrapper-classes-objc.html @@ -148,7 +148,7 @@ function runTest() debug('Other'); debug(''); - test("window", "DOMWindow", "DOMAbstractView"); + test("window", "Window", "DOMAbstractView"); debug(''); debug('HTML DOM'); diff --git a/LayoutTests/platform/mac/fast/js/global-constructors-expected.txt b/LayoutTests/platform/mac/fast/js/global-constructors-expected.txt index dff8ddc..ebee7b4 100644 --- a/LayoutTests/platform/mac/fast/js/global-constructors-expected.txt +++ b/LayoutTests/platform/mac/fast/js/global-constructors-expected.txt @@ -323,6 +323,7 @@ PASS WebKitPoint.toString() is '[object WebKitPointConstructor]' PASS WebKitTransitionEvent.toString() is '[object WebKitTransitionEventConstructor]' PASS WebSocket.toString() is '[object WebSocketConstructor]' PASS WheelEvent.toString() is '[object WheelEventConstructor]' +PASS Window.toString() is '[object WindowConstructor]' PASS Worker.toString() is '[object WorkerConstructor]' PASS XMLDocument.toString() is '[object DocumentConstructor]' PASS XMLHttpRequest.toString() is '[object XMLHttpRequestConstructor]' diff --git a/LayoutTests/platform/qt-5.0-wk2/fast/dom/Window/window-properties-expected.txt b/LayoutTests/platform/qt-5.0-wk2/fast/dom/Window/window-properties-expected.txt index 284efee..65516a7 100644 --- a/LayoutTests/platform/qt-5.0-wk2/fast/dom/Window/window-properties-expected.txt +++ b/LayoutTests/platform/qt-5.0-wk2/fast/dom/Window/window-properties-expected.txt @@ -1,6 +1,6 @@ This test dumps all of the properties that are reachable from the window object, along with their types. -window [object DOMWindow] +window [object Window] window.Array [function] window.Attr [object AttrConstructor] window.Attr.prototype [object AttrPrototype] @@ -2336,8 +2336,8 @@ window.console.timeEnd [function] window.console.timeStamp [function] window.console.trace [function] window.console.warn [function] -window.constructor [object DOMWindowConstructor] -window.constructor.prototype [object DOMWindowPrototype] +window.constructor [object WindowConstructor] +window.constructor.prototype [object WindowPrototype] window.constructor.prototype.addEventListener [function] window.constructor.prototype.alert [function] window.constructor.prototype.atob [function] diff --git a/LayoutTests/platform/qt-5.0-wk2/fast/dom/Window/window-property-descriptors-expected.txt b/LayoutTests/platform/qt-5.0-wk2/fast/dom/Window/window-property-descriptors-expected.txt index 4e52350..331698a 100644 --- a/LayoutTests/platform/qt-5.0-wk2/fast/dom/Window/window-property-descriptors-expected.txt +++ b/LayoutTests/platform/qt-5.0-wk2/fast/dom/Window/window-property-descriptors-expected.txt @@ -316,6 +316,7 @@ PASS typeof Object.getOwnPropertyDescriptor(window, 'WebKitPoint') is 'object' PASS typeof Object.getOwnPropertyDescriptor(window, 'WebKitTransitionEvent') is 'object' PASS typeof Object.getOwnPropertyDescriptor(window, 'WebSocket') is 'object' PASS typeof Object.getOwnPropertyDescriptor(window, 'WheelEvent') is 'object' +PASS typeof Object.getOwnPropertyDescriptor(window, 'Window') is 'object' PASS typeof Object.getOwnPropertyDescriptor(window, 'Worker') is 'object' PASS typeof Object.getOwnPropertyDescriptor(window, 'XMLDocument') is 'object' PASS typeof Object.getOwnPropertyDescriptor(window, 'XMLHttpRequest') is 'object' diff --git a/LayoutTests/platform/qt-5.0-wk2/fast/dom/prototype-inheritance-2-expected.txt b/LayoutTests/platform/qt-5.0-wk2/fast/dom/prototype-inheritance-2-expected.txt index 1b784ce..9362720 100644 --- a/LayoutTests/platform/qt-5.0-wk2/fast/dom/prototype-inheritance-2-expected.txt +++ b/LayoutTests/platform/qt-5.0-wk2/fast/dom/prototype-inheritance-2-expected.txt @@ -81,9 +81,9 @@ PASS DOMStringMapPrototype from inner.document.forms.testForm.0.dataset.__proto_ PASS DOMTokenList from inner.document.forms.testForm.0.0.classList PASS DOMTokenListConstructor from inner.document.forms.testForm.0.classList.constructor PASS DOMTokenListPrototype from inner.document.forms.testForm.0.0.classList.__proto__ -PASS DOMWindow from inner -PASS DOMWindowConstructor from inner.document.forms.testForm.0.ownerDocument.defaultView.constructor -PASS DOMWindowPrototype from inner.document.forms.testForm.0.ownerDocument.defaultView.__proto__ +PASS Window from inner +PASS WindowConstructor from inner.document.forms.testForm.0.ownerDocument.defaultView.constructor +PASS WindowPrototype from inner.document.forms.testForm.0.ownerDocument.defaultView.__proto__ PASS DocumentPrototype from inner.document.forms.testForm.0.ownerDocument.__proto__.__proto__ PASS ElementPrototype from inner.document.forms.testForm.0.__proto__.__proto__.__proto__ PASS Function from inner.document.createElement diff --git a/LayoutTests/platform/qt-arm/fast/dom/Window/window-property-descriptors-expected.txt b/LayoutTests/platform/qt-arm/fast/dom/Window/window-property-descriptors-expected.txt index 87ece2f..f823231 100644 --- a/LayoutTests/platform/qt-arm/fast/dom/Window/window-property-descriptors-expected.txt +++ b/LayoutTests/platform/qt-arm/fast/dom/Window/window-property-descriptors-expected.txt @@ -315,6 +315,7 @@ PASS typeof Object.getOwnPropertyDescriptor(window, 'WebKitPoint') is 'object' PASS typeof Object.getOwnPropertyDescriptor(window, 'WebKitTransitionEvent') is 'object' PASS typeof Object.getOwnPropertyDescriptor(window, 'WebSocket') is 'object' PASS typeof Object.getOwnPropertyDescriptor(window, 'WheelEvent') is 'object' +PASS typeof Object.getOwnPropertyDescriptor(window, 'Window') is 'object' PASS typeof Object.getOwnPropertyDescriptor(window, 'Worker') is 'object' PASS typeof Object.getOwnPropertyDescriptor(window, 'XMLDocument') is 'object' PASS typeof Object.getOwnPropertyDescriptor(window, 'XMLHttpRequest') is 'object' diff --git a/LayoutTests/platform/qt/fast/dom/Window/window-properties-expected.txt b/LayoutTests/platform/qt/fast/dom/Window/window-properties-expected.txt index df67e54..f2f418b 100644 --- a/LayoutTests/platform/qt/fast/dom/Window/window-properties-expected.txt +++ b/LayoutTests/platform/qt/fast/dom/Window/window-properties-expected.txt @@ -1,6 +1,6 @@ This test dumps all of the properties that are reachable from the window object, along with their types. -window [object DOMWindow] +window [object Window] window.Array [function] window.Attr [object AttrConstructor] window.Attr.prototype [object AttrPrototype] @@ -2183,8 +2183,8 @@ window.WebSocket.prototype.removeEventListener [function] window.WebSocket.prototype.send [function] window.WheelEvent [object WheelEventConstructor] window.WheelEvent.prototype [printed above as window.Event.prototype] -window.Window [object DOMWindowConstructor] -window.Window.prototype [object DOMWindowPrototype] +window.Window [object WindowConstructor] +window.Window.prototype [object WindowPrototype] window.Window.prototype.addEventListener [function] window.Window.prototype.alert [function] window.Window.prototype.atob [function] diff --git a/LayoutTests/platform/qt/fast/dom/prototype-inheritance-2-expected.txt b/LayoutTests/platform/qt/fast/dom/prototype-inheritance-2-expected.txt index 7d2ac41..2a836ad 100644 --- a/LayoutTests/platform/qt/fast/dom/prototype-inheritance-2-expected.txt +++ b/LayoutTests/platform/qt/fast/dom/prototype-inheritance-2-expected.txt @@ -81,9 +81,9 @@ PASS DOMStringMapPrototype from inner.document.forms.testForm.0.dataset.__proto_ PASS DOMTokenList from inner.document.forms.testForm.0.0.classList PASS DOMTokenListConstructor from inner.document.forms.testForm.0.classList.constructor PASS DOMTokenListPrototype from inner.document.forms.testForm.0.0.classList.__proto__ -PASS DOMWindow from inner -PASS DOMWindowConstructor from inner.document.forms.testForm.0.ownerDocument.defaultView.constructor -PASS DOMWindowPrototype from inner.document.forms.testForm.0.ownerDocument.defaultView.__proto__ +PASS Window from inner +PASS WindowConstructor from inner.document.forms.testForm.0.ownerDocument.defaultView.constructor +PASS WindowPrototype from inner.document.forms.testForm.0.ownerDocument.defaultView.__proto__ PASS DocumentPrototype from inner.document.forms.testForm.0.ownerDocument.__proto__.__proto__ PASS ElementPrototype from inner.document.forms.testForm.0.__proto__.__proto__.__proto__ PASS Function from inner.document.createElement diff --git a/LayoutTests/platform/qt/fast/js/global-constructors-expected.txt b/LayoutTests/platform/qt/fast/js/global-constructors-expected.txt index ce52059..c91dfbc 100644 --- a/LayoutTests/platform/qt/fast/js/global-constructors-expected.txt +++ b/LayoutTests/platform/qt/fast/js/global-constructors-expected.txt @@ -304,7 +304,7 @@ PASS WebKitPoint.toString() is '[object WebKitPointConstructor]' PASS WebKitTransitionEvent.toString() is '[object WebKitTransitionEventConstructor]' PASS WebSocket.toString() is '[object WebSocketConstructor]' PASS WheelEvent.toString() is '[object WheelEventConstructor]' -FAIL Window.toString() should be [object WindowConstructor]. Was [object DOMWindowConstructor]. +FAIL Window.toString() should be [object WindowConstructor]. Was [object WindowConstructor]. PASS Worker.toString() is '[object WorkerConstructor]' PASS XMLDocument.toString() is '[object DocumentConstructor]' PASS XMLHttpRequest.toString() is '[object XMLHttpRequestConstructor]' diff --git a/LayoutTests/platform/qt/http/tests/security/cross-frame-access-put-expected.txt b/LayoutTests/platform/qt/http/tests/security/cross-frame-access-put-expected.txt index a971605..7492a42 100644 --- a/LayoutTests/platform/qt/http/tests/security/cross-frame-access-put-expected.txt +++ b/LayoutTests/platform/qt/http/tests/security/cross-frame-access-put-expected.txt @@ -478,7 +478,7 @@ ALERT: PASS: window.event should be 'undefined' and is. CONSOLE MESSAGE: 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. ALERT: PASS: window.frameElement should be 'undefined' and is. -ALERT: PASS: window.frames should be '[object DOMWindow]' and is. +ALERT: PASS: window.frames should be '[object Window]' and is. ALERT: PASS: window.history should be '[object History]' and is. ALERT: PASS: window.images should be 'undefined' and is. ALERT: PASS: window.innerHeight should be '150' and is. @@ -529,11 +529,11 @@ ALERT: PASS: window.screenY matched the expected value. ALERT: PASS: window.scrollbars should be '[object BarInfo]' and is. ALERT: PASS: window.scrollX should be '0' and is. ALERT: PASS: window.scrollY should be '0' and is. -ALERT: PASS: window.self should be '[object DOMWindow]' and is. +ALERT: PASS: window.self should be '[object Window]' and is. ALERT: PASS: window.status should be '' and is. ALERT: PASS: window.statusbar should be '[object BarInfo]' and is. ALERT: PASS: window.toolbar should be '[object BarInfo]' and is. -ALERT: PASS: window.window should be '[object DOMWindow]' and is. +ALERT: PASS: window.window should be '[object Window]' and is. ALERT: PASS: window.parent should be parentOld and is. ALERT: PASS: window.top should be topOld and is. ALERT: PASS: window.addEventListener should be 'function addEventListener() { [native code]}' and is. diff --git a/LayoutTests/platform/win/fast/dom/Window/window-properties-expected.txt b/LayoutTests/platform/win/fast/dom/Window/window-properties-expected.txt index 596887f..c11df12 100644 --- a/LayoutTests/platform/win/fast/dom/Window/window-properties-expected.txt +++ b/LayoutTests/platform/win/fast/dom/Window/window-properties-expected.txt @@ -1,6 +1,6 @@ This test dumps all of the properties that are reachable from the window object, along with their types. -window [object DOMWindow] +window [object Window] window.Array [function] window.Attr [object AttrConstructor] window.Attr.prototype [object AttrPrototype] @@ -2275,8 +2275,8 @@ window.console.timeEnd [function] window.console.timeStamp [function] window.console.trace [function] window.console.warn [function] -window.constructor [object DOMWindowConstructor] -window.constructor.prototype [object DOMWindowPrototype] +window.constructor [object WindowConstructor] +window.constructor.prototype [object WindowPrototype] window.constructor.prototype.addEventListener [function] window.constructor.prototype.alert [function] window.constructor.prototype.atob [function] diff --git a/LayoutTests/platform/win/fast/dom/Window/window-property-descriptors-expected.txt b/LayoutTests/platform/win/fast/dom/Window/window-property-descriptors-expected.txt index 9db371e..925cabf 100644 --- a/LayoutTests/platform/win/fast/dom/Window/window-property-descriptors-expected.txt +++ b/LayoutTests/platform/win/fast/dom/Window/window-property-descriptors-expected.txt @@ -331,6 +331,7 @@ PASS typeof Object.getOwnPropertyDescriptor(window, 'WebKitPoint') is 'object' PASS typeof Object.getOwnPropertyDescriptor(window, 'WebKitTransitionEvent') is 'object' PASS typeof Object.getOwnPropertyDescriptor(window, 'WebSocket') is 'object' PASS typeof Object.getOwnPropertyDescriptor(window, 'WheelEvent') is 'object' +PASS typeof Object.getOwnPropertyDescriptor(window, 'Window') is 'object' PASS typeof Object.getOwnPropertyDescriptor(window, 'Worker') is 'object' PASS typeof Object.getOwnPropertyDescriptor(window, 'XMLDocument') is 'object' PASS typeof Object.getOwnPropertyDescriptor(window, 'XMLHttpRequest') is 'object' diff --git a/LayoutTests/platform/win/fast/dom/prototype-inheritance-2-expected.txt b/LayoutTests/platform/win/fast/dom/prototype-inheritance-2-expected.txt index 499bb65..3400ded 100644 --- a/LayoutTests/platform/win/fast/dom/prototype-inheritance-2-expected.txt +++ b/LayoutTests/platform/win/fast/dom/prototype-inheritance-2-expected.txt @@ -81,9 +81,9 @@ PASS DOMStringMapPrototype from inner.document.forms.testForm.0.dataset.__proto_ PASS DOMTokenList from inner.document.forms.testForm.0.0.classList PASS DOMTokenListConstructor from inner.document.forms.testForm.0.classList.constructor PASS DOMTokenListPrototype from inner.document.forms.testForm.0.0.classList.__proto__ -PASS DOMWindow from inner -PASS DOMWindowConstructor from inner.document.forms.testForm.0.ownerDocument.defaultView.constructor -PASS DOMWindowPrototype from inner.document.forms.testForm.0.ownerDocument.defaultView.__proto__ +PASS Window from inner +PASS WindowConstructor from inner.document.forms.testForm.0.ownerDocument.defaultView.constructor +PASS WindowPrototype from inner.document.forms.testForm.0.ownerDocument.defaultView.__proto__ PASS DocumentPrototype from inner.document.forms.testForm.0.ownerDocument.__proto__.__proto__ PASS ElementPrototype from inner.document.forms.testForm.0.__proto__.__proto__.__proto__ PASS Function from inner.document.createElement diff --git a/LayoutTests/sputnik/Conformance/11_Expressions/11.1_Primary_Expressions/11.1.1_The_this_Keyword/S11.1.1_A2-expected.txt b/LayoutTests/sputnik/Conformance/11_Expressions/11.1_Primary_Expressions/11.1.1_The_this_Keyword/S11.1.1_A2-expected.txt index 1498b6b..4966fdc 100644 --- a/LayoutTests/sputnik/Conformance/11_Expressions/11.1_Primary_Expressions/11.1.1_The_this_Keyword/S11.1.1_A2-expected.txt +++ b/LayoutTests/sputnik/Conformance/11_Expressions/11.1_Primary_Expressions/11.1.1_The_this_Keyword/S11.1.1_A2-expected.txt @@ -1,6 +1,6 @@ S11.1.1_A2 -FAIL SputnikError: #1: this.toString() === toString(). Actual: [object DOMWindow] +FAIL SputnikError: #1: this.toString() === toString(). Actual: [object Window] TEST COMPLETE diff --git a/LayoutTests/sputnik/Conformance/15_Native_Objects/15.1_The_Global_Object/S15.1_A1_T1-expected.txt b/LayoutTests/sputnik/Conformance/15_Native_Objects/15.1_The_Global_Object/S15.1_A1_T1-expected.txt index 723f234..f98b214 100644 --- a/LayoutTests/sputnik/Conformance/15_Native_Objects/15.1_The_Global_Object/S15.1_A1_T1-expected.txt +++ b/LayoutTests/sputnik/Conformance/15_Native_Objects/15.1_The_Global_Object/S15.1_A1_T1-expected.txt @@ -1,6 +1,6 @@ S15.1_A1_T1 -PASS TypeError: '[object DOMWindow]' is not a constructor (evaluating 'new this') +PASS TypeError: '[object Window]' is not a constructor (evaluating 'new this') TEST COMPLETE diff --git a/LayoutTests/sputnik/Conformance/15_Native_Objects/15.1_The_Global_Object/S15.1_A1_T2-expected.txt b/LayoutTests/sputnik/Conformance/15_Native_Objects/15.1_The_Global_Object/S15.1_A1_T2-expected.txt index b3a268c..e18adfa 100644 --- a/LayoutTests/sputnik/Conformance/15_Native_Objects/15.1_The_Global_Object/S15.1_A1_T2-expected.txt +++ b/LayoutTests/sputnik/Conformance/15_Native_Objects/15.1_The_Global_Object/S15.1_A1_T2-expected.txt @@ -1,6 +1,6 @@ S15.1_A1_T2 -PASS TypeError: '[object DOMWindow]' is not a constructor (evaluating 'new this()') +PASS TypeError: '[object Window]' is not a constructor (evaluating 'new this()') TEST COMPLETE diff --git a/LayoutTests/sputnik/Conformance/15_Native_Objects/15.1_The_Global_Object/S15.1_A2_T1-expected.txt b/LayoutTests/sputnik/Conformance/15_Native_Objects/15.1_The_Global_Object/S15.1_A2_T1-expected.txt index 25ecec3..eeba6a9 100644 --- a/LayoutTests/sputnik/Conformance/15_Native_Objects/15.1_The_Global_Object/S15.1_A2_T1-expected.txt +++ b/LayoutTests/sputnik/Conformance/15_Native_Objects/15.1_The_Global_Object/S15.1_A2_T1-expected.txt @@ -1,6 +1,6 @@ S15.1_A2_T1 -PASS TypeError: '[object DOMWindow]' is not a function (evaluating 'this()') +PASS TypeError: '[object Window]' is not a function (evaluating 'this()') TEST COMPLETE diff --git a/Source/WebCore/ChangeLog b/Source/WebCore/ChangeLog index 502ae66..2d6c68c 100644 --- a/Source/WebCore/ChangeLog +++ b/Source/WebCore/ChangeLog @@ -1,3 +1,21 @@ +2012-02-23 Erik Arvidsson + + Rename DOMWindow to Window in the bindings + https://bugs.webkit.org/show_bug.cgi?id=78721 + + Reviewed by Adam Barth. + + Covered by existing tests. + + * inspector/front-end/DetailedHeapshotGridNodes.js: + (WebInspector.HeapSnapshotGenericObjectNode): + (WebInspector.HeapSnapshotGenericObjectNode.prototype.isWindow): + * inspector/front-end/HeapSnapshot.js: + (WebInspector.HeapSnapshotNode.prototype.get isWindow): + (WebInspector.HeapSnapshot.prototype._calculateObjectToWindowDistance): + (WebInspector.HeapSnapshot.prototype._markQueriableHeapObjects): + * page/DOMWindow.idl: + 2012-02-23 Shinya Kawanaka NodeRenderingContext should have ShadowRootList instead of ShadowRoot. diff --git a/Source/WebCore/inspector/front-end/DetailedHeapshotGridNodes.js b/Source/WebCore/inspector/front-end/DetailedHeapshotGridNodes.js index cb20b44..6e7efac 100644 --- a/Source/WebCore/inspector/front-end/DetailedHeapshotGridNodes.js +++ b/Source/WebCore/inspector/front-end/DetailedHeapshotGridNodes.js @@ -209,7 +209,7 @@ WebInspector.HeapSnapshotGenericObjectNode = function(tree, node) this.snapshotNodeIndex = node.nodeIndex; if (this._type === "string") this.hasHoverMessage = true; - else if (this._type === "object" && this.isDOMWindow(this._name)) { + else if (this._type === "object" && this.isWindow(this._name)) { this._name = this.shortenWindowURL(this._name, false); this.hasHoverMessage = true; } else if (node.flags & tree.snapshot.nodeFlags.canBeQueried) @@ -343,9 +343,9 @@ WebInspector.HeapSnapshotGenericObjectNode.prototype = { this._provider.isEmpty(isEmptyCallback.bind(this)); }, - isDOMWindow: function(fullName) + isWindow: function(fullName) { - return fullName.substr(0, 9) === "DOMWindow"; + return fullName.substr(0, 9) === "Window"; }, shortenWindowURL: function(fullName, hasObjectId) diff --git a/Source/WebCore/inspector/front-end/HeapSnapshot.js b/Source/WebCore/inspector/front-end/HeapSnapshot.js index 084ad0e..437cd9a 100644 --- a/Source/WebCore/inspector/front-end/HeapSnapshot.js +++ b/Source/WebCore/inspector/front-end/HeapSnapshot.js @@ -591,9 +591,9 @@ WebInspector.HeapSnapshotNode.prototype = { return this._type() === this._snapshot._nodeSyntheticType; }, - get isDOMWindow() + get isWindow() { - return this.name.substr(0, 9) === "DOMWindow"; + return this.name.substr(0, 9) === "Window"; }, get isDetachedDOMTreesRoot() @@ -945,10 +945,10 @@ WebInspector.HeapSnapshot.prototype = { { this._distancesToWindow = new Array(this.nodeCount); - // bfs for DOMWindow roots + // bfs for Window roots var list = []; for (var iter = this.rootNode.edges; iter.hasNext(); iter.next()) { - if (iter.edge.node.isDOMWindow) { + if (iter.edge.node.isWindow) { list.push(iter.edge.node); this._distancesToWindow[iter.edge.node.nodeIndex] = 0; } @@ -1174,14 +1174,14 @@ WebInspector.HeapSnapshot.prototype = { _markQueriableHeapObjects: function() { - // Allow runtime properties query for objects accessible from DOMWindow objects + // Allow runtime properties query for objects accessible from Window objects // via regular properties, and for DOM wrappers. Trying to access random objects // can cause a crash due to insonsistent state of internal properties of wrappers. var flag = this._nodeFlags.canBeQueried; var list = []; for (var iter = this.rootNode.edges; iter.hasNext(); iter.next()) { - if (iter.edge.node.isDOMWindow) + if (iter.edge.node.isWindow) list.push(iter.edge.node); } diff --git a/Source/WebCore/page/DOMWindow.idl b/Source/WebCore/page/DOMWindow.idl index b0f26ef..83ff248 100644 --- a/Source/WebCore/page/DOMWindow.idl +++ b/Source/WebCore/page/DOMWindow.idl @@ -40,7 +40,8 @@ module window { JSGenerateToNativeObject, ReplaceableConstructor, JSLegacyParent=JSDOMWindowBase, - V8CustomToJSObject + V8CustomToJSObject, + InterfaceName=Window ] DOMWindow { // DOM Level 0 attribute [Replaceable] Screen screen; -- 2.7.4