[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 7bff6cfb2e26a0c8201c26607510a353f798cb68
Author: mjs <mjs at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Mon Aug 5 11:30:26 2002 +0000

            * kwq/KWQKHTMLPartImpl.mm:
            (KWQKHTMLPartImpl::slotData): Simplified a bit.
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@1733 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog-2002-12-03 b/WebCore/ChangeLog-2002-12-03
index c61b397..5bbfcad 100644
--- a/WebCore/ChangeLog-2002-12-03
+++ b/WebCore/ChangeLog-2002-12-03
@@ -1,5 +1,10 @@
 2002-08-05  Maciej Stachowiak  <mjs at apple.com>
 
+        * kwq/KWQKHTMLPartImpl.mm:
+        (KWQKHTMLPartImpl::slotData): Simplified a bit.
+
+2002-08-05  Maciej Stachowiak  <mjs at apple.com>
+
         Merged KHTMLPart::end method with khtml original.
 
         * khtml/khtml_part.cpp:
diff --git a/WebCore/ChangeLog-2003-10-25 b/WebCore/ChangeLog-2003-10-25
index c61b397..5bbfcad 100644
--- a/WebCore/ChangeLog-2003-10-25
+++ b/WebCore/ChangeLog-2003-10-25
@@ -1,5 +1,10 @@
 2002-08-05  Maciej Stachowiak  <mjs at apple.com>
 
+        * kwq/KWQKHTMLPartImpl.mm:
+        (KWQKHTMLPartImpl::slotData): Simplified a bit.
+
+2002-08-05  Maciej Stachowiak  <mjs at apple.com>
+
         Merged KHTMLPart::end method with khtml original.
 
         * khtml/khtml_part.cpp:
diff --git a/WebCore/ChangeLog-2005-08-23 b/WebCore/ChangeLog-2005-08-23
index c61b397..5bbfcad 100644
--- a/WebCore/ChangeLog-2005-08-23
+++ b/WebCore/ChangeLog-2005-08-23
@@ -1,5 +1,10 @@
 2002-08-05  Maciej Stachowiak  <mjs at apple.com>
 
+        * kwq/KWQKHTMLPartImpl.mm:
+        (KWQKHTMLPartImpl::slotData): Simplified a bit.
+
+2002-08-05  Maciej Stachowiak  <mjs at apple.com>
+
         Merged KHTMLPart::end method with khtml original.
 
         * khtml/khtml_part.cpp:
diff --git a/WebCore/kwq/KWQKHTMLPart.mm b/WebCore/kwq/KWQKHTMLPart.mm
index ae77858..72e8c92 100644
--- a/WebCore/kwq/KWQKHTMLPart.mm
+++ b/WebCore/kwq/KWQKHTMLPart.mm
@@ -101,20 +101,10 @@ void KWQKHTMLPartImpl::slotData(NSString *encoding, const char *bytes, int lengt
     QString enc;
 
     if (!d->m_workingURL.isEmpty()) {
-        //begin(d->m_workingURL, d->m_extension->urlArgs().xOffset, d->m_extension->urlArgs().yOffset);
         part->begin(d->m_workingURL, 0, 0);
-
-	//d->m_doc->docLoader()->setReloading(d->m_bReloading);
         d->m_workingURL = KURL();
     }
 
-    // This flag is used to tell when a load has completed so we can be sure
-    // to process the data even if we have not yet determined the proper
-    // encoding.
-    if (complete) {
-        d->m_bComplete = true;    
-    }
-
     if (encoding != NULL) {
         enc = QString::fromCFString((CFStringRef) encoding);
         part->setEncoding(enc, true);
diff --git a/WebCore/kwq/KWQKHTMLPartImpl.mm b/WebCore/kwq/KWQKHTMLPartImpl.mm
index ae77858..72e8c92 100644
--- a/WebCore/kwq/KWQKHTMLPartImpl.mm
+++ b/WebCore/kwq/KWQKHTMLPartImpl.mm
@@ -101,20 +101,10 @@ void KWQKHTMLPartImpl::slotData(NSString *encoding, const char *bytes, int lengt
     QString enc;
 
     if (!d->m_workingURL.isEmpty()) {
-        //begin(d->m_workingURL, d->m_extension->urlArgs().xOffset, d->m_extension->urlArgs().yOffset);
         part->begin(d->m_workingURL, 0, 0);
-
-	//d->m_doc->docLoader()->setReloading(d->m_bReloading);
         d->m_workingURL = KURL();
     }
 
-    // This flag is used to tell when a load has completed so we can be sure
-    // to process the data even if we have not yet determined the proper
-    // encoding.
-    if (complete) {
-        d->m_bComplete = true;    
-    }
-
     if (encoding != NULL) {
         enc = QString::fromCFString((CFStringRef) encoding);
         part->setEncoding(enc, true);

-- 
WebKit Debian packaging