[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:       2007-11-14 8:26:04
Message-ID: 1195028764.817101.29738.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 736421 by ggarand:

Gah, wrong logic.
Don't occasionally return null here.

 M  +6 -0      dom_elementimpl.cpp  
 M  +1 -5      dom_elementimpl.h  


--- trunk/KDE/kdelibs/khtml/xml/dom_elementimpl.cpp #736420:736421
@@ -891,6 +891,12 @@
     m_hasCombinedStyle = true;
 }
 
+CSSStyleDeclarationImpl *ElementImpl::getInlineStyleDecls() 
+{
+    if (!inlineStyleDecls()) createInlineDecl();
+        return inlineStyleDecls();
+}
+
 void ElementImpl::createInlineDecl( )
 {
     assert( !m_style.inlineDecls || (m_hasCombinedStyle && \
                !m_style.combinedDecls->inlineDecls) );
--- trunk/KDE/kdelibs/khtml/xml/dom_elementimpl.h #736420:736421
@@ -228,12 +228,8 @@
     virtual bool childTypeAllowed( unsigned short type );
     DOM::CSSStyleDeclarationImpl *inlineStyleDecls() const { return \
                m_hasCombinedStyle ? m_style.combinedDecls->inlineDecls : \
                m_style.inlineDecls; }
     DOM::CSSStyleDeclarationImpl *nonCSSStyleDecls() const { return \
m_hasCombinedStyle ? m_style.combinedDecls->nonCSSDecls : 0; } +    \
DOM::CSSStyleDeclarationImpl *getInlineStyleDecls();  
-    DOM::CSSStyleDeclarationImpl *getInlineStyleDecls() {
-        if (!m_style.inlineDecls) createInlineDecl();
-        return inlineStyleDecls();
-    }
-
     void dispatchAttrRemovalEvent(NodeImpl::Id id, DOMStringImpl *value);
     void dispatchAttrAdditionEvent(NodeImpl::Id id, DOMStringImpl *value);
 


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