Changeset 14669 in webkit

Timestamp:

Jun 1, 2006 2:29:31 PM (18 years ago)

Author:

andersca

Message:

WebCore:

2006-06-01 Anders Carlsson <​acarlsson@apple.com>

Reviewed by Darin.

​http://bugzilla.opendarwin.org/show_bug.cgi?id=6309
multiple problems prevent bookmarking/back button technique for AJAX/DHTML applications from working

• bindings/js/kjs_window.cpp: (KJS::Location::put): Handle the case where the hash starts with a "#". Also, don't do anything if the previous and new hashes are equal.

• bridge/BrowserExtension.h:
• bridge/mac/BrowserExtensionMac.h:
• bridge/mac/BrowserExtensionMac.mm: (WebCore::BrowserExtensionMac::historyURL):
• bridge/mac/WebCoreFrameBridge.h:
• bridge/mac/WebCoreFrameBridge.mm: New function historyURL which returns the complete URL for a given item in the history.

• page/Frame.cpp: (WebCore::Frame::scheduleLocationChange): (WebCore::Frame::scheduleHistoryNavigation): If the URL of the new location only differs in the hash, don't schedule the load. Instead, load it directly.

• platform/KURL.cpp:
• platform/KURL.h: Add equalsIgnoringRef which returns whether two URLs are equal, ignoring the ref.

WebKit:

2006-06-01 Anders Carlsson <​acarlsson@apple.com>

Reviewed by Darin.

​http://bugzilla.opendarwin.org/show_bug.cgi?id=6309
multiple problems prevent bookmarking/back button technique for AJAX/DHTML applications from working

• Misc/WebNSURLExtras.m: (-[NSString _webkit_URLFragment]): Don't include the "#" character in the fragment.

• WebCoreSupport/WebFrameBridge.m: (-[WebFrameBridge historyURL:]): New function, returns the history URL for a given position in the back/forward list

• WebView/WebFrame.m: (-[WebFrame _loadItem:withLoadType:]): Always call scrollToAnchorWithURL, even if there is no fragment. This way we keep the WebCore frame's URL up-to-date.

WebKitTools:

2006-06-01 Anders Carlsson <​acarlsson@apple.com>

Reviewed by Darin.

• DumpRenderTree/DumpRenderTree.m: (+[LayoutTestController isSelectorExcludedFromWebScript:]): (-[LayoutTestController clearBackForwardList]): Add clearBackForwardList function to layoutTestController

LayoutTests:

2006-06-01 Anders Carlsson <​acarlsson@apple.com>

Reviewed by Darin.

​http://bugzilla.opendarwin.org/show_bug.cgi?id=6309
multiple problems prevent bookmarking/back button technique for AJAX/DHTML applications from working

• fast/dom/location-hash-expected.txt: Added.
• fast/dom/location-hash.html: Added. Added tests.

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/fast/dom/location-hash-expected.txt (added)
• LayoutTests/fast/dom/location-hash.html (added)
• WebCore/ChangeLog (modified) (1 diff)
• WebCore/WebCore.xcodeproj/project.pbxproj (modified) (2 diffs)
• WebCore/bindings/js/kjs_window.cpp (modified) (1 diff)
• WebCore/bridge/BrowserExtension.h (modified) (1 diff)
• WebCore/bridge/mac/BrowserExtensionMac.h (modified) (1 diff)
• WebCore/bridge/mac/BrowserExtensionMac.mm (modified) (1 diff)
• WebCore/bridge/mac/WebCoreFrameBridge.h (modified) (2 diffs)
• WebCore/bridge/mac/WebCoreFrameBridge.mm (modified) (1 diff)
• WebCore/page/Frame.cpp (modified) (3 diffs)
• WebCore/platform/KURL.cpp (modified) (1 diff)
• WebCore/platform/KURL.h (modified) (1 diff)
• WebKit/ChangeLog (modified) (1 diff)
• WebKit/Misc/WebNSURLExtras.m (modified) (1 diff)
• WebKit/WebCoreSupport/WebFrameBridge.m (modified) (1 diff)
• WebKit/WebKit.xcodeproj/project.pbxproj (modified) (2 diffs)
• WebKit/WebView/WebFrame.m (modified) (1 diff)
• WebKitTools/ChangeLog (modified) (1 diff)
• WebKitTools/DumpRenderTree/DumpRenderTree.m (modified) (2 diffs)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2006-06-01  Anders Carlsson  <acarlsson@apple.com>
+
+        Reviewed by Darin.
+
+        http://bugzilla.opendarwin.org/show_bug.cgi?id=6309
+        multiple problems prevent bookmarking/back button technique for AJAX/DHTML applications from working
+        
+        * fast/dom/location-hash-expected.txt: Added.
+        * fast/dom/location-hash.html: Added.
+        Added tests.
+        
 2006-06-01  Maciej Stachowiak  <mjs@apple.com>
 

trunk/WebCore/ChangeLog

@@ +1 @@
+2006-06-01  Anders Carlsson  <acarlsson@apple.com>
+
+        Reviewed by Darin.
+
+        http://bugzilla.opendarwin.org/show_bug.cgi?id=6309
+        multiple problems prevent bookmarking/back button technique for AJAX/DHTML applications from working
+        
+        * bindings/js/kjs_window.cpp:
+        (KJS::Location::put):
+        Handle the case where the hash starts with a "#". Also, don't do anything if the previous and new hashes
+        are equal.
+        
+        * bridge/BrowserExtension.h:
+        * bridge/mac/BrowserExtensionMac.h:
+        * bridge/mac/BrowserExtensionMac.mm:        
+        (WebCore::BrowserExtensionMac::historyURL):
+        * bridge/mac/WebCoreFrameBridge.h:
+        * bridge/mac/WebCoreFrameBridge.mm:
+        New function historyURL which returns the complete URL for a given item in the history.
+        
+        * page/Frame.cpp:
+        (WebCore::Frame::scheduleLocationChange):        
+        (WebCore::Frame::scheduleHistoryNavigation):
+        If the URL of the new location only differs in the hash, don't schedule the load. Instead, load it
+        directly.
+        
+        * platform/KURL.cpp:
+        * platform/KURL.h:
+        Add equalsIgnoringRef which returns whether two URLs are equal, ignoring the ref.
+
 2006-06-01  Anders Carlsson  <acarlsson@apple.com>
 

trunk/WebCore/WebCore.xcodeproj/project.pbxproj

@@ -1515 +1515 @@
                 FAE04190097596C9000540BE /* SVGImageLoader.h in Headers */ = {isa = PBXBuildFile; fileRef = FAE0418E097596C9000540BE /* SVGImageLoader.h */; };
 /* End PBXBuildFile section */
-
-/* Begin PBXBuildStyle section */
-                DB14676D0A237ECE00C9DD16 /* Development */ = {
-                        isa = PBXBuildStyle;
-                        buildSettings = {
-                                COPY_PHASE_STRIP = NO;
-                        };
-                        name = Development;
-                };
-                DB14676E0A237ECE00C9DD16 /* Deployment */ = {
-                        isa = PBXBuildStyle;
-                        buildSettings = {
-                                COPY_PHASE_STRIP = YES;
-                        };
-                        name = Deployment;
-                };
-/* End PBXBuildStyle section */
 
 /* Begin PBXContainerItemProxy section */
@@ -6187 +6170 @@
                         isa = PBXProject;
                         buildConfigurationList = 149C284308902B11008A9EFC /* Build configuration list for PBXProject "WebCore" */;
-                        buildSettings = {
-                        };
-                        buildStyles = (
-                                DB14676D0A237ECE00C9DD16 /* Development */,
-                                DB14676E0A237ECE00C9DD16 /* Deployment */,
-                        );
                         hasScannedForEncodings = 1;
                         knownRegions = (

trunk/WebCore/bindings/js/kjs_window.cpp

@@ -2108 +2108 @@
       break;
     }
-    case Hash:
+    case Hash: {
+      if (str.startsWith("#"))
+        str = str.mid(1);
+
+      if (url.ref() == str)
+          return;
+
       url.setRef(str);
       break;
+    }
     case Host: {
       DeprecatedString host = str.left(str.find(":"));

trunk/WebCore/bridge/BrowserExtension.h

@@ -66 +66 @@
     virtual int getHistoryLength() = 0;
     virtual void goBackOrForward(int distance) = 0;
-
+    virtual KURL historyURL(int distance) = 0;
+    
     virtual bool canRunModal() = 0;
     virtual bool canRunModalNow() = 0;

trunk/WebCore/bridge/mac/BrowserExtensionMac.h

@@ -45 +45 @@
     virtual int getHistoryLength();
     virtual void goBackOrForward(int distance);
+    virtual KURL historyURL(int distance);
 
     virtual bool canRunModal();

trunk/WebCore/bridge/mac/BrowserExtensionMac.mm

@@ -166 +166 @@
 }
 
+KURL BrowserExtensionMac::historyURL(int distance)
+{
+    BEGIN_BLOCK_OBJC_EXCEPTIONS;
+    return KURL([m_frame->bridge() historyURL:distance]);
+    END_BLOCK_OBJC_EXCEPTIONS;
+    return KURL();
+}
+
 bool BrowserExtensionMac::canRunModal()
 {

trunk/WebCore/bridge/mac/WebCoreFrameBridge.h

@@ -254 +254 @@
 - (void)removeFromFrame;
 
-- (void)scrollToAnchor:(NSString *)anchor;
 - (void)scrollToAnchorWithURL:(NSURL *)URL;
 
@@ -618 +617 @@
 - (void)goBackOrForward:(int)distance;
 - (BOOL)canGoBackOrForward:(int)distance;
+- (NSURL *)historyURL:(int)distance;
 
 - (void)textFieldDidBeginEditing:(DOMHTMLInputElement *)element;

trunk/WebCore/bridge/mac/WebCoreFrameBridge.mm

@@ -737 +737 @@
 }
 
-- (void)scrollToAnchor:(NSString *)anchor
-{
-    m_frame->gotoAnchor(anchor);
-}
-
 - (BOOL)isSelectionEditable
 {

trunk/WebCore/page/Frame.cpp

@@ -899 +899 @@
 void Frame::scheduleLocationChange(const DeprecatedString& url, const DeprecatedString& referrer, bool lockHistory, bool userGesture)
 {
+    KURL u(url);
+    
+    // If the URL we're going to navigate to is the same as the current one, except for the
+    // fragment part, we don't need to schedule the location change.
+    if (u.hasRef() && equalIgnoringRef(d->m_url, u)) {
+        changeLocation(url, referrer, lockHistory, userGesture);
+        return;
+    }
+        
     // Handle a location change of a page with no document as a special case.
     // This may happen when a frame changes the location of another frame.
@@ -909 +918 @@
         stopLoading(true);   
     }
-    
+
     d->m_delayRedirect = 0;
     d->m_redirectURL = url;
@@ -943 +952 @@
     }
 
+    // If the URL we're going to navigate to is the same as the current one, except for the
+    // fragment part, we don't need to schedule the navigation.
+    if (d->m_extension) {
+        KURL u = d->m_extension->historyURL(steps);
+        
+        if (equalIgnoringRef(d->m_url, u)) {
+            d->m_extension->goBackOrForward(steps);
+            return;
+        }
+    }
+    
     d->m_scheduledRedirection = historyNavigationScheduled;
     d->m_delayRedirect = 0;

trunk/WebCore/platform/KURL.cpp

@@ -1201 +1201 @@
 }
 
-bool urlcmp(const DeprecatedString &a, const DeprecatedString &b, bool ignoreTrailingSlash, bool ignoreRef)
-{
-    if (ignoreRef) {
-        KURL aURL(a);
-        KURL bURL(b);
-        if (aURL.m_isValid && bURL.m_isValid)
-            return aURL.urlString.left(aURL.queryEndPos) == bURL.urlString.left(bURL.queryEndPos);
-    }
-    return a == b;
+bool equalIgnoringRef(const KURL& a, const KURL& b) const;
+{
+    return a.urlString.left(a.queryEndPos) == b.urlString.left(b.queryEndPos);
 }
 

trunk/WebCore/platform/KURL.h

@@ -111 +111 @@
     int fragmentEndPos;
     
-    // True if both URLs are the same.
-    friend bool urlcmp(const DeprecatedString &URLA, const DeprecatedString &URLB, bool ignoreTrailingSlash, bool ignoreRef);
+    friend bool equalIgnoringRef(const KURL& a, const KURL& b);
 };
 

trunk/WebKit/ChangeLog

@@ +1 @@
+2006-06-01  Anders Carlsson  <acarlsson@apple.com>
+
+        Reviewed by Darin.
+
+        http://bugzilla.opendarwin.org/show_bug.cgi?id=6309
+        multiple problems prevent bookmarking/back button technique for AJAX/DHTML applications from working
+
+        * Misc/WebNSURLExtras.m:
+        (-[NSString _webkit_URLFragment]):
+        Don't include the "#" character in the fragment.
+        
+        * WebCoreSupport/WebFrameBridge.m:
+        (-[WebFrameBridge historyURL:]):
+        New function, returns the history URL for a given position in the back/forward list
+        
+        * WebView/WebFrame.m:
+        (-[WebFrame _loadItem:withLoadType:]):
+        Always call scrollToAnchorWithURL, even if there is no fragment. This way we keep the WebCore frame's
+        URL up-to-date.
+
 2006-06-01  Maciej Stachowiak  <mjs@apple.com>
 

trunk/WebKit/Misc/WebNSURLExtras.m

@@ -1088 +1088 @@
     if (fragmentRange.location == NSNotFound)
         return nil;
-    return [self substringFromIndex:fragmentRange.location];
+    return [self substringFromIndex:fragmentRange.location + 1];
 }
 

trunk/WebKit/WebCoreSupport/WebFrameBridge.m

@@ -1240 +1240 @@
 }
 
+- (NSURL*)historyURL:(int)distance
+{
+    WebView *webView = [self webView];
+    WebBackForwardList *list = [webView backForwardList];
+    WebHistoryItem *item = [list itemAtIndex:distance];
+    if (!item) {
+        if (distance > 0) {
+            int forwardListCount = [list forwardListCount];
+            if (forwardListCount > 0)
+                item = [list itemAtIndex:forwardListCount];
+        } else {
+            int backListCount = [list forwardListCount];
+            if (backListCount > 0)
+                item = [list itemAtIndex:-backListCount];
+        }
+    }
+    if (item)
+        return [item URL];
+    
+    return nil;
+}
+
 static id <WebFormDelegate> formDelegate(WebFrameBridge *self)
 {

trunk/WebKit/WebKit.xcodeproj/project.pbxproj

@@ -281 +281 @@
                 ED7F6D8B0980683500C235ED /* WebNSDataExtrasPrivate.h in Headers */ = {isa = PBXBuildFile; fileRef = ED7F6D8A0980683500C235ED /* WebNSDataExtrasPrivate.h */; settings = {ATTRIBUTES = (Private, ); }; };
 /* End PBXBuildFile section */
-
-/* Begin PBXBuildStyle section */
-                BC5D261E0A2E3FC000102DF0 /* Development */ = {
-                        isa = PBXBuildStyle;
-                        buildSettings = {
-                                COPY_PHASE_STRIP = NO;
-                        };
-                        name = Development;
-                };
-                BC5D261F0A2E3FC000102DF0 /* Deployment */ = {
-                        isa = PBXBuildStyle;
-                        buildSettings = {
-                                COPY_PHASE_STRIP = YES;
-                        };
-                        name = Deployment;
-                };
-/* End PBXBuildStyle section */
 
 /* Begin PBXFileReference section */
@@ -1257 +1240 @@
                         isa = PBXProject;
                         buildConfigurationList = 149C283208902B0F008A9EFC /* Build configuration list for PBXProject "WebKit" */;
-                        buildSettings = {
-                        };
-                        buildStyles = (
-                                BC5D261E0A2E3FC000102DF0 /* Development */,
-                                BC5D261F0A2E3FC000102DF0 /* Deployment */,
-                        );
                         hasScannedForEncodings = 1;
                         knownRegions = (

trunk/WebKit/WebView/WebFrame.m

@@ -1335 +1335 @@
         // FIXME: form state might want to be saved here too
 
-        // FIXME: Perhaps we can use scrollToAnchorWithURL here instead and remove the older scrollToAnchor:?
-        NSString *anchor = [[item URLString] _webkit_URLFragment];
-        if (anchor)
-            [[_private->dataSource _bridge] scrollToAnchor: anchor];
+        // We always call scrollToAnchorWithURL here, even if the URL doesn't have an
+        // anchor fragment. This is so we'll keep the WebCore Frame's URL up-to-date.
+        [[_private->dataSource _bridge] scrollToAnchorWithURL:[item URL]];
     
         // must do this maintenance here, since we don't go through a real page reload

trunk/WebKitTools/ChangeLog

@@ +1 @@
+2006-06-01  Anders Carlsson  <acarlsson@apple.com>
+
+        Reviewed by Darin.
+
+        * DumpRenderTree/DumpRenderTree.m:
+        (+[LayoutTestController isSelectorExcludedFromWebScript:]):
+        (-[LayoutTestController clearBackForwardList]):
+        Add clearBackForwardList function to layoutTestController
+        
 2006-06-01  Anders Carlsson  <acarlsson@apple.com>
 

trunk/WebKitTools/DumpRenderTree/DumpRenderTree.m

@@ -598 +598 @@
             || aSelector == @selector(display)
             || aSelector == @selector(testRepaint)
-            || aSelector == @selector(repaintSweepHorizontally))
+            || aSelector == @selector(repaintSweepHorizontally)
+            || aSelector == @selector(clearBackForwardList))
         return NO;
     return YES;
@@ -610 +611 @@
         return @"setMainFrameIsFirstResponder";
     return nil;
+}
+
+- (void)clearBackForwardList
+{
+    WebBackForwardList *backForwardList = [[frame webView] backForwardList];
+    WebHistoryItem *item = [[backForwardList currentItem] retain];
+
+    // We clear the history by setting the back/forward list's capacity to 0
+    // then restoring it back and adding back the current item.
+    int capacity = [backForwardList capacity];
+    [backForwardList setCapacity:0];
+    [backForwardList setCapacity:capacity];
+    [backForwardList addItem:item];
+    [backForwardList goToItem:item];
+    [item release];
 }