[SCM] WebKit Debian packaging branch, webkit-1.2, updated. upstream/1.1.90-6072-g9a69373

[ap at apple.com]

The following commit has been merged in the webkit-1.2 branch:
commit fc8b9144c8d903770a9b7227b88fc9f60e7f5916
Author: ap at apple.com <ap at apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Tue Mar 2 02:24:24 2010 +0000

            Reviewed by Darin Adler.
    
            https://bugs.webkit.org/show_bug.cgi?id=26520
            Accessing a DOM node from a parent window in a child iframe moves the prototype to the child
            iframe and resets it in the parent window
    
            Adding a test for a bug that no longer occurs in ToT.
    
            * fast/dom/cross-frame-node-prototype-expected.txt: Added.
            * fast/dom/cross-frame-node-prototype.html: Added.
            * fast/dom/resources/cross-frame-node-prototype-iframe.html: Added.
    
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@55396 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog
index 4d280b2..387eb0b 100644
--- a/LayoutTests/ChangeLog
+++ b/LayoutTests/ChangeLog
@@ -1,3 +1,17 @@
+2010-02-27  Alexey Proskuryakov  <ap at apple.com>
+
+        Reviewed by Darin Adler.
+
+        https://bugs.webkit.org/show_bug.cgi?id=26520
+        Accessing a DOM node from a parent window in a child iframe moves the prototype to the child
+        iframe and resets it in the parent window
+
+        Adding a test for a bug that no longer occurs in ToT.
+
+        * fast/dom/cross-frame-node-prototype-expected.txt: Added.
+        * fast/dom/cross-frame-node-prototype.html: Added.
+        * fast/dom/resources/cross-frame-node-prototype-iframe.html: Added.
+
 2010-03-01  Gustavo Noronha Silva  <gns at gnome.org>
 
         Rebaseline the two editing tests we stopped skipping - we failed
diff --git a/LayoutTests/fast/dom/cross-frame-node-prototype-expected.txt b/LayoutTests/fast/dom/cross-frame-node-prototype-expected.txt
new file mode 100644
index 0000000..09fa357
--- /dev/null
+++ b/LayoutTests/fast/dom/cross-frame-node-prototype-expected.txt
@@ -0,0 +1,5 @@
+Test for bug 26520: Accessing a DOM node from a parent window in a child iframe moves the prototype to the child iframe and resets it in the parent window.
+
+
+
+PASS
diff --git a/LayoutTests/fast/dom/cross-frame-node-prototype.html b/LayoutTests/fast/dom/cross-frame-node-prototype.html
new file mode 100644
index 0000000..cb2229c
--- /dev/null
+++ b/LayoutTests/fast/dom/cross-frame-node-prototype.html
@@ -0,0 +1,21 @@
+<p>Test for <a href="https://bugs.webkit.org/show_bug.cgi?id=26520">bug 26520</a>:
+Accessing a DOM node from a parent window in a child iframe moves the prototype to the child iframe and resets it in the parent window.</p>
+<script type="text/javascript">
+if (window.layoutTestController)
+    layoutTestController.dumpAsText();
+
+HTMLInputElement.prototype.foo = 'foo';
+
+function test(value)
+{
+    document.getElementById("result").innerHTML = (value == "foo") ? "PASS" : ("FAIL: " + value);
+}
+
+</script>
+
+<iframe src="resources/cross-frame-node-prototype-iframe.html"></iframe>
+
+<form onsubmit="test(this.elements[0].foo); return false">
+<input type="submit" name="fdsa">
+<div id=result>FAIL: Test didn't run. Please click on the button above.</div>
+</form>
diff --git a/LayoutTests/fast/dom/resources/cross-frame-node-prototype-iframe.html b/LayoutTests/fast/dom/resources/cross-frame-node-prototype-iframe.html
new file mode 100644
index 0000000..0423c68
--- /dev/null
+++ b/LayoutTests/fast/dom/resources/cross-frame-node-prototype-iframe.html
@@ -0,0 +1,14 @@
+
+<script type="text/javascript">
+
+HTMLFormElement.prototype.bar = 'bar';
+
+window.onload = function (e) {
+    top.document.body.addEventListener('click', function (e) {
+        var target = e.target;
+    }, true);
+    top.document.getElementsByTagName("input")[0].click();
+}
+
+</script>
+

-- 
WebKit Debian packaging