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

Wed Dec 22 13:21:49 UTC 2010

The following commit has been merged in the debian/experimental branch:
commit 2b87cd4878e46674c2f5d8125279b034204ea70b
Author: abarth at webkit.org <abarth at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Mon Sep 13 00:42:45 2010 +0000

    2010-09-12  Adam Barth  <abarth at webkit.org>
    
            Reviewed by Eric Seidel.
    
            isParsingFragment assert hit in new treebuilder
            https://bugs.webkit.org/show_bug.cgi?id=45621
    
            Add new tests and (minor) test progression.
    
            * html5lib/resources/webkit01.dat:
            * html5lib/runner-expected.txt:
    2010-09-12  Adam Barth  <abarth at webkit.org>
    
            Reviewed by Eric Seidel.
    
            isParsingFragment assert hit in new treebuilder
            https://bugs.webkit.org/show_bug.cgi?id=45621
    
            Update our list of special tags to match the spec.
    
            * html/parser/HTMLTreeBuilder.cpp:
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@67356 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog
index 2fb8883..a529cce 100644
--- a/LayoutTests/ChangeLog
+++ b/LayoutTests/ChangeLog
@@ -1,3 +1,15 @@
+2010-09-12  Adam Barth  <abarth at webkit.org>
+
+        Reviewed by Eric Seidel.
+
+        isParsingFragment assert hit in new treebuilder
+        https://bugs.webkit.org/show_bug.cgi?id=45621
+
+        Add new tests and (minor) test progression.
+
+        * html5lib/resources/webkit01.dat:
+        * html5lib/runner-expected.txt:
+
 2010-09-12  Robert Hogan  <robert at webkit.org>
 
         Reviewed by Andreas Kling.
diff --git a/LayoutTests/html5lib/resources/webkit01.dat b/LayoutTests/html5lib/resources/webkit01.dat
index c50ce10..7022813 100644
--- a/LayoutTests/html5lib/resources/webkit01.dat
+++ b/LayoutTests/html5lib/resources/webkit01.dat
@@ -401,3 +401,34 @@ console.log("FOO<span>BAR</span>BAZ");
 |   " "
 |   <body>
 |     "ddd"
+
+#data
+<kbd><table></kbd><col><select><tr>
+#errors
+#document
+| <html>
+|   <head>
+|   <body>
+|     <kbd>
+|       <select>
+|       <table>
+|         <colgroup>
+|           <col>
+|         <tbody>
+|           <tr>
+
+#data
+<kbd><table></kbd><col><select><tr></table><div>
+#errors
+#document
+| <html>
+|   <head>
+|   <body>
+|     <kbd>
+|       <select>
+|       <table>
+|         <colgroup>
+|           <col>
+|         <tbody>
+|           <tr>
+|       <div>
diff --git a/LayoutTests/html5lib/runner-expected.txt b/LayoutTests/html5lib/runner-expected.txt
index 974f6ca..6f4d487 100644
--- a/LayoutTests/html5lib/runner-expected.txt
+++ b/LayoutTests/html5lib/runner-expected.txt
@@ -114,10 +114,10 @@ Got:
 |             <math math>
 |               <math mi>
 |                 <svg svg>
-|         <math mo>
-|     <span>
-|     <path>
-|     <mi>
+|               <math mo>
+|             <span>
+|             <path>
+|       <math mi>
 Expected:
 | <html>
 |   <head>
diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 05912d0..fb66f95 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,14 @@
+2010-09-12  Adam Barth  <abarth at webkit.org>
+
+        Reviewed by Eric Seidel.
+
+        isParsingFragment assert hit in new treebuilder
+        https://bugs.webkit.org/show_bug.cgi?id=45621
+
+        Update our list of special tags to match the spec.
+
+        * html/parser/HTMLTreeBuilder.cpp:
+
 2010-09-12  Robert Hogan  <robert at webkit.org>
 
         Reviewed by Andreas Kling.
diff --git a/WebCore/html/parser/HTMLTreeBuilder.cpp b/WebCore/html/parser/HTMLTreeBuilder.cpp
index c87d494..9241837 100644
--- a/WebCore/html/parser/HTMLTreeBuilder.cpp
+++ b/WebCore/html/parser/HTMLTreeBuilder.cpp
@@ -132,11 +132,14 @@ bool isTableBodyContextTag(const AtomicString& tagName)
 // http://www.whatwg.org/specs/web-apps/current-work/multipage/parsing.html#special
 bool isSpecialNode(Node* node)
 {
+    if (node->hasTagName(SVGNames::foreignObjectTag))
+        return true;
     if (node->namespaceURI() != xhtmlNamespaceURI)
         return false;
-    // FIXME: This list is out of sync with the spec.
     const AtomicString& tagName = node->localName();
     return tagName == addressTag
+        || tagName == appletTag
+        || tagName == areaTag
         || tagName == articleTag
         || tagName == asideTag
         || tagName == baseTag
@@ -146,6 +149,7 @@ bool isSpecialNode(Node* node)
         || tagName == bodyTag
         || tagName == brTag
         || tagName == buttonTag
+        || tagName == captionTag
         || tagName == centerTag
         || tagName == colTag
         || tagName == colgroupTag
@@ -158,6 +162,7 @@ bool isSpecialNode(Node* node)
         || tagName == dtTag
         || tagName == embedTag
         || tagName == fieldsetTag
+        || tagName == figcaptionTag
         || tagName == figureTag
         || tagName == footerTag
         || tagName == formTag
@@ -176,12 +181,14 @@ bool isSpecialNode(Node* node)
         || tagName == liTag
         || tagName == linkTag
         || tagName == listingTag
+        || tagName == marqueeTag
         || tagName == menuTag
         || tagName == metaTag
         || tagName == navTag
         || tagName == noembedTag
         || tagName == noframesTag
         || tagName == noscriptTag
+        || tagName == objectTag
         || tagName == olTag
         || tagName == pTag
         || tagName == paramTag
@@ -191,8 +198,12 @@ bool isSpecialNode(Node* node)
         || tagName == sectionTag
         || tagName == selectTag
         || tagName == styleTag
+        || tagName == summaryTag
+        || tagName == tableTag
         || isTableBodyContextTag(tagName)
+        || tagName == tdTag
         || tagName == textareaTag
+        || tagName == thTag
         || tagName == titleTag
         || tagName == trTag
         || tagName == ulTag

-- 
WebKit Debian packaging

