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

abarth at webkit.org abarth at webkit.org
Wed Dec 22 11:22:48 UTC 2010


The following commit has been merged in the debian/experimental branch:
commit 74dddc68b0b53b8aebd277a1930d0b088cd4aa84
Author: abarth at webkit.org <abarth at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Wed Jul 21 02:41:45 2010 +0000

    2010-07-20  Adam Barth  <abarth at webkit.org>
    
            Reviewed by Eric Seidel.
    
            Update expected results for a "tricky" test
            https://bugs.webkit.org/show_bug.cgi?id=42604
    
            Originally, I created these expectations using Minefield.  However, it
            appears that Minefield parses this case incorrectly according to the
            spec.  I've filed <https://bugzilla.mozilla.org/show_bug.cgi?id=580091>.
    
            This patch updates our expected results to what I believe is correct.
    
            * html5lib/resources/tricky01.dat:
            * html5lib/runner-expected-html5.txt:
            * html5lib/runner-expected.txt:
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@63799 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog
index bd5635c..99425aa 100644
--- a/LayoutTests/ChangeLog
+++ b/LayoutTests/ChangeLog
@@ -2,6 +2,23 @@
 
         Reviewed by Eric Seidel.
 
+        Update expected results for a "tricky" test
+        https://bugs.webkit.org/show_bug.cgi?id=42604
+
+        Originally, I created these expectations using Minefield.  However, it
+        appears that Minefield parses this case incorrectly according to the
+        spec.  I've filed <https://bugzilla.mozilla.org/show_bug.cgi?id=580091>.
+
+        This patch updates our expected results to what I believe is correct.
+
+        * html5lib/resources/tricky01.dat:
+        * html5lib/runner-expected-html5.txt:
+        * html5lib/runner-expected.txt:
+
+2010-07-20  Adam Barth  <abarth at webkit.org>
+
+        Reviewed by Eric Seidel.
+
         Include attributes when reconstructing elements in HTML5 tree builder
         https://bugs.webkit.org/show_bug.cgi?id=42594
 
diff --git a/LayoutTests/html5lib/resources/tricky01.dat b/LayoutTests/html5lib/resources/tricky01.dat
index c76470e..26453bf 100644
--- a/LayoutTests/html5lib/resources/tricky01.dat
+++ b/LayoutTests/html5lib/resources/tricky01.dat
@@ -169,29 +169,26 @@ Also not bold."
 |         "You should see a 100x100 green Image below.
   "
 |     <font>
-|       "
-"
 |       <img>
 |         alt="Image"
 |         height="100"
-|         style="background-color: green;"
+|         style="background-color:green"
 |         width="100"
 |       "
 "
-|     <font>
-|       "
-"
-|     <font>
-|       "
-"
 |     <table>
 |       "
-  "
+  
+"
 |       <tbody>
 |         <tr>
 |           <td>
 |             "
 "
+|           "
+"
+|         "
+"
 
 #data
 <table><tr><p><a><p>You should see this text.
diff --git a/LayoutTests/html5lib/runner-expected-html5.txt b/LayoutTests/html5lib/runner-expected-html5.txt
index e41e24c..88df220 100644
--- a/LayoutTests/html5lib/runner-expected-html5.txt
+++ b/LayoutTests/html5lib/runner-expected-html5.txt
@@ -410,82 +410,5 @@ resources/isindex.dat: PASS
 
 resources/tables01.dat: PASS
 
-resources/tricky01.dat:
-6
-
-Test 6 of 9 in resources/tricky01.dat failed. Input:
-<TABLE>
-  <CENTER>
-  <FONT>You should see a 100x100 green Image below.
-  </CENTER>
-<IMG alt="Image" width=100 height=100 style="background-color:green">
-<tr><td>
-</td>
-</tr>
-</table>
-Got:
-| <html>
-|   <head>
-|   <body>
-|     <center>
-|       "
-  "
-|       <font>
-|         "You should see a 100x100 green Image below.
-  "
-|     <font>
-|       <img>
-|         alt="Image"
-|         height="100"
-|         style="background-color:green"
-|         width="100"
-|       "
-"
-|     <table>
-|       "
-  
-"
-|       <tbody>
-|         <tr>
-|           <td>
-|             "
-"
-|           "
-"
-|         "
-"
-Expected:
-| <html>
-|   <head>
-|   <body>
-|     <center>
-|       "
-  "
-|       <font>
-|         "You should see a 100x100 green Image below.
-  "
-|     <font>
-|       "
-"
-|       <img>
-|         alt="Image"
-|         height="100"
-|         style="background-color: green;"
-|         width="100"
-|       "
-"
-|     <font>
-|       "
-"
-|     <font>
-|       "
-"
-|     <table>
-|       "
-  "
-|       <tbody>
-|         <tr>
-|           <td>
-|             "
-"
+resources/tricky01.dat: PASS
 #EOF
diff --git a/LayoutTests/html5lib/runner-expected.txt b/LayoutTests/html5lib/runner-expected.txt
index 1c430fd..136cfc0 100644
--- a/LayoutTests/html5lib/runner-expected.txt
+++ b/LayoutTests/html5lib/runner-expected.txt
@@ -5315,29 +5315,26 @@ Expected:
 |         "You should see a 100x100 green Image below.
   "
 |     <font>
-|       "
-"
 |       <img>
 |         alt="Image"
 |         height="100"
-|         style="background-color: green;"
+|         style="background-color:green"
 |         width="100"
 |       "
 "
-|     <font>
-|       "
-"
-|     <font>
-|       "
-"
 |     <table>
 |       "
-  "
+  
+"
 |       <tbody>
 |         <tr>
 |           <td>
 |             "
 "
+|           "
+"
+|         "
+"
 
 Test 7 of 9 in resources/tricky01.dat failed. Input:
 <table><tr><p><a><p>You should see this text.

-- 
WebKit Debian packaging



More information about the Pkg-webkit-commits mailing list