summaryrefslogtreecommitdiffstats
path: root/webkit/data
diff options
context:
space:
mode:
authorager@google.com <ager@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2008-10-09 10:54:30 +0000
committerager@google.com <ager@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2008-10-09 10:54:30 +0000
commit393e50bb469d6af18dd06ee16fd4020f638a4c86 (patch)
tree0a64895d575a018c14a6c501a8c00ec66cbc99d4 /webkit/data
parentf5ea16084b0ada455912c541e804b3a1831c4cc0 (diff)
downloadchromium_src-393e50bb469d6af18dd06ee16fd4020f638a4c86.zip
chromium_src-393e50bb469d6af18dd06ee16fd4020f638a4c86.tar.gz
chromium_src-393e50bb469d6af18dd06ee16fd4020f638a4c86.tar.bz2
Merge Document.idl and DOMWindow.idl properly. Diffing our forked
versions agains the WebKit ones it is now easy to see the differences. The lookup on the window object has changed slightly. We can now get rid of our v8OnProto annotations in DOMWindow.idl. I have generated the new expected file for lookup-precedence for JSC using a webkit nightly build. Also, a couple of extra constructors have been added to the IDL file and the CROSS_DOCUMENT_MESSAGING define is gone. Review URL: http://codereview.chromium.org/6382 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@3092 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit/data')
-rw-r--r--webkit/data/layout_test_results/kjs/chrome/fast/dom/Window/window-lookup-precedence-expected.txt56
-rw-r--r--webkit/data/layout_test_results/v8/chrome/fast/dom/Window/window-lookup-precedence-expected.txt56
-rw-r--r--webkit/data/layout_tests/chrome/fast/dom/Window/window-lookup-precedence.html5
-rw-r--r--webkit/data/layout_tests/chrome/fast/dom/dom-constructors-expected.txt6
4 files changed, 63 insertions, 60 deletions
diff --git a/webkit/data/layout_test_results/kjs/chrome/fast/dom/Window/window-lookup-precedence-expected.txt b/webkit/data/layout_test_results/kjs/chrome/fast/dom/Window/window-lookup-precedence-expected.txt
index 87cfdd7..f1d2143 100644
--- a/webkit/data/layout_test_results/kjs/chrome/fast/dom/Window/window-lookup-precedence-expected.txt
+++ b/webkit/data/layout_test_results/kjs/chrome/fast/dom/Window/window-lookup-precedence-expected.txt
@@ -137,7 +137,7 @@ window.btoa IS [object DOMWindow]
window.captureEvents IS [object DOMWindow]
window.clearInterval IS [object DOMWindow]
window.clearTimeout IS [object DOMWindow]
-window.clientInformation IS [object DOMWindow]
+window.clientInformation IS [object Navigator]
window.close IS [object DOMWindow]
window.closed IS false
window.confirm IS [object DOMWindow]
@@ -158,41 +158,41 @@ window.history IS [object History]
window.innerHeight IS Number
window.innerWidth IS Number
window.length IS Number
-window.location IS [object DOMWindow]
+window.location IS Location
window.locationbar IS [object BarInfo]
window.menubar IS [object BarInfo]
window.moveBy IS [object DOMWindow]
window.moveTo IS [object DOMWindow]
window.name IS
-window.navigator IS [object DOMWindow]
+window.navigator IS [object Navigator]
window.offscreenBuffering IS true
-window.onabort IS [object DOMWindow]
-window.onbeforeunload IS [object DOMWindow]
-window.onblur IS [object DOMWindow]
-window.onchange IS [object DOMWindow]
-window.onclick IS [object DOMWindow]
-window.ondblclick IS [object DOMWindow]
+window.onabort IS null
+window.onbeforeunload IS null
+window.onblur IS null
+window.onchange IS null
+window.onclick IS null
+window.ondblclick IS null
window.ondragdrop IS [object DOMWindow]
-window.onerror IS [object DOMWindow]
-window.onfocus IS [object DOMWindow]
-window.onkeydown IS [object DOMWindow]
-window.onkeypress IS [object DOMWindow]
-window.onkeyup IS [object DOMWindow]
-window.onload IS [object DOMWindow]
-window.onmousedown IS [object DOMWindow]
-window.onmousemove IS [object DOMWindow]
-window.onmouseout IS [object DOMWindow]
-window.onmouseover IS [object DOMWindow]
-window.onmouseup IS [object DOMWindow]
-window.onmousewheel IS [object DOMWindow]
+window.onerror IS null
+window.onfocus IS null
+window.onkeydown IS null
+window.onkeypress IS null
+window.onkeyup IS null
+window.onload IS function onload(event) {runTest()}
+window.onmousedown IS null
+window.onmousemove IS null
+window.onmouseout IS null
+window.onmouseover IS null
+window.onmouseup IS null
+window.onmousewheel IS null
window.onmove IS [object DOMWindow]
-window.onreset IS [object DOMWindow]
-window.onresize IS [object DOMWindow]
-window.onscroll IS [object DOMWindow]
-window.onsearch IS [object DOMWindow]
-window.onselect IS [object DOMWindow]
-window.onsubmit IS [object DOMWindow]
-window.onunload IS [object DOMWindow]
+window.onreset IS null
+window.onresize IS null
+window.onscroll IS null
+window.onsearch IS null
+window.onselect IS null
+window.onsubmit IS null
+window.onunload IS null
window.open IS [object DOMWindow]
window.opener IS null
window.outerHeight IS Number
diff --git a/webkit/data/layout_test_results/v8/chrome/fast/dom/Window/window-lookup-precedence-expected.txt b/webkit/data/layout_test_results/v8/chrome/fast/dom/Window/window-lookup-precedence-expected.txt
index c013314..e7eeda5e 100644
--- a/webkit/data/layout_test_results/v8/chrome/fast/dom/Window/window-lookup-precedence-expected.txt
+++ b/webkit/data/layout_test_results/v8/chrome/fast/dom/Window/window-lookup-precedence-expected.txt
@@ -158,7 +158,7 @@ window.history IS [object History]
window.innerHeight IS Number
window.innerWidth IS Number
window.length IS Number
-window.location IS [object global]
+window.location IS Location
window.locationbar IS [object BarInfo]
window.menubar IS [object BarInfo]
window.moveBy IS [object global]
@@ -166,33 +166,33 @@ window.moveTo IS [object global]
window.name IS
window.navigator IS [object Navigator]
window.offscreenBuffering IS true
-window.onabort IS [object global]
-window.onbeforeunload IS [object global]
-window.onblur IS [object global]
-window.onchange IS [object global]
-window.onclick IS [object global]
-window.ondblclick IS [object global]
-window.ondragdrop IS [object global]
-window.onerror IS [object global]
-window.onfocus IS [object global]
-window.onkeydown IS [object global]
-window.onkeypress IS [object global]
-window.onkeyup IS [object global]
-window.onload IS [object global]
-window.onmousedown IS [object global]
-window.onmousemove IS [object global]
-window.onmouseout IS [object global]
-window.onmouseover IS [object global]
-window.onmouseup IS [object global]
-window.onmousewheel IS [object global]
-window.onmove IS [object global]
-window.onreset IS [object global]
-window.onresize IS [object global]
-window.onscroll IS [object global]
-window.onsearch IS [object global]
-window.onselect IS [object global]
-window.onsubmit IS [object global]
-window.onunload IS [object global]
+window.onabort IS null
+window.onbeforeunload IS null
+window.onblur IS null
+window.onchange IS null
+window.onclick IS null
+window.ondblclick IS null
+window.ondragdrop IS null
+window.onerror IS null
+window.onfocus IS null
+window.onkeydown IS null
+window.onkeypress IS null
+window.onkeyup IS null
+window.onload IS function onload(evt) { with (this.ownerDocument ? this.ownerDocument : {}) { with (this.form ? this.form : {}) { with (this) { return (function(evt){runTest()}).call(this, evt); } } } }
+window.onmousedown IS null
+window.onmousemove IS null
+window.onmouseout IS null
+window.onmouseover IS null
+window.onmouseup IS null
+window.onmousewheel IS null
+window.onmove IS null
+window.onreset IS null
+window.onresize IS null
+window.onscroll IS null
+window.onsearch IS null
+window.onselect IS null
+window.onsubmit IS null
+window.onunload IS null
window.open IS [object global]
window.opener IS null
window.outerHeight IS Number
diff --git a/webkit/data/layout_tests/chrome/fast/dom/Window/window-lookup-precedence.html b/webkit/data/layout_tests/chrome/fast/dom/Window/window-lookup-precedence.html
index 69d8c18..67ef335 100644
--- a/webkit/data/layout_tests/chrome/fast/dom/Window/window-lookup-precedence.html
+++ b/webkit/data/layout_tests/chrome/fast/dom/Window/window-lookup-precedence.html
@@ -18,8 +18,11 @@ function check(name) {
subframe.name = name;
var out = doc.getElementById("console");
var v = win[name];
- if (typeof v == 'number')
+ if (typeof v == 'number') {
v = 'Number'; // cannonicalize numbers.
+ } else if (/window-lookup-precedence.html/.test(v)) {
+ v = 'Location'; // cannonicalize current location.
+ }
out.innerHTML = out.innerHTML + "window."+name + " IS " + v + "<br>";
}
diff --git a/webkit/data/layout_tests/chrome/fast/dom/dom-constructors-expected.txt b/webkit/data/layout_tests/chrome/fast/dom/dom-constructors-expected.txt
index a31fce1..86b9b51 100644
--- a/webkit/data/layout_tests/chrome/fast/dom/dom-constructors-expected.txt
+++ b/webkit/data/layout_tests/chrome/fast/dom/dom-constructors-expected.txt
@@ -76,8 +76,8 @@ HTMLElement: exception
BarInfo: no constructor
CanvasGradient: no constructor
CanvasPattern: no constructor
-CanvasRenderingContext2D: no constructor
-Clipboard: no constructor
+CanvasRenderingContext2D: exception
+Clipboard: exception
Console: no constructor
Counter: exception
CSSCharsetRule: exception
@@ -100,7 +100,7 @@ DOMWindow: no constructor
Event: exception
History: no constructor
UndetectableHTMLCollection: no constructor
-HTMLCollection: no constructor
+HTMLCollection: exception
HTMLOptionsCollection: no constructor
InspectorController: no constructor
KeyboardEvent: exception