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

Wed Dec 22 12:49:12 UTC 2010

The following commit has been merged in the debian/experimental branch:
commit d4d584935f9b50908ae51758d33f316390892197
Author: abarth at webkit.org <abarth at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Tue Aug 31 01:32:47 2010 +0000

    2010-08-30  Adam Barth  <abarth at webkit.org>
    
            Reviewed by Eric Seidel.
    
            Enable HTML5lib's test_innerHTML01.dat
            https://bugs.webkit.org/show_bug.cgi?id=44919
    
            These tests provoked two branches that we hadn't implemented yet.
    
            * html/parser/HTMLTreeBuilder.cpp:
            (WebCore::HTMLTreeBuilder::processStartTag):
            (WebCore::HTMLTreeBuilder::processEndTag):
    2010-08-30  Adam Barth  <abarth at webkit.org>
    
            Reviewed by Eric Seidel.
    
            Enable HTML5lib's test_innerHTML01.dat
            https://bugs.webkit.org/show_bug.cgi?id=44919
    
            Enable these tests now that they don't ASSERT.  Yay!  They pass.  :)
    
            * html5lib/runner-expected.txt:
            * html5lib/runner.html:
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@66443 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog
index 5347478..a1339a5 100644
--- a/LayoutTests/ChangeLog
+++ b/LayoutTests/ChangeLog
@@ -2,6 +2,18 @@
 
         Reviewed by Eric Seidel.
 
+        Enable HTML5lib's test_innerHTML01.dat
+        https://bugs.webkit.org/show_bug.cgi?id=44919
+
+        Enable these tests now that they don't ASSERT.  Yay!  They pass.  :)
+
+        * html5lib/runner-expected.txt:
+        * html5lib/runner.html:
+
+2010-08-30  Adam Barth  <abarth at webkit.org>
+
+        Reviewed by Eric Seidel.
+
         Import new tests from HTML5lib
         https://bugs.webkit.org/show_bug.cgi?id=44912
 
diff --git a/LayoutTests/html5lib/runner-expected.txt b/LayoutTests/html5lib/runner-expected.txt
index 02f88c8..3d15627 100644
--- a/LayoutTests/html5lib/runner-expected.txt
+++ b/LayoutTests/html5lib/runner-expected.txt
@@ -507,6 +507,8 @@ Expected:
 |   <body>
 |     <svg svg>
 |       "<!--svg-->"
+resources/tests_innerHTML_1.dat: PASS
+
 resources/webkit01.dat: PASS
 
 resources/webkit02.dat: PASS
diff --git a/LayoutTests/html5lib/runner.html b/LayoutTests/html5lib/runner.html
index b4f6b78..a616ec4 100644
--- a/LayoutTests/html5lib/runner.html
+++ b/LayoutTests/html5lib/runner.html
@@ -56,8 +56,7 @@ var test_files = [
         'resources/tests19.dat',
         'resources/tests20.dat',
         'resources/tests21.dat',
-        // TODO: Enable this test once it doesn't ASSERT.
-        // 'resources/tests_innerHTML_1.dat',
+        'resources/tests_innerHTML_1.dat',
         'resources/webkit01.dat',
         'resources/webkit02.dat',
         'resources/doctype01.dat',
diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 1b5908e..b16b560 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,16 @@
+2010-08-30  Adam Barth  <abarth at webkit.org>
+
+        Reviewed by Eric Seidel.
+
+        Enable HTML5lib's test_innerHTML01.dat
+        https://bugs.webkit.org/show_bug.cgi?id=44919
+
+        These tests provoked two branches that we hadn't implemented yet.
+
+        * html/parser/HTMLTreeBuilder.cpp:
+        (WebCore::HTMLTreeBuilder::processStartTag):
+        (WebCore::HTMLTreeBuilder::processEndTag):
+
 2010-08-30  Mark Rowe  <mrowe at apple.com>
 
         Reviewed by Darin Adler.
diff --git a/WebCore/html/parser/HTMLTreeBuilder.cpp b/WebCore/html/parser/HTMLTreeBuilder.cpp
index 0918196..44d492e 100644
--- a/WebCore/html/parser/HTMLTreeBuilder.cpp
+++ b/WebCore/html/parser/HTMLTreeBuilder.cpp
@@ -1488,7 +1488,10 @@ void HTMLTreeBuilder::processStartTag(AtomicHTMLToken& token)
             || token.name() == keygenTag
             || token.name() == textareaTag) {
             parseError(token);
-            notImplemented(); // fragment case
+            if (!m_tree.openElements()->inTableScope(selectTag)) {
+                ASSERT(isParsingFragment());
+                return;
+            }
             AtomicHTMLToken endSelect(HTMLToken::EndTag, selectTag.localName());
             processEndTag(endSelect);
             processStartTag(token);
@@ -2358,7 +2361,11 @@ void HTMLTreeBuilder::processEndTag(AtomicHTMLToken& token)
             return;
         }
         if (token.name() == selectTag) {
-            notImplemented(); // fragment case
+            if (!m_tree.openElements()->inTableScope(token.name())) {
+                ASSERT(isParsingFragment());
+                parseError(token);
+                return;
+            }
             m_tree.openElements()->popUntilPopped(selectTag.localName());
             resetInsertionModeAppropriately();
             return;

-- 
WebKit Debian packaging

