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

[rjw]

The following commit has been merged in the debian/unstable branch:
commit 077a75998067120c253cd25195862c3fd283459a
Author: rjw <rjw at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Tue Apr 2 19:01:47 2002 +0000

            Added ref() of part from KHTMView.
            Added log to catch m_doc == 0 case.  Should never happen.
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@933 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog-2002-12-03 b/WebCore/ChangeLog-2002-12-03
index 1d08152..ca3a64f 100644
--- a/WebCore/ChangeLog-2002-12-03
+++ b/WebCore/ChangeLog-2002-12-03
@@ -1,5 +1,14 @@
 2002-04-02  Richard Williamson  <rjw at apple.com>
 
+        Added ref() of part from KHTMView.
+        Added log to catch m_doc == 0 case.  Should never happen.
+        
+	* src/kdelibs/khtml/khtmlview.cpp: (KHTMLView::KHTMLView),
+	(KHTMLView::~KHTMLView):
+	* src/kwq/KWQKHTMLPart.mm: (KHTMLPart::write):
+
+2002-04-02  Richard Williamson  <rjw at apple.com>
+
         Removed unnecessary and erroneous call to CGContextSetCharacterSpacing.
         
 	* src/kwq/KWQFontMetrics.mm: (-[KWQLayoutInfo _initializeCaches]):
diff --git a/WebCore/ChangeLog-2003-10-25 b/WebCore/ChangeLog-2003-10-25
index 1d08152..ca3a64f 100644
--- a/WebCore/ChangeLog-2003-10-25
+++ b/WebCore/ChangeLog-2003-10-25
@@ -1,5 +1,14 @@
 2002-04-02  Richard Williamson  <rjw at apple.com>
 
+        Added ref() of part from KHTMView.
+        Added log to catch m_doc == 0 case.  Should never happen.
+        
+	* src/kdelibs/khtml/khtmlview.cpp: (KHTMLView::KHTMLView),
+	(KHTMLView::~KHTMLView):
+	* src/kwq/KWQKHTMLPart.mm: (KHTMLPart::write):
+
+2002-04-02  Richard Williamson  <rjw at apple.com>
+
         Removed unnecessary and erroneous call to CGContextSetCharacterSpacing.
         
 	* src/kwq/KWQFontMetrics.mm: (-[KWQLayoutInfo _initializeCaches]):
diff --git a/WebCore/ChangeLog-2005-08-23 b/WebCore/ChangeLog-2005-08-23
index 1d08152..ca3a64f 100644
--- a/WebCore/ChangeLog-2005-08-23
+++ b/WebCore/ChangeLog-2005-08-23
@@ -1,5 +1,14 @@
 2002-04-02  Richard Williamson  <rjw at apple.com>
 
+        Added ref() of part from KHTMView.
+        Added log to catch m_doc == 0 case.  Should never happen.
+        
+	* src/kdelibs/khtml/khtmlview.cpp: (KHTMLView::KHTMLView),
+	(KHTMLView::~KHTMLView):
+	* src/kwq/KWQKHTMLPart.mm: (KHTMLPart::write):
+
+2002-04-02  Richard Williamson  <rjw at apple.com>
+
         Removed unnecessary and erroneous call to CGContextSetCharacterSpacing.
         
 	* src/kwq/KWQFontMetrics.mm: (-[KWQLayoutInfo _initializeCaches]):
diff --git a/WebCore/khtml/khtmlview.cpp b/WebCore/khtml/khtmlview.cpp
index 5c017c7..07ed360 100644
--- a/WebCore/khtml/khtmlview.cpp
+++ b/WebCore/khtml/khtmlview.cpp
@@ -205,6 +205,7 @@ KHTMLView::KHTMLView( KHTMLPart *part, QWidget *parent, const char *name)
     m_medium = "screen";
 
     m_part = part;
+    m_part->ref();
     d = new KHTMLViewPrivate;
     QScrollView::setVScrollBarMode(d->vmode);
     QScrollView::setHScrollBarMode(d->hmode);
@@ -231,6 +232,8 @@ KHTMLView::~KHTMLView()
 {
     if (m_part)
     {
+        m_part->deref();
+        
         //WABA: Is this Ok? Do I need to deref it as well?
         //Does this need to be done somewhere else?
         DOM::DocumentImpl *doc = m_part->xmlDocImpl();
diff --git a/WebCore/kwq/KWQKHTMLPart.mm b/WebCore/kwq/KWQKHTMLPart.mm
index 2c7f46a..5cceac0 100644
--- a/WebCore/kwq/KWQKHTMLPart.mm
+++ b/WebCore/kwq/KWQKHTMLPart.mm
@@ -609,6 +609,12 @@ void KHTMLPart::write( const char *str, int len )
 
 void KHTMLPart::write( const QString &str )
 {
+    // FIXME [rjw]:  Remove this log eventually.  Should never happen.  For debugging
+    // purposes only.
+    if (d->m_doc == 0){
+        fprintf (stderr, "WARNING:  m_doc == 0\n");
+    }
+
   if ( str.isNull() )
     return;
 
diff --git a/WebCore/kwq/KWQKHTMLPartImpl.mm b/WebCore/kwq/KWQKHTMLPartImpl.mm
index 2c7f46a..5cceac0 100644
--- a/WebCore/kwq/KWQKHTMLPartImpl.mm
+++ b/WebCore/kwq/KWQKHTMLPartImpl.mm
@@ -609,6 +609,12 @@ void KHTMLPart::write( const char *str, int len )
 
 void KHTMLPart::write( const QString &str )
 {
+    // FIXME [rjw]:  Remove this log eventually.  Should never happen.  For debugging
+    // purposes only.
+    if (d->m_doc == 0){
+        fprintf (stderr, "WARNING:  m_doc == 0\n");
+    }
+
   if ( str.isNull() )
     return;
 
diff --git a/WebCore/src/kdelibs/khtml/khtmlview.cpp b/WebCore/src/kdelibs/khtml/khtmlview.cpp
index 5c017c7..07ed360 100644
--- a/WebCore/src/kdelibs/khtml/khtmlview.cpp
+++ b/WebCore/src/kdelibs/khtml/khtmlview.cpp
@@ -205,6 +205,7 @@ KHTMLView::KHTMLView( KHTMLPart *part, QWidget *parent, const char *name)
     m_medium = "screen";
 
     m_part = part;
+    m_part->ref();
     d = new KHTMLViewPrivate;
     QScrollView::setVScrollBarMode(d->vmode);
     QScrollView::setHScrollBarMode(d->hmode);
@@ -231,6 +232,8 @@ KHTMLView::~KHTMLView()
 {
     if (m_part)
     {
+        m_part->deref();
+        
         //WABA: Is this Ok? Do I need to deref it as well?
         //Does this need to be done somewhere else?
         DOM::DocumentImpl *doc = m_part->xmlDocImpl();
diff --git a/WebCore/src/kwq/KWQKHTMLPart.mm b/WebCore/src/kwq/KWQKHTMLPart.mm
index 2c7f46a..5cceac0 100644
--- a/WebCore/src/kwq/KWQKHTMLPart.mm
+++ b/WebCore/src/kwq/KWQKHTMLPart.mm
@@ -609,6 +609,12 @@ void KHTMLPart::write( const char *str, int len )
 
 void KHTMLPart::write( const QString &str )
 {
+    // FIXME [rjw]:  Remove this log eventually.  Should never happen.  For debugging
+    // purposes only.
+    if (d->m_doc == 0){
+        fprintf (stderr, "WARNING:  m_doc == 0\n");
+    }
+
   if ( str.isNull() )
     return;
 

-- 
WebKit Debian packaging