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

[rjw]

The following commit has been merged in the debian/unstable branch:
commit 4a8bc25b4897f6581eaaddca83059e6ce4564199
Author: rjw <rjw at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Tue Sep 30 23:04:14 2003 +0000

    	Fixed 3420396.  If a frame targets _top and a URL that contains a fragment (very unusual, it's meaningless for a frameset to contain a named anchor point) the frameset won't be reloaded.  Our normal path is to just scroll to the anchor point.  This is only important because our Help folks oddly depend on the behavior.
    
            Reviewed by Chris.
    
            * WebView.subproj/WebFramePrivate.m:
            (-[WebFrame _loadURL:referrer:loadType:target:triggeringEvent:form:formValues:]):
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@5093 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit/ChangeLog b/WebKit/ChangeLog
index 418f3b9..303f241 100644
--- a/WebKit/ChangeLog
+++ b/WebKit/ChangeLog
@@ -1,3 +1,12 @@
+2003-09-30  Richard Williamson   <rjw at apple.com>
+
+	Fixed 3420396.  If a frame targets _top and a URL that contains a fragment (very unusual, it's meaningless for a frameset to contain a named anchor point) the frameset won't be reloaded.  Our normal path is to just scroll to the anchor point.  This is only important because our Help folks oddly depend on the behavior.
+
+        Reviewed by Chris.
+
+        * WebView.subproj/WebFramePrivate.m:
+        (-[WebFrame _loadURL:referrer:loadType:target:triggeringEvent:form:formValues:]):
+
 2003-09-30  Ken Kocienda  <kocienda at apple.com>
 
         Reviewed by Maciej
diff --git a/WebKit/WebView.subproj/WebFramePrivate.m b/WebKit/WebView.subproj/WebFramePrivate.m
index 3e2b44c..1931b02 100644
--- a/WebKit/WebView.subproj/WebFramePrivate.m
+++ b/WebKit/WebView.subproj/WebFramePrivate.m
@@ -1716,7 +1716,11 @@ static CFAbsoluteTime _timeOfLastCompletedLoad;
     if (!isFormSubmission
         && loadType != WebFrameLoadTypeReload
         && loadType != WebFrameLoadTypeSame
-        && ![self _shouldReloadForCurrent:URL andDestination:[_private->bridge URL]]) {
+        && ![self _shouldReloadForCurrent:URL andDestination:[_private->bridge URL]]
+
+        // We don't want to just scroll if a link from within a
+        // frameset is trying to reload the frameset into _top.
+        && ![_private->bridge isFrameSet]) {
         
         // Just do anchor navigation within the existing content.
         
@@ -1724,10 +1728,6 @@ static CFAbsoluteTime _timeOfLastCompletedLoad;
         // currently displaying a frameset, or if the new URL does not have a fragment.
         // These rules are based on what KHTML was doing in KHTMLPart::openURL.
         
-        // One reason we only do this if there is an anchor in the URL is that
-        // this might prevent us from reloading a document that has subframes that are
-        // different than what we're displaying (in other words, a link from within a
-        // frame is trying to reload the frameset into _top).
         
         // FIXME: What about load types other than Standard and Reload?
 

-- 
WebKit Debian packaging