[SCM] WebKit Debian packaging branch, webkit-1.1, updated. upstream/1.1.21-584-g1e41756

Fri Feb 26 22:24:42 UTC 2010

The following commit has been merged in the webkit-1.1 branch:
commit 0790b3ca17fc7f50d5ef8f8789fab88ecd25ec35
Author: japhet at chromium.org <japhet at chromium.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Thu Feb 18 17:08:39 2010 +0000

    2010-02-18  Nate Chapin  <japhet at chromium.org>
    
            Reviewed by Eric Seidel.
    
            Actually submitting test for https://bugs.webkit.org/show_bug.cgi?id=34899 this time.
    
            * fast/dom/Window/window-event-override-no-crash-expected.txt: Added.
            * fast/dom/Window/window-event-override-no-crash.html: Added.
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@54965 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog
index 62c466d..f3f454c 100644
--- a/LayoutTests/ChangeLog
+++ b/LayoutTests/ChangeLog
@@ -2,6 +2,15 @@
 
         Reviewed by Eric Seidel.
 
+        Actually submitting test for https://bugs.webkit.org/show_bug.cgi?id=34899 this time.
+
+        * fast/dom/Window/window-event-override-no-crash-expected.txt: Added.
+        * fast/dom/Window/window-event-override-no-crash.html: Added.
+
+2010-02-18  Nate Chapin  <japhet at chromium.org>
+
+        Reviewed by Eric Seidel.
+
         Test for https://bugs.webkit.org/show_bug.cgi?id=34899
 
         * fast/dom/Window/window-event-override-no-crash-expected.txt: Added.
diff --git a/LayoutTests/fast/dom/Window/window-event-override-no-crash-expected.txt b/LayoutTests/fast/dom/Window/window-event-override-no-crash-expected.txt
new file mode 100644
index 0000000..107eba5
--- /dev/null
+++ b/LayoutTests/fast/dom/Window/window-event-override-no-crash-expected.txt
@@ -0,0 +1 @@
+ This test ensures that window.event can be set to a meaningless object (and immediately be used internally) without causing a crash.
\ No newline at end of file
diff --git a/LayoutTests/fast/dom/Window/window-event-override-no-crash.html b/LayoutTests/fast/dom/Window/window-event-override-no-crash.html
new file mode 100644
index 0000000..78e0850
--- /dev/null
+++ b/LayoutTests/fast/dom/Window/window-event-override-no-crash.html
@@ -0,0 +1,14 @@
+<html>
+<body>
+<script>
+    if (window.layoutTestController)
+        layoutTestController.dumpAsText();
+
+window.event = new Object;
+var iframe = document.createElement("iframe");
+document.body.appendChild(iframe);
+iframe.src = "resources/blank.html";
+</script>
+This test ensures that window.event can be set to a meaningless object (and immediately be used internally) without causing a crash.
+</body>
+</html>
\ No newline at end of file

-- 
WebKit Debian packaging

