[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 b02eda561af3bf002cd6eb2187533612b23882bd
Author: darin <darin at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Mon Aug 12 09:35:16 2002 +0000

    WebCore:
    
    	- re-fixed 2948387 -- stop button flashes to "go" two extra times while loading citibank.com
    
    	It turns out Maciej and I rebroke this when we made the "completed" code run.
    	There was a related APPLE_CHANGES that had to be removed so that we do each redirect only once.
    	Doing the redirect multiple times sent confusing signals to the web browser.
    
            * khtml/khtml_part.cpp: (KHTMLPart::scheduleRedirection): Remove APPLE_CHANGES so we don't
    	try to redirect until the page is complete.
    
    WebBrowser:
    
    	Fixed a small thing related to bug 2948387.
    
            * BrowserDocument.m: (-[BrowserDocument displayName]): Leave title saying
    	"Loading" as long as _instantRedirectPending is YES.
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@1797 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog-2002-12-03 b/WebCore/ChangeLog-2002-12-03
index 8f36bd7..94c801d 100644
--- a/WebCore/ChangeLog-2002-12-03
+++ b/WebCore/ChangeLog-2002-12-03
@@ -1,3 +1,14 @@
+2002-08-12  Darin Adler  <darin at apple.com>
+
+	- re-fixed 2948387 -- stop button flashes to "go" two extra times while loading citibank.com
+
+	It turns out Maciej and I rebroke this when we made the "completed" code run.
+	There was a related APPLE_CHANGES that had to be removed so that we do each redirect only once.
+	Doing the redirect multiple times sent confusing signals to the web browser.
+
+        * khtml/khtml_part.cpp: (KHTMLPart::scheduleRedirection): Remove APPLE_CHANGES so we don't
+	try to redirect until the page is complete.
+
 === Alexander-17 ===
 
 2002-08-10  Ken Kocienda  <kocienda at apple.com>
diff --git a/WebCore/ChangeLog-2003-10-25 b/WebCore/ChangeLog-2003-10-25
index 8f36bd7..94c801d 100644
--- a/WebCore/ChangeLog-2003-10-25
+++ b/WebCore/ChangeLog-2003-10-25
@@ -1,3 +1,14 @@
+2002-08-12  Darin Adler  <darin at apple.com>
+
+	- re-fixed 2948387 -- stop button flashes to "go" two extra times while loading citibank.com
+
+	It turns out Maciej and I rebroke this when we made the "completed" code run.
+	There was a related APPLE_CHANGES that had to be removed so that we do each redirect only once.
+	Doing the redirect multiple times sent confusing signals to the web browser.
+
+        * khtml/khtml_part.cpp: (KHTMLPart::scheduleRedirection): Remove APPLE_CHANGES so we don't
+	try to redirect until the page is complete.
+
 === Alexander-17 ===
 
 2002-08-10  Ken Kocienda  <kocienda at apple.com>
diff --git a/WebCore/ChangeLog-2005-08-23 b/WebCore/ChangeLog-2005-08-23
index 8f36bd7..94c801d 100644
--- a/WebCore/ChangeLog-2005-08-23
+++ b/WebCore/ChangeLog-2005-08-23
@@ -1,3 +1,14 @@
+2002-08-12  Darin Adler  <darin at apple.com>
+
+	- re-fixed 2948387 -- stop button flashes to "go" two extra times while loading citibank.com
+
+	It turns out Maciej and I rebroke this when we made the "completed" code run.
+	There was a related APPLE_CHANGES that had to be removed so that we do each redirect only once.
+	Doing the redirect multiple times sent confusing signals to the web browser.
+
+        * khtml/khtml_part.cpp: (KHTMLPart::scheduleRedirection): Remove APPLE_CHANGES so we don't
+	try to redirect until the page is complete.
+
 === Alexander-17 ===
 
 2002-08-10  Ken Kocienda  <kocienda at apple.com>
diff --git a/WebCore/khtml/khtml_part.cpp b/WebCore/khtml/khtml_part.cpp
index 95726f5..192720c 100644
--- a/WebCore/khtml/khtml_part.cpp
+++ b/WebCore/khtml/khtml_part.cpp
@@ -1734,14 +1734,10 @@ void KHTMLPart::scheduleRedirection( int delay, const QString &url, bool doLockH
        d->m_delayRedirect = delay;
        d->m_redirectURL = url;
        d->m_redirectLockHistory = doLockHistory;
-#ifndef APPLE_CHANGES
        if ( d->m_bComplete ) {
-#endif
          d->m_redirectionTimer.stop();
          d->m_redirectionTimer.start( 1000 * d->m_delayRedirect, true );
-#ifndef APPLE_CHANGES
        }
-#endif
     }
 }
 

-- 
WebKit Debian packaging