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

Wed Dec 22 12:32:30 UTC 2010

The following commit has been merged in the debian/experimental branch:
commit 24f75d923efedf3be25708c3db4e6df74d2366c3
Author: eric at webkit.org <eric at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Wed Aug 25 05:35:19 2010 +0000

    2010-08-24  Dumitru Daniliuc  <dumi at chromium.org>
    
            Unreviewed, Chromium's LayoutTestController does not implement markerTextForListItem() yet.
    
            * platform/chromium/test_expectations.txt:
    2010-08-24  Eric Seidel  <eric at webkit.org>
    
            Reviewed by Adam Barth.
    
            Fix one more html5lib test case for button scoping
            https://bugs.webkit.org/show_bug.cgi?id=44583
    
            I <3 test driven development.
    
            * html/HTMLTreeBuilder.cpp:
            (WebCore::HTMLTreeBuilder::processStartTagForInBody):
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@65981 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog
index 5227136..2aa5340 100644
--- a/LayoutTests/ChangeLog
+++ b/LayoutTests/ChangeLog
@@ -8,6 +8,15 @@
 
         Reviewed by Adam Barth.
 
+        Fix one more html5lib test case for button scoping
+        https://bugs.webkit.org/show_bug.cgi?id=44583
+
+        * html5lib/runner-expected.txt:
+
+2010-08-24  Eric Seidel  <eric at webkit.org>
+
+        Reviewed by Adam Barth.
+
         Remove HTML5 parser testing infrastructure now that we don't need it
         https://bugs.webkit.org/show_bug.cgi?id=44581
 
diff --git a/LayoutTests/html5lib/runner-expected.txt b/LayoutTests/html5lib/runner-expected.txt
index 63885dc..5979114 100644
--- a/LayoutTests/html5lib/runner-expected.txt
+++ b/LayoutTests/html5lib/runner-expected.txt
@@ -87,28 +87,8 @@ Expected:
 |   <head>
 |   <body>
 |     <keygen>
-resources/tests20.dat:
-16
+resources/tests20.dat: PASS
 
-Test 16 of 25 in resources/tests20.dat failed. Input:
-<!doctype html><p><button><table>
-Got:
-| <!DOCTYPE html>
-| <html>
-|   <head>
-|   <body>
-|     <p>
-|       <button>
-|         <p>
-|         <table>
-Expected:
-| <!DOCTYPE html>
-| <html>
-|   <head>
-|   <body>
-|     <p>
-|       <button>
-|         <table>
 resources/webkit01.dat: PASS
 
 resources/webkit02.dat: PASS
diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 6a0a08e..7d96db6 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -2,6 +2,18 @@
 
         Reviewed by Adam Barth.
 
+        Fix one more html5lib test case for button scoping
+        https://bugs.webkit.org/show_bug.cgi?id=44583
+
+        I <3 test driven development.
+
+        * html/HTMLTreeBuilder.cpp:
+        (WebCore::HTMLTreeBuilder::processStartTagForInBody):
+
+2010-08-24  Eric Seidel  <eric at webkit.org>
+
+        Reviewed by Adam Barth.
+
         Remove HTML5 parser testing infrastructure now that we don't need it
         https://bugs.webkit.org/show_bug.cgi?id=44581
 
diff --git a/WebCore/html/HTMLTreeBuilder.cpp b/WebCore/html/HTMLTreeBuilder.cpp
index 3904875..24eb62f 100644
--- a/WebCore/html/HTMLTreeBuilder.cpp
+++ b/WebCore/html/HTMLTreeBuilder.cpp
@@ -923,7 +923,7 @@ void HTMLTreeBuilder::processStartTagForInBody(AtomicHTMLToken& token)
         return;
     }
     if (token.name() == tableTag) {
-        if (m_document->parseMode() != Document::Compat && m_tree.openElements()->inScope(pTag))
+        if (m_document->parseMode() != Document::Compat && m_tree.openElements()->inButtonScope(pTag))
             processFakeEndTag(pTag);
         m_tree.insertHTMLElement(token);
         m_framesetOk = false;

-- 
WebKit Debian packaging

