[SCM] WebKit Debian packaging branch, debian/experimental, updated. debian/1.3.8-1-1049-g2e11a8e

Fri Jan 21 14:47:42 UTC 2011

The following commit has been merged in the debian/experimental branch:
commit ace92ba21890fbf00ab4d179554dd0ae8e1c3b8e
Author: inferno at chromium.org <inferno at chromium.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Thu Dec 30 07:55:26 2010 +0000

    2010-12-29  Abhishek Arya  <inferno at chromium.org>
    
            Unreviewed.
    
            Add 'PASS' to layout test since test failing on chromium due to empty expectations.
            Filed webkit bug 51734 to track gtk test failure and skipping test for now.
    
            * fast/multicol/span/double-merge-anonymous-block-crash-expected.txt:
            * fast/multicol/span/double-merge-anonymous-block-crash.html:
            * platform/gtk/Skipped:
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@74786 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog
index e2d8d80..1c839b2 100644
--- a/LayoutTests/ChangeLog
+++ b/LayoutTests/ChangeLog
@@ -1,5 +1,16 @@
 2010-12-29  Abhishek Arya  <inferno at chromium.org>
 
+        Unreviewed.
+
+        Add 'PASS' to layout test since test failing on chromium due to empty expectations.
+        Filed webkit bug 51734 to track gtk test failure and skipping test for now.
+
+        * fast/multicol/span/double-merge-anonymous-block-crash-expected.txt:
+        * fast/multicol/span/double-merge-anonymous-block-crash.html:
+        * platform/gtk/Skipped:
+
+2010-12-29  Abhishek Arya  <inferno at chromium.org>
+
         Reviewed by Darin Adler.
 
         Tests that we do not crash when merging anonymous blocks. 
diff --git a/LayoutTests/fast/multicol/span/double-merge-anonymous-block-crash-expected.txt b/LayoutTests/fast/multicol/span/double-merge-anonymous-block-crash-expected.txt
index e69de29..c76e8de 100644
--- a/LayoutTests/fast/multicol/span/double-merge-anonymous-block-crash-expected.txt
+++ b/LayoutTests/fast/multicol/span/double-merge-anonymous-block-crash-expected.txt
@@ -0,0 +1 @@
+PASS, does not crash
diff --git a/LayoutTests/fast/multicol/span/double-merge-anonymous-block-crash.html b/LayoutTests/fast/multicol/span/double-merge-anonymous-block-crash.html
index 2dbdff2..949ddc9 100644
--- a/LayoutTests/fast/multicol/span/double-merge-anonymous-block-crash.html
+++ b/LayoutTests/fast/multicol/span/double-merge-anonymous-block-crash.html
@@ -17,7 +17,7 @@
         color: black;
     }
     </style>
-    <body onload="document.open()">
+    <body onload="document.open(); document.write('PASS, does not crash'); document.close();">
         <div>
             <label>AAA
             <summary>BBB
diff --git a/LayoutTests/platform/gtk/Skipped b/LayoutTests/platform/gtk/Skipped
index 8728211..e53b040 100644
--- a/LayoutTests/platform/gtk/Skipped
+++ b/LayoutTests/platform/gtk/Skipped
@@ -5598,3 +5598,6 @@ http/tests/inspector/console-websocket-error.html
 # layoutTestController.queueLoad() does not work
 http/tests/xmlhttprequest/basic-auth-nouser.html
 http/tests/xmlhttprequest/basic-auth-nopassword.html
+
+# https://bugs.webkit.org/show_bug.cgi?id=51734
+fast/multicol/span/double-merge-anonymous-block-crash.html

-- 
WebKit Debian packaging

