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

[mjs]

The following commit has been merged in the debian/unstable branch:
commit 7a407b248613c075bbe53e798f3e5c2961461a26
Author: mjs <mjs at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Wed Sep 3 21:10:38 2003 +0000

            Reviewed by Darin.
    
            * khtml/khtml_part.cpp:
    	(KHTMLPart::clear): Un-ifdef cleanup of frames, and add similar
    	cleanup for objects. Replace delete with deref.
            * kwq/KWQKHTMLPart.mm:
            (KWQKHTMLPart::createPart): Add an extra ref to KHTMLParts since
    	both the bridge and the parent part want to deref.
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@4930 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog-2003-10-25 b/WebCore/ChangeLog-2003-10-25
index 4a066c7..1fd54f9 100644
--- a/WebCore/ChangeLog-2003-10-25
+++ b/WebCore/ChangeLog-2003-10-25
@@ -1,3 +1,14 @@
+2003-09-03  Maciej Stachowiak  <mjs at apple.com>
+
+        Reviewed by Darin.
+
+        * khtml/khtml_part.cpp:
+	(KHTMLPart::clear): Un-ifdef cleanup of frames, and add similar
+	cleanup for objects. Replace delete with deref.
+        * kwq/KWQKHTMLPart.mm:
+        (KWQKHTMLPart::createPart): Add an extra ref to KHTMLParts since
+	both the bridge and the parent part want to deref.
+
 2003-09-03  David Hyatt  <hyatt at apple.com>
 
 	Fix for 3404398, leak in residual style code.  The code that built up the
diff --git a/WebCore/ChangeLog-2005-08-23 b/WebCore/ChangeLog-2005-08-23
index 4a066c7..1fd54f9 100644
--- a/WebCore/ChangeLog-2005-08-23
+++ b/WebCore/ChangeLog-2005-08-23
@@ -1,3 +1,14 @@
+2003-09-03  Maciej Stachowiak  <mjs at apple.com>
+
+        Reviewed by Darin.
+
+        * khtml/khtml_part.cpp:
+	(KHTMLPart::clear): Un-ifdef cleanup of frames, and add similar
+	cleanup for objects. Replace delete with deref.
+        * kwq/KWQKHTMLPart.mm:
+        (KWQKHTMLPart::createPart): Add an extra ref to KHTMLParts since
+	both the bridge and the parent part want to deref.
+
 2003-09-03  David Hyatt  <hyatt at apple.com>
 
 	Fix for 3404398, leak in residual style code.  The code that built up the
diff --git a/WebCore/khtml/khtml_part.cpp b/WebCore/khtml/khtml_part.cpp
index cacda85..b946b4a 100644
--- a/WebCore/khtml/khtml_part.cpp
+++ b/WebCore/khtml/khtml_part.cpp
@@ -975,7 +975,6 @@ void KHTMLPart::clear()
     d->m_decoder->deref();
   d->m_decoder = 0;
 
-#if !APPLE_CHANGES
   {
     ConstFrameIt it = d->m_frames.begin();
     ConstFrameIt end = d->m_frames.end();
@@ -983,14 +982,29 @@ void KHTMLPart::clear()
     {
       if ( (*it).m_part )
       {
+#if !APPLE_CHANGES
         partManager()->removePart( (*it).m_part );
-        delete (KParts::ReadOnlyPart *)(*it).m_part;
+#endif
+        (*it).m_part->deref();
       }
     }
   }
-#endif
-
   d->m_frames.clear();
+
+  {
+    ConstFrameIt it = d->m_objects.begin();
+    ConstFrameIt end = d->m_objects.end();
+    for(; it != end; ++it )
+    {
+      if ( (*it).m_part )
+      {
+#if !APPLE_CHANGES
+        partManager()->removePart( (*it).m_part );
+#endif
+        (*it).m_part->deref();
+      }
+    }
+  }
   d->m_objects.clear();
 
 #ifndef Q_WS_QWS
@@ -3053,7 +3067,7 @@ bool KHTMLPart::processObjectRequest( khtml::ChildFrame *child, const KURL &_url
 #if !APPLE_CHANGES
       partManager()->removePart( (KParts::ReadOnlyPart *)child->m_part );
 #endif
-      delete (KParts::ReadOnlyPart *)child->m_part;
+      child->m_part->deref();
     }
 
     child->m_serviceType = mimetype;
diff --git a/WebCore/kwq/KWQKHTMLPart.mm b/WebCore/kwq/KWQKHTMLPart.mm
index bb9ce6f..0114b73 100644
--- a/WebCore/kwq/KWQKHTMLPart.mm
+++ b/WebCore/kwq/KWQKHTMLPart.mm
@@ -659,6 +659,9 @@ ReadOnlyPart *KWQKHTMLPart::createPart(const ChildFrame &child, const KURL &url,
                                                     allowsScrolling:allowsScrolling
                                                         marginWidth:marginWidth
                                                        marginHeight:marginHeight];
+	// This call needs to return an object with a ref, since the caller will expect to own it.
+	// childBridge owns the only ref so far.
+	[childBridge part]->ref();
         return [childBridge part];
     }
 }

-- 
WebKit Debian packaging