[webkit-changes] cvs commit: LayoutTests/fast/parser entity-ignorable-whitespace-expected.txt entity-ignorable-whitespace.xhtml

[Alexey]

ap          06/01/06 06:35:25

  Modified:    .        ChangeLog
               khtml/xml xml_tokenizer.cpp
               .        ChangeLog
  Added:       fast/parser entity-ignorable-whitespace-expected.txt
                        entity-ignorable-whitespace.xhtml
  Log:
          Reviewed by Eric.
  
          - fix http://bugzilla.opendarwin.org/show_bug.cgi?id=5792
            Crasher on rendering-shapes from SVG 1.0 testsuite
  
          Test case: fast/parser/entity-ignorable-whitespace.xhtml
  
          * khtml/xml/xml_tokenizer.cpp:
          (khtml::XMLTokenizer::finish): install an ignorableWhitespace callback to
          work around a libxml2 bug
          (khtml::ignorableWhitespaceHandler): no-op
  
  Revision  Changes    Path
  1.93      +14 -0     WebCore/ChangeLog
  
  Index: ChangeLog
  ===================================================================
  RCS file: /cvs/root/WebCore/ChangeLog,v
  retrieving revision 1.92
  retrieving revision 1.93
  diff -u -r1.92 -r1.93
  --- ChangeLog	6 Jan 2006 10:39:55 -0000	1.92
  +++ ChangeLog	6 Jan 2006 14:35:24 -0000	1.93
  @@ -1,3 +1,17 @@
  +2006-01-06  Alexey Proskuryakov  <ap at nypop.com>
  +
  +        Reviewed by Eric.
  +
  +        - fix http://bugzilla.opendarwin.org/show_bug.cgi?id=5792
  +          Crasher on rendering-shapes from SVG 1.0 testsuite
  +
  +        Test case: fast/parser/entity-ignorable-whitespace.xhtml
  +
  +        * khtml/xml/xml_tokenizer.cpp:
  +        (khtml::XMLTokenizer::finish): install an ignorableWhitespace callback to
  +        work around a libxml2 bug
  +        (khtml::ignorableWhitespaceHandler): no-op
  +
   2006-01-06  Anders Carlsson  <andersca at mac.com>
   
           Reviewed by Eric.
  
  
  
  1.64      +9 -0      WebCore/khtml/xml/xml_tokenizer.cpp
  
  Index: xml_tokenizer.cpp
  ===================================================================
  RCS file: /cvs/root/WebCore/khtml/xml/xml_tokenizer.cpp,v
  retrieving revision 1.63
  retrieving revision 1.64
  diff -u -r1.63 -r1.64
  --- xml_tokenizer.cpp	6 Jan 2006 10:39:55 -0000	1.63
  +++ xml_tokenizer.cpp	6 Jan 2006 14:35:24 -0000	1.64
  @@ -3,6 +3,7 @@
    *
    * Copyright (C) 2000 Peter Kelly (pmk at post.com)
    * Copyright (C) 2005 Apple Computer, Inc.
  + * Copyright (C) 2006 Alexey Proskuryakov
    *
    * This library is free software; you can redistribute it and/or
    * modify it under the terms of the GNU Library General Public
  @@ -678,6 +679,13 @@
           getTokenizer(closure)->setIsXHTMLDocument(true); // controls if we replace entities or not.
   }
   
  +static void ignorableWhitespaceHandler(void *ctx, const xmlChar *ch, int len)
  +{
  +    // nothing to do, but we need this to work around a crasher
  +    // http://bugzilla.gnome.org/show_bug.cgi?id=172255
  +    // http://bugzilla.opendarwin.org/show_bug.cgi?id=5792
  +}
  +
   void XMLTokenizer::finish()
   {
       if (m_xmlCode.isEmpty())
  @@ -698,6 +706,7 @@
       sax.startDocument = xmlSAX2StartDocument;
       sax.internalSubset = internalSubsetHandler;
       sax.externalSubset = externalSubsetHandler;
  +    sax.ignorableWhitespace = ignorableWhitespaceHandler;
       sax.entityDecl = xmlSAX2EntityDecl;
       sax.initialized = XML_SAX2_MAGIC;
       
  
  
  
  1.230     +10 -0     LayoutTests/ChangeLog
  
  Index: ChangeLog
  ===================================================================
  RCS file: /cvs/root/LayoutTests/ChangeLog,v
  retrieving revision 1.229
  retrieving revision 1.230
  diff -u -r1.229 -r1.230
  --- ChangeLog	6 Jan 2006 10:47:08 -0000	1.229
  +++ ChangeLog	6 Jan 2006 14:35:24 -0000	1.230
  @@ -1,3 +1,13 @@
  +2006-01-06  Alexey Proskuryakov  <ap at nypop.com>
  +
  +        Reviewed by Eric.
  +
  +        - test for http://bugzilla.opendarwin.org/show_bug.cgi?id=5792
  +          Crasher on rendering-shapes from SVG 1.0 testsuite
  +
  +        * fast/parser/entity-ignorable-whitespace-expected.txt: Added.
  +        * fast/parser/entity-ignorable-whitespace.xhtml: Added.
  +
   2006-01-06  Anders Carlsson  <andersca at mac.com>
   
           Reviewed by Eric.
  
  
  
  1.1                  LayoutTests/fast/parser/entity-ignorable-whitespace-expected.txt
  
  Index: entity-ignorable-whitespace-expected.txt
  ===================================================================
  Success
  
  
  
  1.1                  LayoutTests/fast/parser/entity-ignorable-whitespace.xhtml
  
  Index: entity-ignorable-whitespace.xhtml
  ===================================================================
  <?xml version="1.0"?>
  <!DOCTYPE html
     PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
     "xhtml1-strict.dtd" [
     <!ENTITY shape " <p>Success</p>">
  ]>
  <html xmlns='http://www.w3.org/1999/xhtml'>
  <head><title>test for bug 5792</title></head><body>
  &shape;
  <script>
  	if (window.layoutTestController)
  			layoutTestController.dumpAsText();
  </script>
  </body></html>