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

[abarth at webkit.org]

The following commit has been merged in the debian/experimental branch:
commit 0f10822ce1e7fd1a2847f4683bf6e0dd3b2dc390
Author: abarth at webkit.org <abarth at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Fri Oct 22 20:06:20 2010 +0000

    2010-10-22  Adam Barth  <abarth at webkit.org>
    
            Reviewed by Eric Seidel.
    
            ASSERT while viewing Google C++ style guide
            https://bugs.webkit.org/show_bug.cgi?id=48148
    
            Make sure we don't hit an ASSERT when an XSLT outputs HTML.
    
            * fast/xsl/resources/to-html.xsl: Added.
            * fast/xsl/transform-to-html-expected.txt: Added.
            * fast/xsl/transform-to-html.xml: Added.
    2010-10-22  Adam Barth  <abarth at webkit.org>
    
            Reviewed by Eric Seidel.
    
            ASSERT while viewing Google C++ style guide
            https://bugs.webkit.org/show_bug.cgi?id=48148
    
            This code used to stop the parser twice.  Instead of reaching in an
            trying to stop the parser manually, we now just let close() do the work
            for us.
    
            Test: fast/xsl/transform-to-html.xml
    
            * xml/XSLTProcessor.cpp:
            (WebCore::XSLTProcessor::createDocumentFromSource):
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@70327 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog
index f1d4ba8..061ef68 100644
--- a/LayoutTests/ChangeLog
+++ b/LayoutTests/ChangeLog
@@ -1,3 +1,16 @@
+2010-10-22  Adam Barth  <abarth at webkit.org>
+
+        Reviewed by Eric Seidel.
+
+        ASSERT while viewing Google C++ style guide
+        https://bugs.webkit.org/show_bug.cgi?id=48148
+
+        Make sure we don't hit an ASSERT when an XSLT outputs HTML.
+
+        * fast/xsl/resources/to-html.xsl: Added.
+        * fast/xsl/transform-to-html-expected.txt: Added.
+        * fast/xsl/transform-to-html.xml: Added.
+
 2010-10-22  Dimitri Glazkov  <dglazkov at chromium.org>
 
         Updated expectations for flaky/passing tests.
diff --git a/LayoutTests/fast/xsl/resources/to-html.xsl b/LayoutTests/fast/xsl/resources/to-html.xsl
new file mode 100644
index 0000000..dccfdb9
--- /dev/null
+++ b/LayoutTests/fast/xsl/resources/to-html.xsl
@@ -0,0 +1,10 @@
+<xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
+  <xsl:output method="html"/>
+  <xsl:template match="test">
+    <script>
+      if (window.layoutTestController)
+          layoutTestController.dumpAsText();
+    </script>
+    PASS
+  </xsl:template>
+</xsl:stylesheet> 
diff --git a/LayoutTests/compositing/overflow/get-transform-from-non-box-container-expected.txt b/LayoutTests/fast/xsl/transform-to-html-expected.txt
similarity index 100%
copy from LayoutTests/compositing/overflow/get-transform-from-non-box-container-expected.txt
copy to LayoutTests/fast/xsl/transform-to-html-expected.txt
diff --git a/LayoutTests/fast/xsl/transform-to-html.xml b/LayoutTests/fast/xsl/transform-to-html.xml
new file mode 100644
index 0000000..f0964f0
--- /dev/null
+++ b/LayoutTests/fast/xsl/transform-to-html.xml
@@ -0,0 +1,3 @@
+<?xml version="1.0"?> 
+<?xml-stylesheet type="text/xsl" href="resources/to-html.xsl"?> 
+<test>FAIL</test>
diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index ba1c948..f210577 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,19 @@
+2010-10-22  Adam Barth  <abarth at webkit.org>
+
+        Reviewed by Eric Seidel.
+
+        ASSERT while viewing Google C++ style guide
+        https://bugs.webkit.org/show_bug.cgi?id=48148
+
+        This code used to stop the parser twice.  Instead of reaching in an
+        trying to stop the parser manually, we now just let close() do the work
+        for us.
+
+        Test: fast/xsl/transform-to-html.xml
+
+        * xml/XSLTProcessor.cpp:
+        (WebCore::XSLTProcessor::createDocumentFromSource):
+
 2010-10-22  Patrick Gansterer  <paroga at webkit.org>
 
         Reviewed by Adam Roben.
diff --git a/WebCore/xml/XSLTProcessor.cpp b/WebCore/xml/XSLTProcessor.cpp
index bdae0cd..5fd009c 100644
--- a/WebCore/xml/XSLTProcessor.cpp
+++ b/WebCore/xml/XSLTProcessor.cpp
@@ -90,7 +90,6 @@ PassRefPtr<Document> XSLTProcessor::createDocumentFromSource(const String& sourc
     result->setDecoder(decoder.release());
 
     result->write(documentSource);
-    result->finishParsing();
     result->close();
 
     return result.release();

-- 
WebKit Debian packaging