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

List:       kde-commits
Subject:    KDE/kdelibs/khtml/xml
From:       Germain Garand <germain () ebooksfrance ! org>
Date:       2009-06-07 0:13:20
Message-ID: 1244333600.809586.26247.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 978409 by ggarand:

no reason to seed a document with <html> before writing to it.
this prevented e.g iframes from being in standard mode, since the
doctype was then ignored.

(also uninline completeURL, for future fixes)


 M  +5 -1      dom_docimpl.cpp  
 M  +1 -1      dom_docimpl.h  


--- trunk/KDE/kdelibs/khtml/xml/dom_docimpl.cpp #978408:978409
@@ -1674,7 +1674,6 @@
         if (m_view)
             m_view->part()->resetFromScript();
         m_tokenizer->setAutoClose();
-        write(QLatin1String("<html>"));
     }
     m_tokenizer->write(text, false);
 }
@@ -1691,6 +1690,11 @@
         m_tokenizer->finish();
 }
 
+QString DocumentImpl::completeURL(const QString& url) const
+{
+    return KUrl(baseURL(),url /*,m_decoderMibEnum*/).url();
+}
+
 void DocumentImpl::setUserStyleSheet( const QString& sheet )
 {
     if ( m_usersheet != sheet ) {
--- trunk/KDE/kdelibs/khtml/xml/dom_docimpl.h #978408:978409
@@ -359,7 +359,7 @@
     QString baseTarget() const { return m_baseTarget; }
     void setBaseTarget(const QString& baseTarget) { m_baseTarget = baseTarget; }
 
-    QString completeURL(const QString& url) const { return KUrl(baseURL(),url \
/*,m_decoderMibEnum*/).url(); } +    QString completeURL(const QString& url) const;
     DOMString canonURL(const DOMString& url) const { return url.isEmpty() ? url : \
completeURL(url.string()); }  
     void setUserStyleSheet(const QString& sheet);


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

Configure | About | News | Add a list | Sponsored by KoreLogic