[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 102b38aebb94526593a4f9a753d46ec0c8c72f2c
Author: mjs <mjs at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Tue Dec 10 05:45:02 2002 +0000

            Reviewed by Trey.
    
    	- fixed 3123057 - SJ: DHTML doesn't always work on http://www.pixar.com/howwedoit/
    
            * WebView.subproj/WebFramePrivate.m:
            (-[WebFrame _loadURL:loadType:triggeringEvent:isFormSubmission:]):
    	Treat a click on a link to the same URL with an anchor as a scroll
    	to anchor, not a same URL load.
            (-[WebFrame _continueFragmentScrollAfterNavigationPolicy:request:]): Avoid
    	adding the same anchor URL to the back/forward list many times.
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@2986 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit/ChangeLog b/WebKit/ChangeLog
index abf07a8..4cad048 100644
--- a/WebKit/ChangeLog
+++ b/WebKit/ChangeLog
@@ -1,3 +1,16 @@
+2002-12-09  Maciej Stachowiak  <mjs at apple.com>
+
+        Reviewed by Trey.
+
+	- fixed 3123057 - SJ: DHTML doesn't always work on http://www.pixar.com/howwedoit/
+	
+        * WebView.subproj/WebFramePrivate.m:
+        (-[WebFrame _loadURL:loadType:triggeringEvent:isFormSubmission:]):
+	Treat a click on a link to the same URL with an anchor as a scroll
+	to anchor, not a same URL load.
+        (-[WebFrame _continueFragmentScrollAfterNavigationPolicy:request:]): Avoid
+	adding the same anchor URL to the back/forward list many times.
+
 2002-12-09  Darin Adler  <darin at apple.com>
 
         Reviewed by Maciej.
diff --git a/WebKit/WebView.subproj/WebFramePrivate.m b/WebKit/WebView.subproj/WebFramePrivate.m
index 6e3ee46..0525c95 100644
--- a/WebKit/WebView.subproj/WebFramePrivate.m
+++ b/WebKit/WebView.subproj/WebFramePrivate.m
@@ -1246,7 +1246,7 @@ static CFAbsoluteTime _timeOfLastCompletedLoad;
     _private->quickRedirectComing = NO;
 
     [dataSrc _setURL:URL];
-    if (!isRedirect) {
+    if (!isRedirect && ![self _shouldTreatURLAsSameAsCurrent:URL]) {
         ASSERT(![_private previousItem]);
         // NB: must happen after _setURL, since we add based on the current request.
         // Must also happen before we openURL and displace the scroll position, since
@@ -1303,8 +1303,10 @@ static CFAbsoluteTime _timeOfLastCompletedLoad;
 
     BOOL sameURL = [self _shouldTreatURLAsSameAsCurrent:URL];
 
+    // Make sure to do scroll to anchor processing even if the URL is
+    // exactly the same so pages with '#' links and DHTML side effects
+    // work properly.
     if (!isFormSubmission
-        && !sameURL
         && loadType != WebFrameLoadTypeReload
         && loadType != WebFrameLoadTypeSame
         && ![_private->bridge isFrameSet]

-- 
WebKit Debian packaging