[webkit-changes] cvs commit: WebCore/khtml/html htmltokenizer.cpp

Geoffrey ggaren at opensource.apple.com
Tue Sep 20 00:46:55 PDT 2005


ggaren      05/09/20 00:46:54

  Modified:    .        ChangeLog
               khtml/html htmltokenizer.cpp
  Log:
          - Rolled in fix for http://bugzilla.opendarwin.org/show_bug.cgi?id=4849
            htmltokenizer.cpp won't compile with TOKEN_DEBUG defined
  
          No test case because this is a build fix.
  
          Reviewed by darin.
  
          * khtml/html/htmltokenizer.cpp:
          (khtml::HTMLTokenizer::parseComment):
          (khtml::HTMLTokenizer::parseTag):
          (khtml::HTMLTokenizer::write):
          (khtml::HTMLTokenizer::processToken):
  
  Revision  Changes    Path
  1.134     +15 -0     WebCore/ChangeLog
  
  Index: ChangeLog
  ===================================================================
  RCS file: /cvs/root/WebCore/ChangeLog,v
  retrieving revision 1.133
  retrieving revision 1.134
  diff -u -r1.133 -r1.134
  --- ChangeLog	19 Sep 2005 20:54:08 -0000	1.133
  +++ ChangeLog	20 Sep 2005 07:46:52 -0000	1.134
  @@ -1,3 +1,18 @@
  +2005-09-20  Geoffrey Garen  <ggaren at apple.com>
  +
  +        - Rolled in fix for http://bugzilla.opendarwin.org/show_bug.cgi?id=4849
  +          htmltokenizer.cpp won't compile with TOKEN_DEBUG defined
  +
  +        No test case because this is a build fix.
  +
  +        Reviewed by darin.
  +
  +        * khtml/html/htmltokenizer.cpp:
  +        (khtml::HTMLTokenizer::parseComment):
  +        (khtml::HTMLTokenizer::parseTag):
  +        (khtml::HTMLTokenizer::write):
  +        (khtml::HTMLTokenizer::processToken):
  +
   2005-09-19  Beth Dakin  <bdakin at apple.com>
   
           Reviewed by Hyatt
  
  
  
  1.113     +10 -10    WebCore/khtml/html/htmltokenizer.cpp
  
  Index: htmltokenizer.cpp
  ===================================================================
  RCS file: /cvs/root/WebCore/khtml/html/htmltokenizer.cpp,v
  retrieving revision 1.112
  retrieving revision 1.113
  diff -u -r1.112 -r1.113
  --- htmltokenizer.cpp	16 Sep 2005 22:42:12 -0000	1.112
  +++ htmltokenizer.cpp	20 Sep 2005 07:46:54 -0000	1.113
  @@ -583,7 +583,7 @@
           scriptCode[ scriptCodeSize++ ] = *src;
   #if defined(TOKEN_DEBUG) && TOKEN_DEBUG > 1
           qDebug("comment is now: *%s*",
  -               QConstString((QChar*)src.current(), kMin(16, src.length())).string().latin1());
  +               QConstString((QChar*)src.operator->(), kMin(16U, src.length())).qstring().latin1());
   #endif
   
           if (strict) {
  @@ -880,10 +880,10 @@
           checkBuffer();
   #if defined(TOKEN_DEBUG) && TOKEN_DEBUG > 1
           uint l = 0;
  -        while(l < src.length() && (*(src.current()+l)).latin1() != '>')
  +        while(l < src.length() && (*(src.operator->()+l)).latin1() != '>')
               l++;
           qDebug("src is now: *%s*, tquote: %d",
  -               QConstString((QChar*)src.current(), l).qstring().latin1(), tquote);
  +               QConstString((QChar*)src.operator->(), l).qstring().latin1(), tquote);
   #endif
           switch(tag) {
           case NoTag:
  @@ -1225,7 +1225,7 @@
   
               AtomicString tagName = currToken.tagName;
   #if defined(TOKEN_DEBUG) && TOKEN_DEBUG > 0
  -            kdDebug( 6036 ) << "appending Tag: " << tagID << endl;
  +            kdDebug( 6036 ) << "appending Tag: " << tagName.qstring() << endl;
   #endif
   
               // Handle <script src="foo"/> like Mozilla/Opera. We have to do this now for Dashboard
  @@ -1399,7 +1399,7 @@
   void HTMLTokenizer::write(const TokenizerString &str, bool appendData)
   {
   #ifdef TOKEN_DEBUG
  -    kdDebug( 6036 ) << this << " Tokenizer::write(\"" << str << "\"," << appendData << ")" << endl;
  +    kdDebug( 6036 ) << this << " Tokenizer::write(\"" << str.toString() << "\"," << appendData << ")" << endl;
   #endif
   
       if (!buffer)
  @@ -1829,8 +1829,8 @@
       if ( dest > buffer )
       {
   #ifdef TOKEN_DEBUG
  -        if(currToken.id) {
  -            qDebug( "unexpected token id: %d, str: *%s*", currToken.id,QConstString( buffer,dest-buffer ).qstring().latin1() );
  +        if(currToken.tagName.length()) {
  +            qDebug( "unexpected token: %s, str: *%s*", currToken.tagName.qstring().latin1(),QConstString( buffer,dest-buffer ).qstring().latin1() );
               assert(0);
           }
   
  @@ -1850,12 +1850,12 @@
       dest = buffer;
   
   #ifdef TOKEN_DEBUG
  -    QString name = getTagName(currToken.id).qstring();
  +    QString name = currToken.tagName.qstring();
       QString text;
       if(currToken.text)
           text = QConstString(currToken.text->s, currToken.text->l).qstring();
   
  -    kdDebug( 6036 ) << "Token --> " << name << "   id = " << currToken.id << endl;
  +    kdDebug( 6036 ) << "Token --> " << name << endl;
       if (currToken.flat)
           kdDebug( 6036 ) << "Token is FLAT!" << endl;
       if(!text.isNull())
  @@ -1865,7 +1865,7 @@
           kdDebug( 6036 ) << "Attributes: " << l << endl;
           for (unsigned i = 0; i < l; ++i) {
               AttributeImpl* c = currToken.attrs->attributeItem(i);
  -            kdDebug( 6036 ) << "    " << c->name().qstring()
  +            kdDebug( 6036 ) << "    " << c->localName().qstring()
                               << "=\"" << c->value().qstring() << "\"" << endl;
           }
       }
  
  
  



More information about the webkit-changes mailing list