[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-10-26 19:27:52
Message-ID: 20101026192752.BA6A1AC897 () svn ! kde ! org
[Download RAW message or body]

SVN commit 1190055 by orlovich:

Adjust to the ownership change of first-letters.

BUG: 253997


 M  +6 -6      render_box.cpp  


--- trunk/KDE/kdelibs/khtml/rendering/render_box.cpp #1190054:1190055
@@ -229,12 +229,12 @@
 void RenderBox::detachRemainingChildren()
 {
     while (firstChild()) {
-#ifdef APPLE_CHANGES
-        if (firstChild()->isListMarker() || (firstChild()->style()->styleType() == \
                RenderStyle::FIRST_LETTER && !firstChild()->isText()))
-            firstChild()->remove();  // List markers are owned by their enclosing \
list and so don't get destroyed by this container. Similarly, first letters are \
                destroyed by their remaining text fragment.
-        else
-#endif
-        {
+        if (firstChild()->style()->styleType() == RenderStyle::FIRST_LETTER && \
!firstChild()->isText()) { +             // First letters are destroyed by their \
remaining text fragment. +             // We have to remove their references to \
parent here, however,  +             // since it may be destroyed once we get to them
+            firstChild()->remove(); 
+        } else {
         // Destroy any (most likely anonymous) children remaining in the render tree
             if (firstChild()->element())
                 firstChild()->element()->setRenderer(0);


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