[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 49ffcdb808d794789e602c81e5f28a1bb2a3f4e6
Author: darin <darin at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Tue Jun 4 16:47:01 2002 +0000

    	- fixed 2943897 -- Initial uncached load of amazon.com renders partial page.
    
    	* khtml/khtml_part.cpp: (KHTMLPart::setEncoding): Put the code that
    	reloads the page when the encoding is changed back inside APPLE_CHANGES.
    	This was causing partial loads because of how it interacts with our
    	way of saving up text and not decoding until we discover what the
    	encoding is.
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@1261 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog-2002-12-03 b/WebCore/ChangeLog-2002-12-03
index bd375b0..46e6cfe 100644
--- a/WebCore/ChangeLog-2002-12-03
+++ b/WebCore/ChangeLog-2002-12-03
@@ -1,3 +1,13 @@
+2002-06-04  Darin Adler  <darin at apple.com>
+
+	- fixed 2943897 -- Initial uncached load of amazon.com renders partial page.
+
+	* khtml/khtml_part.cpp: (KHTMLPart::setEncoding): Put the code that
+	reloads the page when the encoding is changed back inside APPLE_CHANGES.
+	This was causing partial loads because of how it interacts with our
+	way of saving up text and not decoding until we discover what the
+	encoding is.
+
 2002-06-03  Darin Adler  <darin at apple.com>
 
 	* LICENSE: Add 2002.
diff --git a/WebCore/ChangeLog-2003-10-25 b/WebCore/ChangeLog-2003-10-25
index bd375b0..46e6cfe 100644
--- a/WebCore/ChangeLog-2003-10-25
+++ b/WebCore/ChangeLog-2003-10-25
@@ -1,3 +1,13 @@
+2002-06-04  Darin Adler  <darin at apple.com>
+
+	- fixed 2943897 -- Initial uncached load of amazon.com renders partial page.
+
+	* khtml/khtml_part.cpp: (KHTMLPart::setEncoding): Put the code that
+	reloads the page when the encoding is changed back inside APPLE_CHANGES.
+	This was causing partial loads because of how it interacts with our
+	way of saving up text and not decoding until we discover what the
+	encoding is.
+
 2002-06-03  Darin Adler  <darin at apple.com>
 
 	* LICENSE: Add 2002.
diff --git a/WebCore/ChangeLog-2005-08-23 b/WebCore/ChangeLog-2005-08-23
index bd375b0..46e6cfe 100644
--- a/WebCore/ChangeLog-2005-08-23
+++ b/WebCore/ChangeLog-2005-08-23
@@ -1,3 +1,13 @@
+2002-06-04  Darin Adler  <darin at apple.com>
+
+	- fixed 2943897 -- Initial uncached load of amazon.com renders partial page.
+
+	* khtml/khtml_part.cpp: (KHTMLPart::setEncoding): Put the code that
+	reloads the page when the encoding is changed back inside APPLE_CHANGES.
+	This was causing partial loads because of how it interacts with our
+	way of saving up text and not decoding until we discover what the
+	encoding is.
+
 2002-06-03  Darin Adler  <darin at apple.com>
 
 	* LICENSE: Add 2002.
diff --git a/WebCore/khtml/khtml_part.cpp b/WebCore/khtml/khtml_part.cpp
index de87ee7..bfb4ef5 100644
--- a/WebCore/khtml/khtml_part.cpp
+++ b/WebCore/khtml/khtml_part.cpp
@@ -144,6 +144,7 @@ KHTMLPart::KHTMLPart( QWidget *parentWidget, const char *widgetname, QObject *pa
     KHTMLFactory::registerPart( this );
     setInstance( KHTMLFactory::instance(), prof == BrowserViewGUI && !parentPart() );
 #ifdef APPLE_CHANGES
+    // The widget is made outside this class in our case.
     init( 0, prof );
 #else
     init( new KHTMLView( this, parentWidget, widgetname ), prof );
@@ -1761,6 +1762,7 @@ bool KHTMLPart::setEncoding( const QString &name, bool override )
     d->m_encoding = name;
     d->m_haveEncoding = override;
 
+#ifndef APPLE_CHANGES
     if( !m_url.isEmpty() ) {
         // reload document
         closeURL();
@@ -1768,6 +1770,7 @@ bool KHTMLPart::setEncoding( const QString &name, bool override )
         m_url = 0;
         openURL(url);
     }
+#endif
 
     return true;
 }

-- 
WebKit Debian packaging