[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 ffb75a68dcb6e68aa47822fe45942f8f81c5f1ee
Author: ap at apple.com <ap at apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Fri Nov 20 21:29:00 2009 +0000

            Reviewed by Darin Adler.
    
            https://bugs.webkit.org/show_bug.cgi?id=25381
            Needs test: jQuery animation crashing Safari
    
            Adding a regression test for a bug that doesn't reproduce in ToT.
    
            * fast/dynamic/jQuery-animation-crash-expected.txt: Added.
            * fast/dynamic/jQuery-animation-crash.html: Added.
    
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@51254 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog
index 1e09ea6..69c91f5 100644
--- a/LayoutTests/ChangeLog
+++ b/LayoutTests/ChangeLog
@@ -1,5 +1,17 @@
 2009-11-20  Alexey Proskuryakov  <ap at apple.com>
 
+        Reviewed by Darin Adler.
+
+        https://bugs.webkit.org/show_bug.cgi?id=25381
+        Needs test: jQuery animation crashing Safari
+
+        Adding a regression test for a bug that doesn't reproduce in ToT.
+
+        * fast/dynamic/jQuery-animation-crash-expected.txt: Added.
+        * fast/dynamic/jQuery-animation-crash.html: Added.
+
+2009-11-20  Alexey Proskuryakov  <ap at apple.com>
+
         WebSocket tests still don't work on Windows, disabling for futher invesigation.
 
         * platform/win/Skipped:
diff --git a/LayoutTests/fast/dynamic/jQuery-animation-crash-expected.txt b/LayoutTests/fast/dynamic/jQuery-animation-crash-expected.txt
new file mode 100644
index 0000000..679b873
--- /dev/null
+++ b/LayoutTests/fast/dynamic/jQuery-animation-crash-expected.txt
@@ -0,0 +1,5 @@
+Test for bug 25381: jQuery animation crashing Safari.
+
+PASS if didn't crash.
+
+
diff --git a/LayoutTests/fast/dynamic/jQuery-animation-crash.html b/LayoutTests/fast/dynamic/jQuery-animation-crash.html
new file mode 100644
index 0000000..2699c0b
--- /dev/null
+++ b/LayoutTests/fast/dynamic/jQuery-animation-crash.html
@@ -0,0 +1,58 @@
+<p>Test for <a href="https://bugs.webkit.org/show_bug.cgi?id=25381">bug 25381</a>:
+jQuery animation crashing Safari.</p>
+<p>PASS if didn't crash.</p>
+<div style="position:fixed; top:0px; width:100px; background:red;">
+    <div id="i" style="position:fixed; display:none; top:0px; width:100px; height:100px; overflow:hidden; background:green;"><div>ABC</div></div>
+</div>
+
+<script>
+if (window.layoutTestController) {
+    layoutTestController.dumpAsText();
+    layoutTestController.waitUntilDone();
+}
+
+function swap( elem, options, callback ) {
+    var old = {};
+    // Remember the old values, and insert the new ones
+    for ( var name in options ) {
+        old[ name ] = elem.style[ name ];
+        elem.style[ name ] = options[ name ];
+    }
+
+    callback.call( elem );
+
+    // Revert the old values
+    for ( var name in options ) {
+        elem.style[ name ] = old[ name ];
+    }
+}
+
+function forceLayout()
+{
+    document.body.offsetTop;
+}
+
+setTimeout(function() {
+    var elem = document.getElementById('i');
+    elem.style['display']='block';
+
+    var val, props = { position: "absolute", visibility: "hidden", display:"block" }; 
+    function getWH() {
+        val = elem.offsetHeight;
+    }
+    swap( elem, props, getWH );
+
+    forceLayout();
+    elem.style['height']=2;
+    forceLayout();
+    elem.style['height']=3;
+    forceLayout();
+    elem.style['display']='none';
+    forceLayout();
+    if (window.layoutTestController)
+        layoutTestController.notifyDone();
+    return;
+}, 0); 
+
+</script>
+

-- 
WebKit Debian packaging