[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 91e2bc1df2adffda5b94cb624a8610d6c7de1436
Author: darin <darin at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Fri Nov 8 07:47:12 2002 +0000

            * kwq/KWQKHTMLPart.mm: (KWQKHTMLPart::slotData):
    	Add an assert in the hopes of catching bug 3084704 a little earlier.
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@2597 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog-2002-12-03 b/WebCore/ChangeLog-2002-12-03
index f1b555c..a1c4ec9 100644
--- a/WebCore/ChangeLog-2002-12-03
+++ b/WebCore/ChangeLog-2002-12-03
@@ -1,3 +1,8 @@
+2002-11-07  Darin Adler  <darin at apple.com>
+
+        * kwq/KWQKHTMLPart.mm: (KWQKHTMLPart::slotData):
+	Add an assert in the hopes of catching bug 3084704 a little earlier.
+
 2002-11-07  Richard Williamson  <rjw at apple.com>
 
         Don't stop animating unless we're the last referee. (3083281)
diff --git a/WebCore/ChangeLog-2003-10-25 b/WebCore/ChangeLog-2003-10-25
index f1b555c..a1c4ec9 100644
--- a/WebCore/ChangeLog-2003-10-25
+++ b/WebCore/ChangeLog-2003-10-25
@@ -1,3 +1,8 @@
+2002-11-07  Darin Adler  <darin at apple.com>
+
+        * kwq/KWQKHTMLPart.mm: (KWQKHTMLPart::slotData):
+	Add an assert in the hopes of catching bug 3084704 a little earlier.
+
 2002-11-07  Richard Williamson  <rjw at apple.com>
 
         Don't stop animating unless we're the last referee. (3083281)
diff --git a/WebCore/ChangeLog-2005-08-23 b/WebCore/ChangeLog-2005-08-23
index f1b555c..a1c4ec9 100644
--- a/WebCore/ChangeLog-2005-08-23
+++ b/WebCore/ChangeLog-2005-08-23
@@ -1,3 +1,8 @@
+2002-11-07  Darin Adler  <darin at apple.com>
+
+        * kwq/KWQKHTMLPart.mm: (KWQKHTMLPart::slotData):
+	Add an assert in the hopes of catching bug 3084704 a little earlier.
+
 2002-11-07  Richard Williamson  <rjw at apple.com>
 
         Don't stop animating unless we're the last referee. (3083281)
diff --git a/WebCore/kwq/KWQKHTMLPart.mm b/WebCore/kwq/KWQKHTMLPart.mm
index d46c971..efae590 100644
--- a/WebCore/kwq/KWQKHTMLPart.mm
+++ b/WebCore/kwq/KWQKHTMLPart.mm
@@ -153,14 +153,15 @@ void KWQKHTMLPart::slotData(NSString *encoding, bool forceEncoding, const char *
         d->m_workingURL = KURL();
     }
 
+    ASSERT(d->m_doc);
+    ASSERT(d->m_doc->parsing());
+    
     if (encoding) {
         part->setEncoding(QString::fromNSString(encoding), forceEncoding);
     } else {
         part->setEncoding(QString::null, false);
     }
     
-    ASSERT(d->m_doc != NULL);
-
     part->write(bytes, length);
 }
 

-- 
WebKit Debian packaging