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

[darin]

The following commit has been merged in the debian/unstable branch:
commit 0671b87994d8f097e6db2a913e5ee605710e6afc
Author: darin <darin at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Wed Jun 26 16:16:58 2002 +0000

    	Fixed (or at least worked around) a crash I saw where KWQKHTMLPartImpl::end was
            making calls after the KHTMLView was gone. This is specific to our APPLE_CHANGES
            code; it's handled differently in KDE.
    
            * khtml/khtml_part.h: Added detachView.
            * khtml/khtml_part.cpp: (KHTMLPart::detachView): Added. Nils out the view pointer.
            * khtml/khtmlview.cpp: (KHTMLView::~KHTMLView): Call m_part->detachView().
            * kwq/KWQKHTMLPart.mm: (KWQKHTMLPartImpl::end): Don't try to make calls to the view
            if it's nil.
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@1437 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog-2002-12-03 b/WebCore/ChangeLog-2002-12-03
index 3ac1ab2..b8e3ea1 100644
--- a/WebCore/ChangeLog-2002-12-03
+++ b/WebCore/ChangeLog-2002-12-03
@@ -1,3 +1,15 @@
+2002-06-26  Darin Adler  <darin at apple.com>
+
+	Fixed (or at least worked around) a crash I saw where KWQKHTMLPartImpl::end was
+        making calls after the KHTMLView was gone. This is specific to our APPLE_CHANGES
+        code; it's handled differently in KDE.
+
+        * khtml/khtml_part.h: Added detachView.
+        * khtml/khtml_part.cpp: (KHTMLPart::detachView): Added. Nils out the view pointer.
+        * khtml/khtmlview.cpp: (KHTMLView::~KHTMLView): Call m_part->detachView().
+        * kwq/KWQKHTMLPart.mm: (KWQKHTMLPartImpl::end): Don't try to make calls to the view
+        if it's nil.
+
 2002-06-25  Richard Williamson  <rjw at apple.com>
         
         Support for khtml style selection drawing.  Ugly,
diff --git a/WebCore/ChangeLog-2003-10-25 b/WebCore/ChangeLog-2003-10-25
index 3ac1ab2..b8e3ea1 100644
--- a/WebCore/ChangeLog-2003-10-25
+++ b/WebCore/ChangeLog-2003-10-25
@@ -1,3 +1,15 @@
+2002-06-26  Darin Adler  <darin at apple.com>
+
+	Fixed (or at least worked around) a crash I saw where KWQKHTMLPartImpl::end was
+        making calls after the KHTMLView was gone. This is specific to our APPLE_CHANGES
+        code; it's handled differently in KDE.
+
+        * khtml/khtml_part.h: Added detachView.
+        * khtml/khtml_part.cpp: (KHTMLPart::detachView): Added. Nils out the view pointer.
+        * khtml/khtmlview.cpp: (KHTMLView::~KHTMLView): Call m_part->detachView().
+        * kwq/KWQKHTMLPart.mm: (KWQKHTMLPartImpl::end): Don't try to make calls to the view
+        if it's nil.
+
 2002-06-25  Richard Williamson  <rjw at apple.com>
         
         Support for khtml style selection drawing.  Ugly,
diff --git a/WebCore/ChangeLog-2005-08-23 b/WebCore/ChangeLog-2005-08-23
index 3ac1ab2..b8e3ea1 100644
--- a/WebCore/ChangeLog-2005-08-23
+++ b/WebCore/ChangeLog-2005-08-23
@@ -1,3 +1,15 @@
+2002-06-26  Darin Adler  <darin at apple.com>
+
+	Fixed (or at least worked around) a crash I saw where KWQKHTMLPartImpl::end was
+        making calls after the KHTMLView was gone. This is specific to our APPLE_CHANGES
+        code; it's handled differently in KDE.
+
+        * khtml/khtml_part.h: Added detachView.
+        * khtml/khtml_part.cpp: (KHTMLPart::detachView): Added. Nils out the view pointer.
+        * khtml/khtmlview.cpp: (KHTMLView::~KHTMLView): Call m_part->detachView().
+        * kwq/KWQKHTMLPart.mm: (KWQKHTMLPartImpl::end): Don't try to make calls to the view
+        if it's nil.
+
 2002-06-25  Richard Williamson  <rjw at apple.com>
         
         Support for khtml style selection drawing.  Ugly,
diff --git a/WebCore/khtml/khtml_part.cpp b/WebCore/khtml/khtml_part.cpp
index af28138..ce63adf 100644
--- a/WebCore/khtml/khtml_part.cpp
+++ b/WebCore/khtml/khtml_part.cpp
@@ -4631,6 +4631,11 @@ void KHTMLPart::setTitle(const DOMString &title)
     impl->setTitle(title);
 }
 
+void KHTMLPart::detachView()
+{
+    impl->setView(0);
+}
+
 #endif
 
 using namespace KParts;
diff --git a/WebCore/khtml/khtml_part.h b/WebCore/khtml/khtml_part.h
index 5321f3a..4276229 100644
--- a/WebCore/khtml/khtml_part.h
+++ b/WebCore/khtml/khtml_part.h
@@ -1088,6 +1088,7 @@ private:
 #ifdef APPLE_CHANGES
 public:
   void setTitle(const DOM::DOMString &);
+  void detachView();
   
   KWQKHTMLPartImpl *impl;
   friend class KWQKHTMLPartImpl;
diff --git a/WebCore/khtml/khtmlview.cpp b/WebCore/khtml/khtmlview.cpp
index fa8df59..7a55b1c 100644
--- a/WebCore/khtml/khtmlview.cpp
+++ b/WebCore/khtml/khtmlview.cpp
@@ -245,6 +245,7 @@ KHTMLView::~KHTMLView()
         killTimer(d->repaintTimerId);
         d->timerId = 0;
         d->repaintTimerId = 0;
+        m_part->detachView();
         m_part->deref();
 #endif
     }
diff --git a/WebCore/kwq/KWQKHTMLPart.mm b/WebCore/kwq/KWQKHTMLPart.mm
index c8822f0..c141fb7 100644
--- a/WebCore/kwq/KWQKHTMLPart.mm
+++ b/WebCore/kwq/KWQKHTMLPart.mm
@@ -311,7 +311,8 @@ void KWQKHTMLPartImpl::end()
     d->m_doc->close();
     KURL::clearCaches();
     
-    d->m_view->complete();
+    if (d->m_view)
+        d->m_view->complete();
 }
  
 bool KWQKHTMLPartImpl::gotoBaseAnchor()
diff --git a/WebCore/kwq/KWQKHTMLPartImpl.mm b/WebCore/kwq/KWQKHTMLPartImpl.mm
index c8822f0..c141fb7 100644
--- a/WebCore/kwq/KWQKHTMLPartImpl.mm
+++ b/WebCore/kwq/KWQKHTMLPartImpl.mm
@@ -311,7 +311,8 @@ void KWQKHTMLPartImpl::end()
     d->m_doc->close();
     KURL::clearCaches();
     
-    d->m_view->complete();
+    if (d->m_view)
+        d->m_view->complete();
 }
  
 bool KWQKHTMLPartImpl::gotoBaseAnchor()

-- 
WebKit Debian packaging