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

[trey]

The following commit has been merged in the debian/unstable branch:
commit cb2af8e964ebcc489c765320494017d1b33480b1
Author: trey <trey at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Wed Apr 2 18:44:58 2003 +0000

    WebCore:
    
    	3119711 - redirects to anchors leave window half-loaded (was SCClib.org is half loaded, half rendered)
    
    	The problem happened when an anchor nav was the last half of a client redirect.
    	We would never stop the redirect timer, and thus never post a clientRedirectCanceled
    	message up through the stack.  This left the app thinking that it was in redirect
    	mode even when the whole navigation had finished, which makes it not clear the
    	progress bar.
    
            Reviewed by Darin.
    
            * kwq/KWQKHTMLPart.mm:
            (KWQKHTMLPart::scrollToAnchor):  Stop the redirect timer.
    
    WebBrowser:
    
    	3119711 - redirects to anchors leave window half-loaded (was SCClib.org is half loaded, half rendered)
    
    	The problem happened when an anchor nav was the last half of a client redirect.
    	This case implies that an anchor nav must do the end-of-load cleanup, and not assume
    	that only a scroll was done to accomplish the nav.  Note additional fix was
    	also needed in WebCore.
    
            Reviewed by Darin.
    
            * LocationChangeHandler.m:
            (-[LocationChangeHandler webView:locationChangedWithinPageForDataSource:]):
    	Update our page loading status.  Finish up the progress bar, if it was showing
    	non-zero progress.
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@3997 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog-2003-10-25 b/WebCore/ChangeLog-2003-10-25
index 3dccbef..e7e4a28 100644
--- a/WebCore/ChangeLog-2003-10-25
+++ b/WebCore/ChangeLog-2003-10-25
@@ -1,3 +1,18 @@
+2003-04-01  Trey Matteson  <trey at apple.com>
+
+	3119711 - redirects to anchors leave window half-loaded (was SCClib.org is half loaded, half rendered)
+
+	The problem happened when an anchor nav was the last half of a client redirect.
+	We would never stop the redirect timer, and thus never post a clientRedirectCanceled
+	message up through the stack.  This left the app thinking that it was in redirect
+	mode even when the whole navigation had finished, which makes it not clear the
+	progress bar.
+
+        Reviewed by Darin.
+
+        * kwq/KWQKHTMLPart.mm:
+        (KWQKHTMLPart::scrollToAnchor):  Stop the redirect timer.
+
 2003-04-01  Maciej Stachowiak  <mjs at apple.com>
 
         Reviewed by Dave.
diff --git a/WebCore/ChangeLog-2005-08-23 b/WebCore/ChangeLog-2005-08-23
index 3dccbef..e7e4a28 100644
--- a/WebCore/ChangeLog-2005-08-23
+++ b/WebCore/ChangeLog-2005-08-23
@@ -1,3 +1,18 @@
+2003-04-01  Trey Matteson  <trey at apple.com>
+
+	3119711 - redirects to anchors leave window half-loaded (was SCClib.org is half loaded, half rendered)
+
+	The problem happened when an anchor nav was the last half of a client redirect.
+	We would never stop the redirect timer, and thus never post a clientRedirectCanceled
+	message up through the stack.  This left the app thinking that it was in redirect
+	mode even when the whole navigation had finished, which makes it not clear the
+	progress bar.
+
+        Reviewed by Darin.
+
+        * kwq/KWQKHTMLPart.mm:
+        (KWQKHTMLPart::scrollToAnchor):  Stop the redirect timer.
+
 2003-04-01  Maciej Stachowiak  <mjs at apple.com>
 
         Reviewed by Dave.
diff --git a/WebCore/kwq/KWQKHTMLPart.mm b/WebCore/kwq/KWQKHTMLPart.mm
index fae2824..fb3612a 100644
--- a/WebCore/kwq/KWQKHTMLPart.mm
+++ b/WebCore/kwq/KWQKHTMLPart.mm
@@ -1091,6 +1091,9 @@ bool KWQKHTMLPart::keyEvent(NSEvent *event)
 // that a higher level already checked that the URLs match and the scrolling is the right thing to do.
 void KWQKHTMLPart::scrollToAnchor(const KURL &URL)
 {
+    d->m_redirectionTimer.stop();
+    d->m_scheduledRedirection = noRedirectionScheduled;
+
     m_url = URL;
     started(0);
 

-- 
WebKit Debian packaging