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

Thu Apr 8 00:43:56 UTC 2010

The following commit has been merged in the webkit-1.2 branch:
commit dcab82cc5723f9d3ac2a0a7dbc6e53d8c93403f4
Author: eric at webkit.org <eric at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Sun Dec 20 10:18:53 2009 +0000

    2009-12-20  Dirk Pranke  <dpranke at chromium.org>
    
            Reviewed by Darin Adler.
    
            Upstream a test from chromium.org that verifies that calling
            document.clear() from an external script doesn't crash the browser.
            https://bugs.webkit.org/show_bug.cgi?id=32743
    
            * fast/dom/document-clear-expected.txt: Added.
            * fast/dom/document-clear.html: Added.
            * fast/dom/resources/document-clear.js: Added.
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@52409 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog
index 399b30d..764c85a 100644
--- a/LayoutTests/ChangeLog
+++ b/LayoutTests/ChangeLog
@@ -2,6 +2,18 @@
 
         Reviewed by Darin Adler.
 
+        Upstream a test from chromium.org that verifies that calling
+        document.clear() from an external script doesn't crash the browser.
+        https://bugs.webkit.org/show_bug.cgi?id=32743
+
+        * fast/dom/document-clear-expected.txt: Added.
+        * fast/dom/document-clear.html: Added.
+        * fast/dom/resources/document-clear.js: Added.
+
+2009-12-20  Dirk Pranke  <dpranke at chromium.org>
+
+        Reviewed by Darin Adler.
+
         https://bugs.webkit.org/show_bug.cgi?id=32735
 
         Upstream a test from chromium.org - ensure that creating a 
diff --git a/LayoutTests/fast/dom/document-clear-expected.txt b/LayoutTests/fast/dom/document-clear-expected.txt
new file mode 100644
index 0000000..8df8b45
--- /dev/null
+++ b/LayoutTests/fast/dom/document-clear-expected.txt
@@ -0,0 +1,7 @@
+Original line 1
+
+New line 1
+
+Calling document.clear() from an external script should not crash.
+
+If successful, there will be 4 lines total
diff --git a/LayoutTests/fast/dom/document-clear.html b/LayoutTests/fast/dom/document-clear.html
new file mode 100644
index 0000000..3020c48
--- /dev/null
+++ b/LayoutTests/fast/dom/document-clear.html
@@ -0,0 +1,10 @@
+<html>
+  <p>Original line 1</p>
+  <script src="resources/document-clear.js"></script>
+  <p>Calling document.clear() from an external script should not crash.</p>
+  <script>
+    if (window.layoutTestController)
+      layoutTestController.dumpAsText();
+  </script>
+  <p>If successful, there will be 4 lines total</p>
+</html>
diff --git a/LayoutTests/fast/dom/resources/document-clear.js b/LayoutTests/fast/dom/resources/document-clear.js
new file mode 100644
index 0000000..bc3148c
--- /dev/null
+++ b/LayoutTests/fast/dom/resources/document-clear.js
@@ -0,0 +1,5 @@
+var doc = "<p>New line 1</p>";
+document.open();
+document.clear(); // No-op, but should not crash
+document.write(doc);
+document.close();

-- 
WebKit Debian packaging

