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

List:       kde-commits
Subject:    kdelibs/khtml
From:       Antti Koivisto <koivisto () iki ! fi>
Date:       2003-01-16 0:00:33
[Download RAW message or body]

CVS commit by koivisto: 

Ok, so it is easier to have display:none objects in the render tree in some cases
- revert changes in HTMLHtmlElementImpl::attach()
- remove assert from RenderContainer::addChild()


  M +4 -8      html/html_baseimpl.cpp   1.178
  M +3 -2      rendering/render_container.cpp   1.38


--- kdelibs/khtml/html/html_baseimpl.cpp  #1.177:1.178
@@ -527,12 +527,8 @@ void HTMLHtmlElementImpl::attach()
     
     RenderStyle* _style = getDocument()->styleSelector()->styleForElement(this);
-    _style->ref();
-    if (_style->display() != NONE)
-    {
+    // ignore display: none
         m_render = new RenderHtml(this);
         m_render->setStyle(_style);
         parentNode()->renderer()->addChild(m_render, nextRenderer());
-    }
-    _style->deref();
     NodeBaseImpl::attach();
 }

--- kdelibs/khtml/rendering/render_container.cpp  #1.37:1.38
@@ -99,5 +99,6 @@ void RenderContainer::addChild(RenderObj
             break;
         case NONE:
-            KHTMLAssert(false);
+            // RenderHtml and some others can have display:none        
+            // KHTMLAssert(false);
             break;
         }


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