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

Wed Dec 22 11:43:21 UTC 2010

The following commit has been merged in the debian/experimental branch:
commit db579ae449ff385a2013b8df6fbd94b9b1f6ee08
Author: abarth at webkit.org <abarth at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Thu Aug 5 00:36:32 2010 +0000

    2010-08-04  Adam Barth  <abarth at webkit.org>
    
            Reviewed by Eric Seidel.
    
            Pick up spec change w.r.t. figcaption and summary
            https://bugs.webkit.org/show_bug.cgi?id=43075
    
            * html5lib/runner-expected-html5.txt:
    2010-08-04  Adam Barth  <abarth at webkit.org>
    
            Reviewed by Eric Seidel.
    
            Pick up spec change w.r.t. figcaption and summary
            https://bugs.webkit.org/show_bug.cgi?id=43075
    
            * html/HTMLTreeBuilder.cpp:
            (WebCore::HTMLTreeBuilder::processEndTagForInBody):
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@64699 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog
index f62c25d..ce0d03d 100644
--- a/LayoutTests/ChangeLog
+++ b/LayoutTests/ChangeLog
@@ -2,6 +2,15 @@
 
         Reviewed by Eric Seidel.
 
+        Pick up spec change w.r.t. figcaption and summary
+        https://bugs.webkit.org/show_bug.cgi?id=43075
+
+        * html5lib/runner-expected-html5.txt:
+
+2010-08-04  Adam Barth  <abarth at webkit.org>
+
+        Reviewed by Eric Seidel.
+
         Pick up spec change w.r.t. replacement character and <frameset>
         https://bugs.webkit.org/show_bug.cgi?id=43073
 
diff --git a/LayoutTests/html5lib/runner-expected-html5.txt b/LayoutTests/html5lib/runner-expected-html5.txt
index 232fcf3..03e7863 100644
--- a/LayoutTests/html5lib/runner-expected-html5.txt
+++ b/LayoutTests/html5lib/runner-expected-html5.txt
@@ -162,8 +162,6 @@ resources/tests18.dat: PASS
 
 resources/tests19.dat:
 63
-101
-102
 
 Test 63 of 102 in resources/tests19.dat failed. Input:
 <!doctype html><keygen><frameset>
@@ -185,44 +183,6 @@ Expected:
 |   <head>
 |   <body>
 |     <keygen>
-
-Test 101 of 102 in resources/tests19.dat failed. Input:
-<!doctype html><figcaption><article></figcaption>a
-Got:
-| <!DOCTYPE html>
-| <html>
-|   <head>
-|   <body>
-|     <figcaption>
-|       <article>
-|         "a"
-Expected:
-| <!DOCTYPE html>
-| <html>
-|   <head>
-|   <body>
-|     <figcaption>
-|       <article>
-|     "a"
-
-Test 102 of 102 in resources/tests19.dat failed. Input:
-<!doctype html><summary><article></summary>a
-Got:
-| <!DOCTYPE html>
-| <html>
-|   <head>
-|   <body>
-|     <summary>
-|       <article>
-|         "a"
-Expected:
-| <!DOCTYPE html>
-| <html>
-|   <head>
-|   <body>
-|     <summary>
-|       <article>
-|     "a"
 resources/tests20.dat:
 16
 
diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 7c64743..4126586 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -2,6 +2,16 @@
 
         Reviewed by Eric Seidel.
 
+        Pick up spec change w.r.t. figcaption and summary
+        https://bugs.webkit.org/show_bug.cgi?id=43075
+
+        * html/HTMLTreeBuilder.cpp:
+        (WebCore::HTMLTreeBuilder::processEndTagForInBody):
+
+2010-08-04  Adam Barth  <abarth at webkit.org>
+
+        Reviewed by Eric Seidel.
+
         Pick up spec change w.r.t. replacement character and <frameset>
         https://bugs.webkit.org/show_bug.cgi?id=43073
 
diff --git a/WebCore/html/HTMLTreeBuilder.cpp b/WebCore/html/HTMLTreeBuilder.cpp
index 75858e7..93de07e 100644
--- a/WebCore/html/HTMLTreeBuilder.cpp
+++ b/WebCore/html/HTMLTreeBuilder.cpp
@@ -1955,6 +1955,7 @@ void HTMLTreeBuilder::processEndTagForInBody(AtomicHTMLToken& token)
         || token.name() == divTag
         || token.name() == dlTag
         || token.name() == fieldsetTag
+        || token.name() == figcaptionTag
         || token.name() == figureTag
         || token.name() == footerTag
         || token.name() == headerTag
@@ -1965,6 +1966,7 @@ void HTMLTreeBuilder::processEndTagForInBody(AtomicHTMLToken& token)
         || token.name() == olTag
         || token.name() == preTag
         || token.name() == sectionTag
+        || token.name() == summaryTag
         || token.name() == ulTag) {
         if (!m_tree.openElements()->inScope(token.name())) {
             parseError(token);

-- 
WebKit Debian packaging

