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

Wed Dec 22 12:32:42 UTC 2010

The following commit has been merged in the debian/experimental branch:
commit 671ea2ea9bcbd15671c6af0bcfe3d63735a88a9f
Author: eric at webkit.org <eric at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Wed Aug 25 06:02:18 2010 +0000

    2010-08-24  Eric Seidel  <eric at webkit.org>
    
            Reviewed by Adam Barth.
    
            HTML5 spec changed to coalesce text nodes even when they were not created by the parser
            https://bugs.webkit.org/show_bug.cgi?id=44586
    
            See http://www.w3.org/Bugs/Public/show_bug.cgi?id=10221 for more info.
    
            * html5lib/resources/adoption01.dat:
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@65985 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog
index 2aa5340..37de9f9 100644
--- a/LayoutTests/ChangeLog
+++ b/LayoutTests/ChangeLog
@@ -1,3 +1,14 @@
+2010-08-24  Eric Seidel  <eric at webkit.org>
+
+        Reviewed by Adam Barth.
+
+        HTML5 spec changed to coalesce text nodes even when they were not created by the parser
+        https://bugs.webkit.org/show_bug.cgi?id=44586
+
+        See http://www.w3.org/Bugs/Public/show_bug.cgi?id=10221 for more info.
+
+        * html5lib/resources/adoption01.dat:
+
 2010-08-24  Dumitru Daniliuc  <dumi at chromium.org>
 
         Unreviewed, Chromium's LayoutTestController does not implement markerTextForListItem() yet.
diff --git a/LayoutTests/html5lib/resources/adoption01.dat b/LayoutTests/html5lib/resources/adoption01.dat
index 2ff6df3..787e1b0 100644
--- a/LayoutTests/html5lib/resources/adoption01.dat
+++ b/LayoutTests/html5lib/resources/adoption01.dat
@@ -174,8 +174,7 @@
 | <html>
 |   <head>
 |   <body>
-|     "A"
-|     "C"
+|     "AC"
 |     <table>
 |       <tbody>
 |         <tr>
diff --git a/LayoutTests/html5lib/runner-expected.txt b/LayoutTests/html5lib/runner-expected.txt
index 5979114..96c6c1b 100644
--- a/LayoutTests/html5lib/runner-expected.txt
+++ b/LayoutTests/html5lib/runner-expected.txt
@@ -105,32 +105,8 @@ resources/entities02.dat: PASS
 
 resources/comments01.dat: PASS
 
-resources/adoption01.dat:
-12
+resources/adoption01.dat: PASS
 
-Test 12 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/adoption02.dat:
 2
 

-- 
WebKit Debian packaging

