[webkit-changes] cvs commit: WebCore/khtml/xml xml_tokenizer.cpp

[Eric]

eseidel     05/12/08 01:17:06

  Modified:    .        ChangeLog
               khtml/xml xml_tokenizer.cpp
  Log:
  Bug #: 5987
  Submitted by: eseidel
  Reviewed by: darin
          No applet test (mjs says DRT has kittens in that case)
          SVG is covered by <use> test cases (5 tests).
  
          Fixes <applet> in xhtml, as well as <use> in SVG.
          http://bugzilla.opendarwin.org/show_bug.cgi?id=5987
  
          * khtml/xml/xml_tokenizer.cpp:
          (khtml::XMLTokenizer::endElementNs): call closeRenderer()
  
  Revision  Changes    Path
  1.492     +13 -0     WebCore/ChangeLog
  
  Index: ChangeLog
  ===================================================================
  RCS file: /cvs/root/WebCore/ChangeLog,v
  retrieving revision 1.491
  retrieving revision 1.492
  diff -u -r1.491 -r1.492
  --- ChangeLog	8 Dec 2005 08:54:38 -0000	1.491
  +++ ChangeLog	8 Dec 2005 09:17:00 -0000	1.492
  @@ -1,3 +1,16 @@
  +2005-12-08  Eric Seidel  <eseidel at apple.com>
  +
  +        Reviewed by darin.
  +
  +        No applet test (mjs says DRT has kittens in that case)
  +        SVG is covered by <use> test cases (5 tests).
  +
  +        Fixes <applet> in xhtml, as well as <use> in SVG.
  +        http://bugzilla.opendarwin.org/show_bug.cgi?id=5987
  +
  +        * khtml/xml/xml_tokenizer.cpp:
  +        (khtml::XMLTokenizer::endElementNs): call closeRenderer()
  +
   2005-12-08  Darin Adler  <darin at apple.com>
   
           Reviewed by Eric.
  
  
  
  1.55      +4 -6      WebCore/khtml/xml/xml_tokenizer.cpp
  
  Index: xml_tokenizer.cpp
  ===================================================================
  RCS file: /cvs/root/WebCore/khtml/xml/xml_tokenizer.cpp,v
  retrieving revision 1.54
  retrieving revision 1.55
  diff -u -r1.54 -r1.55
  --- xml_tokenizer.cpp	28 Nov 2005 18:23:46 -0000	1.54
  +++ xml_tokenizer.cpp	8 Dec 2005 09:17:05 -0000	1.55
  @@ -375,12 +375,10 @@
   
       if (m_currentNode->nodeType() == Node::TEXT_NODE)
           exitText();
  -    if (m_currentNode->parentNode() != 0) {
  -        do {
  -            m_currentNode = m_currentNode->parentNode();
  -        } while (m_currentNode && m_currentNode->implicitNode());
  -    }
  -// ###  else error
  +    while (m_currentNode->implicitNode())
  +        m_currentNode = m_currentNode->parentNode();
  +    m_currentNode->closeRenderer();
  +    m_currentNode = m_currentNode->parentNode();
   }
   
   void XMLTokenizer::characters(const xmlChar *s, int len)