[SCM] WebKit Debian packaging branch, debian/experimental, updated. upstream/1.3.3-9427-gc2be6fc

Wed Dec 22 11:13:01 UTC 2010

The following commit has been merged in the debian/experimental branch:
commit 94d18b5097a3e6a4f14f7c3277840d7baa9ea76a
Author: eric at webkit.org <eric at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Thu Jul 15 04:19:45 2010 +0000

    2010-07-14  Eric Seidel  <eric at webkit.org>
    
            Reviewed by Adam Barth.
    
            Add a test to document WebKit (and Minefield's) HTML5 spec violation related to text node coalescing
            https://bugs.webkit.org/show_bug.cgi?id=42294
    
            * html5lib/resources/adoption01.dat:
            * html5lib/runner-expected-html5.txt:
            * html5lib/runner-expected.txt:
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@63402 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog
index 49b7cc2..7180e2a 100644
--- a/LayoutTests/ChangeLog
+++ b/LayoutTests/ChangeLog
@@ -2,6 +2,17 @@
 
         Reviewed by Adam Barth.
 
+        Add a test to document WebKit (and Minefield's) HTML5 spec violation related to text node coalescing
+        https://bugs.webkit.org/show_bug.cgi?id=42294
+
+        * html5lib/resources/adoption01.dat:
+        * html5lib/runner-expected-html5.txt:
+        * html5lib/runner-expected.txt:
+
+2010-07-14  Eric Seidel  <eric at webkit.org>
+
+        Reviewed by Adam Barth.
+
         HTMLTreeBuilder foster parents when it should not
         https://bugs.webkit.org/show_bug.cgi?id=42235
 
diff --git a/LayoutTests/html5lib/resources/adoption01.dat b/LayoutTests/html5lib/resources/adoption01.dat
index 3420ab8..ca6d1d4 100644
--- a/LayoutTests/html5lib/resources/adoption01.dat
+++ b/LayoutTests/html5lib/resources/adoption01.dat
@@ -181,3 +181,18 @@
 |         <tr>
 |           <td>
 |             "2"
+
+#data
+<table>A<td>B</td>C</table>
+#errors
+#document
+| <html>
+|   <head>
+|   <body>
+|     "A"
+|     "C"
+|     <table>
+|       <tbody>
+|         <tr>
+|           <td>
+|             "B"
diff --git a/LayoutTests/html5lib/runner-expected-html5.txt b/LayoutTests/html5lib/runner-expected-html5.txt
index 92c4206..a4b99d8 100644
--- a/LayoutTests/html5lib/runner-expected-html5.txt
+++ b/LayoutTests/html5lib/runner-expected-html5.txt
@@ -208,8 +208,9 @@ resources/comments01.dat: PASS
 resources/adoption01.dat:
 3
 11
+13
 
-Test 3 of 12 in resources/adoption01.dat failed. Input:
+Test 3 of 13 in resources/adoption01.dat failed. Input:
 <a>1<button>2</a>3</button>
 Got:
 | <html>
@@ -229,7 +230,7 @@ Expected:
 |         "2"
 |     "3"
 
-Test 11 of 12 in resources/adoption01.dat failed. Input:
+Test 11 of 13 in resources/adoption01.dat failed. Input:
 <p><b id="A"><script>document.getElementById("A").id = "B"</script></p>TEXT</b>
 Got:
 | <html>
@@ -255,6 +256,30 @@ Expected:
 |     <b>
 |       id="A"
 |       "TEXT"
+
+Test 13 of 13 in resources/adoption01.dat failed. Input:
+<table>A<td>B</td>C</table>
+Got:
+| <html>
+|   <head>
+|   <body>
+|     "AC"
+|     <table>
+|       <tbody>
+|         <tr>
+|           <td>
+|             "B"
+Expected:
+| <html>
+|   <head>
+|   <body>
+|     "A"
+|     "C"
+|     <table>
+|       <tbody>
+|         <tr>
+|           <td>
+|             "B"
 resources/inbody01.dat: PASS
 
 resources/isindex.dat: PASS
diff --git a/LayoutTests/html5lib/runner-expected.txt b/LayoutTests/html5lib/runner-expected.txt
index 625c97a..aea25ca 100644
--- a/LayoutTests/html5lib/runner-expected.txt
+++ b/LayoutTests/html5lib/runner-expected.txt
@@ -5006,7 +5006,7 @@ resources/adoption01.dat:
 11
 12
 
-Test 1 of 12 in resources/adoption01.dat failed. Input:
+Test 1 of 13 in resources/adoption01.dat failed. Input:
 <a><p></a></p>
 Got:
 | <html>
@@ -5022,7 +5022,7 @@ Expected:
 |     <p>
 |       <a>
 
-Test 6 of 12 in resources/adoption01.dat failed. Input:
+Test 6 of 13 in resources/adoption01.dat failed. Input:
 <table><a>1<p>2</a>3</p>
 Got:
 | <html>
@@ -5047,7 +5047,7 @@ Expected:
 |       "3"
 |     <table>
 
-Test 7 of 12 in resources/adoption01.dat failed. Input:
+Test 7 of 13 in resources/adoption01.dat failed. Input:
 <b><b><a><p></a>
 Got:
 | <html>
@@ -5067,7 +5067,7 @@ Expected:
 |         <p>
 |           <a>
 
-Test 8 of 12 in resources/adoption01.dat failed. Input:
+Test 8 of 13 in resources/adoption01.dat failed. Input:
 <b><a><b><p></a>
 Got:
 | <html>
@@ -5089,7 +5089,7 @@ Expected:
 |         <p>
 |           <a>
 
-Test 9 of 12 in resources/adoption01.dat failed. Input:
+Test 9 of 13 in resources/adoption01.dat failed. Input:
 <a><b><b><p></a>
 Got:
 | <html>
@@ -5113,7 +5113,7 @@ Expected:
 |         <p>
 |           <a>
 
-Test 11 of 12 in resources/adoption01.dat failed. Input:
+Test 11 of 13 in resources/adoption01.dat failed. Input:
 <p><b id="A"><script>document.getElementById("A").id = "B"</script></p>TEXT</b>
 Got:
 | <html>
@@ -5140,7 +5140,7 @@ Expected:
 |       id="A"
 |       "TEXT"
 
-Test 12 of 12 in resources/adoption01.dat failed. Input:
+Test 12 of 13 in resources/adoption01.dat failed. Input:
 <table><a>1<td>2</td>3</table>
 Got:
 | <html>

-- 
WebKit Debian packaging

