[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    branches/KDE/3.5/kdelibs/khtml/html
From:       Germain Garand <germain () ebooksfrance ! com>
Date:       2006-08-24 13:26:12
Message-ID: 1156425972.254209.9451.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 576632 by ggarand:


support parsing of attribute/>
not taking WC patch on this one has it looks a tad cheesy.

BUG: 87221



 M  +10 -5     htmltokenizer.cpp  


--- branches/KDE/3.5/kdelibs/khtml/html/htmltokenizer.cpp #576631:576632
@@ -904,8 +904,16 @@
                         unsigned int a;
                         cBuffer[cBufferPos] = '\0';
                         a = khtml::getAttrID(cBuffer, cBufferPos);
-                        if ( !a )
-                            attrName = QString::fromLatin1(QCString(cBuffer, \
cBufferPos+1).data()); +                        if ( !a ) {
+                            // did we just get /> or e.g checked/>
+                            if (curchar == '>' && cBufferPos >=1 && \
cBuffer[cBufferPos-1] == '/') { +                                currToken.flat = \
true; +                                if (cBufferPos>1)
+                                    a = khtml::getAttrID(cBuffer, cBufferPos-1);
+                            }
+                            if (!a)
+                                attrName = QString::fromLatin1(QCString(cBuffer, \
cBufferPos+1).data()); +                        }
 
                         dest = buffer;
                         *dest++ = a;
@@ -915,9 +923,6 @@
                         else
                             kdDebug( 6036 ) << "Known attribute: " << \
QCString(cBuffer, cBufferPos+1).data() << endl;  #endif
-                        // did we just get />
-                        if (!a && cBufferPos == 1 && *cBuffer == '/' && curchar == \
                '>')
-                            currToken.flat = true;
 
                         tag = SearchEqual;
                         break;


[prev in list] [next in list] [prev in thread] [next in thread]