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

mjs mjs at 268f45cc-cd09-0410-ab3c-d52691b4dbfc
Sat Sep 26 06:28:34 UTC 2009


The following commit has been merged in the debian/unstable branch:
commit 1c337a952c3fda8135a11e2f1123bb4e3b0b3c64
Author: mjs <mjs at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Thu Aug 1 09:36:58 2002 +0000

    	Removed m_documentSource and remaining ill-conceived uses thereof.
    
            * kwq/KWQKHTMLPartImpl.h:
            * kwq/KWQKHTMLPartImpl.mm:
            (KWQKHTMLPartImpl::openURL): Don't initialize it.
            (KWQKHTMLPartImpl::write): Don't use it.
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@1710 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog-2002-12-03 b/WebCore/ChangeLog-2002-12-03
index 1ce1e59..06016eb 100644
--- a/WebCore/ChangeLog-2002-12-03
+++ b/WebCore/ChangeLog-2002-12-03
@@ -1,5 +1,14 @@
 2002-08-01  Maciej Stachowiak  <mjs at apple.com>
 
+	Removed m_documentSource and remaining ill-conceived uses thereof.
+	
+        * kwq/KWQKHTMLPartImpl.h:
+        * kwq/KWQKHTMLPartImpl.mm:
+        (KWQKHTMLPartImpl::openURL): Don't initialize it.
+        (KWQKHTMLPartImpl::write): Don't use it.
+
+2002-08-01  Maciej Stachowiak  <mjs at apple.com>
+
         Remove stuff formerly useful for "View Reconstructed Source"
 	feature but now useless.
 
diff --git a/WebCore/ChangeLog-2003-10-25 b/WebCore/ChangeLog-2003-10-25
index 1ce1e59..06016eb 100644
--- a/WebCore/ChangeLog-2003-10-25
+++ b/WebCore/ChangeLog-2003-10-25
@@ -1,5 +1,14 @@
 2002-08-01  Maciej Stachowiak  <mjs at apple.com>
 
+	Removed m_documentSource and remaining ill-conceived uses thereof.
+	
+        * kwq/KWQKHTMLPartImpl.h:
+        * kwq/KWQKHTMLPartImpl.mm:
+        (KWQKHTMLPartImpl::openURL): Don't initialize it.
+        (KWQKHTMLPartImpl::write): Don't use it.
+
+2002-08-01  Maciej Stachowiak  <mjs at apple.com>
+
         Remove stuff formerly useful for "View Reconstructed Source"
 	feature but now useless.
 
diff --git a/WebCore/ChangeLog-2005-08-23 b/WebCore/ChangeLog-2005-08-23
index 1ce1e59..06016eb 100644
--- a/WebCore/ChangeLog-2005-08-23
+++ b/WebCore/ChangeLog-2005-08-23
@@ -1,5 +1,14 @@
 2002-08-01  Maciej Stachowiak  <mjs at apple.com>
 
+	Removed m_documentSource and remaining ill-conceived uses thereof.
+	
+        * kwq/KWQKHTMLPartImpl.h:
+        * kwq/KWQKHTMLPartImpl.mm:
+        (KWQKHTMLPartImpl::openURL): Don't initialize it.
+        (KWQKHTMLPartImpl::write): Don't use it.
+
+2002-08-01  Maciej Stachowiak  <mjs at apple.com>
+
         Remove stuff formerly useful for "View Reconstructed Source"
 	feature but now useless.
 
diff --git a/WebCore/kwq/KWQKHTMLPart.h b/WebCore/kwq/KWQKHTMLPart.h
index 60fb11a..012cb95 100644
--- a/WebCore/kwq/KWQKHTMLPart.h
+++ b/WebCore/kwq/KWQKHTMLPart.h
@@ -118,7 +118,6 @@ private:
     int m_redirectionTimer;
     
     KURL m_baseURL;
-    QString m_documentSource;
     bool m_decodingStarted;
     
     friend class KHTMLPart;
diff --git a/WebCore/kwq/KWQKHTMLPart.mm b/WebCore/kwq/KWQKHTMLPart.mm
index 2ae9d62..68813fa 100644
--- a/WebCore/kwq/KWQKHTMLPart.mm
+++ b/WebCore/kwq/KWQKHTMLPart.mm
@@ -93,7 +93,6 @@ void KWQKHTMLPartImpl::openURL(const KURL &url)
     d->m_workingURL = url;
     part->m_url = url;
 
-    m_documentSource = "";
     m_decodingStarted = false;
 }
 
@@ -250,23 +249,9 @@ void KWQKHTMLPartImpl::write( const char *str, int len )
     double start = CFAbsoluteTimeGetCurrent();
 #endif
     
-    // FIXME: We are putting all the source into this QString for a few bad reasons.
-    // Once those reasons go away, we need to delete this.
-    m_documentSource += QString(str, len);
-
     QString decoded = d->m_decoder->decode(str, len);
     if (decoded.isEmpty()) {
-        // Check flag to tell whether the load has completed.
-        // If we get here, it means that no text encoding was available.
-        // Try to process what we have with the default encoding.
-        if (d->m_bComplete) {
-            // FIXME: We should get the decoder to give up its raw input since it buffers it
-            // rather than keeping our own copy.
-            decoded = m_documentSource;
-        } else {
-            fprintf (stderr, "WARNING:  DECODER unable to decode string, length = %d, total length = %d\n", len, m_documentSource.length());
-            return;
-        }
+	return;
     }
     
     if (!m_decodingStarted) {
diff --git a/WebCore/kwq/KWQKHTMLPartImpl.h b/WebCore/kwq/KWQKHTMLPartImpl.h
index 60fb11a..012cb95 100644
--- a/WebCore/kwq/KWQKHTMLPartImpl.h
+++ b/WebCore/kwq/KWQKHTMLPartImpl.h
@@ -118,7 +118,6 @@ private:
     int m_redirectionTimer;
     
     KURL m_baseURL;
-    QString m_documentSource;
     bool m_decodingStarted;
     
     friend class KHTMLPart;
diff --git a/WebCore/kwq/KWQKHTMLPartImpl.mm b/WebCore/kwq/KWQKHTMLPartImpl.mm
index 2ae9d62..68813fa 100644
--- a/WebCore/kwq/KWQKHTMLPartImpl.mm
+++ b/WebCore/kwq/KWQKHTMLPartImpl.mm
@@ -93,7 +93,6 @@ void KWQKHTMLPartImpl::openURL(const KURL &url)
     d->m_workingURL = url;
     part->m_url = url;
 
-    m_documentSource = "";
     m_decodingStarted = false;
 }
 
@@ -250,23 +249,9 @@ void KWQKHTMLPartImpl::write( const char *str, int len )
     double start = CFAbsoluteTimeGetCurrent();
 #endif
     
-    // FIXME: We are putting all the source into this QString for a few bad reasons.
-    // Once those reasons go away, we need to delete this.
-    m_documentSource += QString(str, len);
-
     QString decoded = d->m_decoder->decode(str, len);
     if (decoded.isEmpty()) {
-        // Check flag to tell whether the load has completed.
-        // If we get here, it means that no text encoding was available.
-        // Try to process what we have with the default encoding.
-        if (d->m_bComplete) {
-            // FIXME: We should get the decoder to give up its raw input since it buffers it
-            // rather than keeping our own copy.
-            decoded = m_documentSource;
-        } else {
-            fprintf (stderr, "WARNING:  DECODER unable to decode string, length = %d, total length = %d\n", len, m_documentSource.length());
-            return;
-        }
+	return;
     }
     
     if (!m_decodingStarted) {

-- 
WebKit Debian packaging



More information about the Pkg-webkit-commits mailing list