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

Thu Apr 8 00:46:00 UTC 2010

The following commit has been merged in the webkit-1.2 branch:
commit 2e9ef358b2404f5f0337c144bdde8774091ceba4
Author: eric at webkit.org <eric at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Tue Dec 22 07:04:43 2009 +0000

    2009-12-21  Dirk Pranke  <dpranke at chromium.org>
    
            Reviewed by Eric Seidel.
    
            Upstream chrome/fast/events/iframe-onload-remove-self-no-crash.html .
            https://bugs.webkit.org/show_bug.cgi?id=32742 .
    
            * fast/frames/iframe-onload-remove-self-no-crash-expected.txt: Added.
            * fast/frames/iframe-onload-remove-self-no-crash.html: Added.
            * fast/frames/resources/iframe-onload-remove-self-no-crash-child.html: Added.
            * fast/frames/resources/iframe-onload-remove-self-no-crash.js: Added.
            (onWindowLoad):
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@52484 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog
index 34895f9..6e7b844 100644
--- a/LayoutTests/ChangeLog
+++ b/LayoutTests/ChangeLog
@@ -1,3 +1,16 @@
+2009-12-21  Dirk Pranke  <dpranke at chromium.org>
+
+        Reviewed by Eric Seidel.
+
+        Upstream chrome/fast/events/iframe-onload-remove-self-no-crash.html .
+        https://bugs.webkit.org/show_bug.cgi?id=32742 .
+
+        * fast/frames/iframe-onload-remove-self-no-crash-expected.txt: Added.
+        * fast/frames/iframe-onload-remove-self-no-crash.html: Added.
+        * fast/frames/resources/iframe-onload-remove-self-no-crash-child.html: Added.
+        * fast/frames/resources/iframe-onload-remove-self-no-crash.js: Added.
+        (onWindowLoad):
+
 2009-12-21  Fumitoshi Ukai  <ukai at chromium.org>
 
         Reviewed by Alexey Proskuryakov.
diff --git a/LayoutTests/fast/frames/iframe-onload-remove-self-no-crash-expected.txt b/LayoutTests/fast/frames/iframe-onload-remove-self-no-crash-expected.txt
new file mode 100644
index 0000000..90742db
--- /dev/null
+++ b/LayoutTests/fast/frames/iframe-onload-remove-self-no-crash-expected.txt
@@ -0,0 +1,2 @@
+This tests that setting remove a child frame in onload event handler does not crash the renderer. 
+  
diff --git a/LayoutTests/fast/frames/iframe-onload-remove-self-no-crash.html b/LayoutTests/fast/frames/iframe-onload-remove-self-no-crash.html
new file mode 100644
index 0000000..fca7d11
--- /dev/null
+++ b/LayoutTests/fast/frames/iframe-onload-remove-self-no-crash.html
@@ -0,0 +1,13 @@
+<html>
+<script>
+if (window.layoutTestController)
+  layoutTestController.dumpAsText();
+</script>
+<script src="resources/iframe-onload-remove-self-no-crash.js"></script>
+<body>
+This tests that setting remove a child frame in onload event handler
+does not crash the renderer.
+<br>
+<iframe src="resources/iframe-onload-remove-self-no-crash-child.html"></iframe>
+</body>
+</html>
diff --git a/LayoutTests/fast/frames/resources/iframe-onload-remove-self-no-crash-child.html b/LayoutTests/fast/frames/resources/iframe-onload-remove-self-no-crash-child.html
new file mode 100644
index 0000000..c7daf2d
--- /dev/null
+++ b/LayoutTests/fast/frames/resources/iframe-onload-remove-self-no-crash-child.html
@@ -0,0 +1,3 @@
+<html>
+<script src="iframe-onload-remove-self-no-crash.js"></script>
+</html>
diff --git a/LayoutTests/fast/frames/resources/iframe-onload-remove-self-no-crash.js b/LayoutTests/fast/frames/resources/iframe-onload-remove-self-no-crash.js
new file mode 100644
index 0000000..2d3771e
--- /dev/null
+++ b/LayoutTests/fast/frames/resources/iframe-onload-remove-self-no-crash.js
@@ -0,0 +1,16 @@
+function onWindowLoad() {
+  var doc = top.document;
+  var b = doc.body;
+
+  var x = doc.getElementById('x');
+  if (x) {
+    b.removeChild(x);
+  }
+
+  x = doc.createElement("iframe");
+  x.setAttribute('id','x');
+  // appendChild triggers load
+  b.appendChild(x);
+}
+
+window.addEventListener("load", onWindowLoad, false);

-- 
WebKit Debian packaging

