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

List:       kde-commits
Subject:    KDE/kdelibs/khtml/rendering
From:       Maks Orlovich <maksim () kde ! org>
Date:       2010-08-15 17:59:48
Message-ID: 20100815175948.DC1CCAC854 () svn ! kde ! org
[Download RAW message or body]

SVN commit 1164055 by orlovich:

Merged revision:r1164054 | orlovich | 2010-08-15 13:58:58 -0400 (Sun, 15 Aug 2010) | 4 lines

Go ahead and be far more strict about keeping the special child object lists up-to-date.

BUG: 170165

 M  +9 -0      render_object.cpp  
 M  +1 -1      render_object.h  


--- trunk/KDE/kdelibs/khtml/rendering/render_object.cpp #1164054:1164055
@@ -2384,6 +2384,15 @@
     arenaDelete(renderArena(), this);
 }
 
+void RenderObject::remove()
+{
+    if (m_parent) {
+        m_parent->removeChild(this);
+        if (isFloating() || inPosObjectList())
+            removeFromObjectLists();
+    }
+}
+
 void RenderObject::arenaDelete(RenderArena *arena, void *base)
 {
 #ifndef NDEBUG
--- trunk/KDE/kdelibs/khtml/rendering/render_object.h #1164054:1164055
@@ -848,7 +848,7 @@
     virtual void selectionStartEnd(int& spos, int& epos);
 
     virtual QRect viewRect() const;
-    void remove() { if (m_parent) m_parent->removeChild(this); }
+    void remove();
     void setDetached() { m_attached = false; }
     void invalidateVerticalPosition();
     bool attemptDirectLayerTranslation();
[prev in list] [next in list] [prev in thread] [next in thread]