[SCM] WebKit Debian packaging branch, debian/unstable, updated. debian/1.1.15-1-40151-g37bb677

[hyatt]

The following commit has been merged in the debian/unstable branch:
commit 9d973dc0dc1031acf9257b32dc73952a3e37c3e6
Author: hyatt <hyatt at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Tue Jan 27 10:01:55 2004 +0000

    	Make a change suggested by kocienda to add a remove() method to InlineBoxes.
    
            Reviewed by kocienda
    
            * khtml/rendering/render_box.cpp:
            (RenderBox::detach):
            (RenderBox::position):
            * khtml/rendering/render_line.cpp:
            (InlineBox::remove):
            * khtml/rendering/render_line.h:
            * khtml/rendering/render_text.cpp:
            (RenderText::detach):
            (RenderText::position):
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@5989 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog-2005-08-23 b/WebCore/ChangeLog-2005-08-23
index 5f50289..28f5c18 100644
--- a/WebCore/ChangeLog-2005-08-23
+++ b/WebCore/ChangeLog-2005-08-23
@@ -1,3 +1,19 @@
+2004-01-27  David Hyatt  <hyatt at apple.com>
+
+	Make a change suggested by kocienda to add a remove() method to InlineBoxes.
+	
+        Reviewed by kocienda
+
+        * khtml/rendering/render_box.cpp:
+        (RenderBox::detach):
+        (RenderBox::position):
+        * khtml/rendering/render_line.cpp:
+        (InlineBox::remove):
+        * khtml/rendering/render_line.h:
+        * khtml/rendering/render_text.cpp:
+        (RenderText::detach):
+        (RenderText::position):
+
 2004-01-26  Darin Adler  <darin at apple.com>
 
         Reviewed by Maciej.
diff --git a/WebCore/khtml/rendering/render_box.cpp b/WebCore/khtml/rendering/render_box.cpp
index 439088f..eef0081 100644
--- a/WebCore/khtml/rendering/render_box.cpp
+++ b/WebCore/khtml/rendering/render_box.cpp
@@ -126,7 +126,7 @@ void RenderBox::detach()
     
     if (m_inlineBoxWrapper) {
         if (!documentBeingDestroyed())
-            m_inlineBoxWrapper->parent()->removeChild(m_inlineBoxWrapper);
+            m_inlineBoxWrapper->remove();
         m_inlineBoxWrapper->detach(arena);
     }
 
@@ -569,7 +569,7 @@ void RenderBox::position(InlineBox* box, int from, int len, bool reverse)
             m_staticY = box->yPos();
 
         // Nuke the box.
-        box->parent()->removeChild(box);
+        box->remove();
         box->detach(renderArena());
     }
     else if (isReplaced()) {
diff --git a/WebCore/khtml/rendering/render_line.cpp b/WebCore/khtml/rendering/render_line.cpp
index 72f1c44..b666078 100644
--- a/WebCore/khtml/rendering/render_line.cpp
+++ b/WebCore/khtml/rendering/render_line.cpp
@@ -46,6 +46,12 @@ using namespace khtml;
 static bool inInlineBoxDetach;
 #endif
 
+void InlineBox::remove()
+{ 
+    if (parent())
+        parent()->removeChild(this);
+}
+
 void InlineBox::detach(RenderArena* renderArena)
 {
 #ifndef NDEBUG
diff --git a/WebCore/khtml/rendering/render_line.h b/WebCore/khtml/rendering/render_line.h
index f1ee665..7475792 100644
--- a/WebCore/khtml/rendering/render_line.h
+++ b/WebCore/khtml/rendering/render_line.h
@@ -73,6 +73,8 @@ public:
     void setFirstLineStyleBit(bool f) { m_firstLine = f; }
     bool isFirstLineStyle() const { return m_firstLine; }
 
+    void remove();
+
     InlineBox* nextOnLine() const { return m_next; }
     InlineBox* prevOnLine() const { return m_prev; }
     void setNextOnLine(InlineBox* next) { m_next = next; }
diff --git a/WebCore/khtml/rendering/render_text.cpp b/WebCore/khtml/rendering/render_text.cpp
index 2246ff9..62b84cf 100644
--- a/WebCore/khtml/rendering/render_text.cpp
+++ b/WebCore/khtml/rendering/render_text.cpp
@@ -299,7 +299,7 @@ void RenderText::detach()
 {
     if (!documentBeingDestroyed()) {
         for (InlineTextBox* box = firstTextBox(); box; box = box->nextTextBox())
-            box->parent()->removeChild(box);
+            box->remove();
     }
     deleteTextBoxes();
     RenderObject::detach();
@@ -1214,7 +1214,7 @@ void RenderText::position(InlineBox* box, int from, int len, bool reverse)
     if (len == 0 || isBR()) {
         // We want the box to be destroyed.  This is a <br>, and we don't
         // need <br>s to be included.
-        s->parent()->removeChild(s);
+        s->remove();
         s->detach(renderArena());
         m_firstTextBox = m_lastTextBox = 0;
         return;

-- 
WebKit Debian packaging