Changeset 15860 in webkit

Timestamp:

Aug 14, 2006 1:17:32 PM (18 years ago)

Author:

thatcher

Message:

Merged fix from Safari-2-0-branch to Safari-1-3-branch

2006-08-04 Beth Dakin <Beth Dakin>

Reviewed by me/Hyatt.

Mostly this is merging over Hyatt's fix with r15801. Some other
things needed to be tweaked though. This is a better fix for
<rdar://problem/4541255> Safari hangs at ​http://www.kutilek.de/
safari-test/ somewhere from
WebCore::RenderBlock::layoutInlineChildren(bool)

• khtml/rendering/render_box.cpp: (RenderBox::deleteLineBoxWrapper): Call remove.
• khtml/rendering/render_box.h:
• khtml/rendering/render_list.cpp: (RenderListItem::updateMarkerLocation): Call remove.
• khtml/rendering/render_list.h: (khtml::ListMarkerBox:::InlineBox):
• khtml/rendering/render_object.cpp: Back out old fix. (RenderObject::remove):
• khtml/rendering/render_object.h: Back out old fix.

Location:

branches/Safari-1-3-branch/WebCore

Files:

• ChangeLog (modified) (1 diff)
• khtml/rendering/render_box.cpp (modified) (1 diff, 1 prop)
• khtml/rendering/render_box.h (modified) (1 diff)
• khtml/rendering/render_list.cpp (modified) (2 diffs)
• khtml/rendering/render_list.h (modified) (1 diff)
• khtml/rendering/render_object.cpp (modified) (1 diff, 1 prop)
• khtml/rendering/render_object.h (modified) (1 diff, 1 prop)

branches/Safari-1-3-branch/WebCore/ChangeLog

@@ +1 @@
+2006-08-14  Timothy Hatcher  <timothy@apple.com>
+
+        Merged fix from Safari-2-0-branch to Safari-1-3-branch
+
+    2006-08-04  Beth Dakin  <bdakin@apple.com>
+
+        Reviewed by me/Hyatt.
+
+        Mostly this is merging over Hyatt's fix with r15801. Some other 
+        things needed to be tweaked though. This is a better fix for 
+        <rdar://problem/4541255> Safari hangs at http://www.kutilek.de/
+        safari-test/ somewhere from 
+        WebCore::RenderBlock::layoutInlineChildren(bool)
+
+        * khtml/rendering/render_box.cpp:
+        (RenderBox::deleteLineBoxWrapper): Call remove.
+        * khtml/rendering/render_box.h:
+        * khtml/rendering/render_list.cpp: 
+        (RenderListItem::updateMarkerLocation): Call remove.
+        * khtml/rendering/render_list.h:
+        (khtml::ListMarkerBox:::InlineBox):
+        * khtml/rendering/render_object.cpp: Back out old fix.
+        (RenderObject::remove):
+        * khtml/rendering/render_object.h: Back out old fix. 
+
 2006-08-14  Timothy Hatcher  <timothy@apple.com>
 

branches/Safari-1-3-branch/WebCore/khtml/rendering/render_box.cpp

@@ -670 +670 @@
 void RenderBox::deleteLineBoxWrapper()
 {
-    if (m_inlineBoxWrapper)
+    if (m_inlineBoxWrapper) {
+        if (!documentBeingDestroyed())
+            m_inlineBoxWrapper->remove();
         m_inlineBoxWrapper->detach(renderArena());
-    m_inlineBoxWrapper = 0;
+        m_inlineBoxWrapper = 0;
+    }
 }
 

branches/Safari-1-3-branch/WebCore/khtml/rendering/render_box.h

@@ -99 +99 @@
     virtual InlineBox* inlineBoxWrapper() const;
     virtual void setInlineBoxWrapper(InlineBox* b);
-    void deleteLineBoxWrapper();
+    virtual void deleteLineBoxWrapper();
     
     virtual int lowestPosition(bool includeOverflowInterior=true, bool includeSelf=true) const;

branches/Safari-1-3-branch/WebCore/khtml/rendering/render_list.cpp

@@ -244 +244 @@
         if (markerPar != lineBoxParent)
         {
-            if (markerPar)
-                markerPar->removeChild(m_marker);
+            m_marker->remove();
             if (!lineBoxParent)
                 lineBoxParent = this;
@@ -311 +310 @@
     }
     return result;
-}
-
-// -----------------------------------------------------------
-#ifndef NDEBUG
-static bool listMarkerBoxDetach;
-#endif
- 
-void ListMarkerBox::detach(RenderArena* arena)
-{
-    #ifndef NDEBUG
-        listMarkerBoxDetach = true;
-    #endif
-    if (m_parent)
-        m_parent->removeChild(this);
-    delete this;
-    #ifndef NDEBUG
-        listMarkerBoxDetach = false;
-    #endif
-
-    // Recover the size left there for us by operator delete and free the memory.
-    arena->free(*(size_t *)this, this);
-}
-
-void ListMarkerBox::operator delete(void* ptr, size_t sz)
-{
-    assert(listMarkerBoxDetach);
-
-    // Stash size where destroy can find it.
-    *(size_t *)ptr = sz;
 }
 

branches/Safari-1-3-branch/WebCore/khtml/rendering/render_list.h

@@ -87 +87 @@
 public:
     ListMarkerBox(RenderObject* obj) :InlineBox(obj) {}
-    virtual void detach(RenderArena*);
-    
-    // Overridden to prevent the normal delete from being called.
-    void operator delete(void* ptr, size_t sz);
-    
     virtual bool isText() const { return !static_cast<RenderListMarker*>(object())->listImage(); }
 };

branches/Safari-1-3-branch/WebCore/khtml/rendering/render_object.cpp

@@ -1834 +1834 @@
         //have parent, take care of the tree integrity
         parent()->removeChild(this);
+        
+    deleteLineBoxWrapper();
 }
 

branches/Safari-1-3-branch/WebCore/khtml/rendering/render_object.h

@@ -374 +374 @@
     virtual InlineBox* inlineBoxWrapper() const;
     virtual void setInlineBoxWrapper(InlineBox* b);
-    void deleteLineBoxWrapper();
+    virtual void deleteLineBoxWrapper();
 
     virtual InlineBox *inlineBox(long offset=0, EAffinity affinity = UPSTREAM);