[webkit-changes] cvs commit: SVGSupport/WebCore+SVG xml_kdomtokenizer.cpp

[Eric]

eseidel     05/10/27 01:07:58

  Modified:    .        ChangeLog
               WebCore+SVG xml_kdomtokenizer.cpp
  Log:
  Bug #: none
  Submitted by: eseidel
  Reviewed by: none needed, svg build fix only.
          No review, SVG build fix only.
          Fixing fallout from <rdar://problem/4098450>.
  
          * WebCore+SVG/xml_kdomtokenizer.cpp:
          (KDOMTokenizer::write): now returns bool
          (KDOMTokenizer::finish): error check
  
  Revision  Changes    Path
  1.299     +9 -0      WebCore/ChangeLog
  
  Index: ChangeLog
  ===================================================================
  RCS file: /cvs/root/WebCore/ChangeLog,v
  retrieving revision 1.298
  retrieving revision 1.299
  diff -u -r1.298 -r1.299
  --- ChangeLog	27 Oct 2005 06:03:25 -0000	1.298
  +++ ChangeLog	27 Oct 2005 08:07:55 -0000	1.299
  @@ -1,3 +1,12 @@
  +2005-10-27  Eric Seidel  <eseidel at apple.com>
  +
  +        No review, SVG build fix only.
  +        Fixing fallout from <rdar://problem/4098450>.
  +
  +        * WebCore+SVG/xml_kdomtokenizer.cpp:
  +        (KDOMTokenizer::write): now returns bool
  +        (KDOMTokenizer::finish): error check
  +
   2005-10-26  Eric Seidel  <eseidel at apple.com>
   
           Reviewed by mjs & darin.
  
  
  
  1.4       +8 -2      SVGSupport/WebCore+SVG/xml_kdomtokenizer.cpp
  
  Index: xml_kdomtokenizer.cpp
  ===================================================================
  RCS file: /cvs/root/SVGSupport/WebCore+SVG/xml_kdomtokenizer.cpp,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- xml_kdomtokenizer.cpp	23 Oct 2005 18:00:12 -0000	1.3
  +++ xml_kdomtokenizer.cpp	27 Oct 2005 08:07:58 -0000	1.4
  @@ -58,7 +58,7 @@
       ~KDOMTokenizer();
   
       // from Tokenizer
  -    virtual void write(const TokenizerString &str, bool);
  +    virtual bool write(const TokenizerString &str, bool);
       virtual void finish();
       virtual void setOnHold(bool onHold);
       virtual bool isWaitingForScripts() const;
  @@ -103,9 +103,10 @@
       return m_doc ? static_cast<KDOMDocumentWrapperImpl *>(m_doc->document()) : NULL;
   }
   
  -void KDOMTokenizer::write(const TokenizerString &s, bool /*appendData*/ )
  +bool KDOMTokenizer::write(const TokenizerString &s, bool /*appendData*/ )
   {
       m_xmlCode += s.toString();
  +    return false;
   }
   
   void KDOMTokenizer::setOnHold(bool onHold)
  @@ -126,6 +127,11 @@
       parser->doOneShotParse(m_xmlCode.utf8(), m_xmlCode.length());
       
       SVGDocumentImpl *svgDoc = static_cast<SVGDocumentImpl *>(parser->document());
  +    if (!svgDoc) {
  +        fprintf(stderr, "Failed to parse document.\n");
  +        delete parser;
  +        return;
  +    }
       NodeImpl *wrappedDoc = new KDOMNodeTreeWrapperImpl(m_doc, svgDoc);
       delete parser; // builder is owned (deleted) by parser