Changeset 30571 in webkit

Timestamp:

Feb 25, 2008 9:33:47 AM (16 years ago)

Author:

Darin Adler

Message:

WebCore:

Reviewed by Anders.
Based on a patch by Tim Steele <​timsteele41@gmail.com>.

• fix ​http://bugs.webkit.org/show_bug.cgi?id=17186 Fragment navigation within a page permanently cancels meta refresh

Test: fast/loader/meta-refresh-anchor-click.html

• loader/FrameLoader.cpp: (WebCore::FrameLoader::load): When load type is FrameLoadTypeRedirectWithLockedHistory, always do a real load. This makes sure that meta refresh loads are treated as real loads rather than anchor scrolls. Also tweaked formatting a bit. (WebCore::FrameLoader::continueFragmentScrollAfterNavigationPolicy): This function is an alternate way to complete a load, so it needs to start the redirection timer if redirection has already been scheduled.

LayoutTests:

Reviewed by Anders.

• test for ​http://bugs.webkit.org/show_bug.cgi?id=17186 Fragment navigation within a page permanently cancels meta refresh

• fast/loader/meta-refresh-anchor-click-expected.txt: Added.
• fast/loader/meta-refresh-anchor-click.html: Added.
• fast/loader/resources/meta-refresh-subframe.html: Added.

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/fast/loader/meta-refresh-anchor-click-expected.txt (added)
• LayoutTests/fast/loader/meta-refresh-anchor-click.html (added)
• LayoutTests/fast/loader/resources/meta-refresh-subframe.html (added)
• WebCore/ChangeLog (modified) (1 diff)
• WebCore/loader/FrameLoader.cpp (modified) (7 diffs)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2008-02-25  Darin Adler  <darin@apple.com>
+
+        Reviewed by Anders.
+
+        - test for http://bugs.webkit.org/show_bug.cgi?id=17186
+          Fragment navigation within a page permanently cancels meta refresh
+
+        * fast/loader/meta-refresh-anchor-click-expected.txt: Added.
+        * fast/loader/meta-refresh-anchor-click.html: Added.
+        * fast/loader/resources/meta-refresh-subframe.html: Added.
+
 2008-02-25  Johnny Ding  <johnnyding.webkit@gmail.com>
 

trunk/WebCore/ChangeLog

@@ +1 @@
+2008-02-25  Darin Adler  <darin@apple.com>
+
+        Reviewed by Anders.
+        Based on a patch by Tim Steele <timsteele41@gmail.com>.
+
+        - fix http://bugs.webkit.org/show_bug.cgi?id=17186
+          Fragment navigation within a page permanently cancels meta refresh
+
+        Test: fast/loader/meta-refresh-anchor-click.html
+
+        * loader/FrameLoader.cpp:
+        (WebCore::FrameLoader::load): When load type is FrameLoadTypeRedirectWithLockedHistory,
+        always do a real load. This makes sure that meta refresh loads are treated as real loads
+        rather than anchor scrolls. Also tweaked formatting a bit.
+        (WebCore::FrameLoader::continueFragmentScrollAfterNavigationPolicy): This function is
+        an alternate way to complete a load, so it needs to start the redirection timer if
+        redirection has already been scheduled.
+
 2008-02-25  Dan Bernstein  <mitz@apple.com>
 

trunk/WebCore/loader/FrameLoader.cpp

@@ -2012 +2012 @@
     // work properly.
     if (!isFormSubmission
-        && newLoadType != FrameLoadTypeReload
-        && newLoadType != FrameLoadTypeSame
-        && !shouldReload(newURL, url())
-        // We don't want to just scroll if a link from within a
-        // frameset is trying to reload the frameset into _top.
-        && !m_frame->isFrameSet()) {
+            && newLoadType != FrameLoadTypeRedirectWithLockedHistory
+            && newLoadType != FrameLoadTypeReload
+            && newLoadType != FrameLoadTypeSame
+            && !shouldReload(newURL, url())
+            && !m_frame->isFrameSet()) {
 
         // Just do anchor navigation within the existing content.
@@ -2023 +2022 @@
         // We don't do this if we are submitting a form, explicitly reloading,
         // 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.
+
+        // These rules were originally based on what KHTML was doing in KHTMLPart::openURL.
         
         // FIXME: What about load types other than Standard and Reload?
@@ -2032 +2032 @@
             callContinueFragmentScrollAfterNavigationPolicy, this);
     } else {
-        // must grab this now, since this load may stop the previous load and clear this flag
+        // must grab m_quickRedirectComing now, since this load may stop the previous load and clear this flag.
         bool isRedirect = m_quickRedirectComing;
         load(request, action, newLoadType, formState);
@@ -2039 +2039 @@
             if (m_provisionalDocumentLoader)
                 m_provisionalDocumentLoader->setIsClientRedirect(true);
-        } else if (sameURL)
+        } else if (sameURL) {
             // Example of this case are sites that reload the same URL with a different cookie
             // driving the generated content, or a master frame with links that drive a target
             // frame, where the user has clicked on the same link repeatedly.
             m_loadType = FrameLoadTypeSame;
+        }
     }
 }
@@ -3148 +3149 @@
 void FrameLoader::tokenizerProcessedData()
 {
-//    ASSERT(m_frame->page());
-//    ASSERT(m_frame->document());
-
     checkCompleted();
 }
@@ -3395 +3393 @@
 void FrameLoader::continueFragmentScrollAfterNavigationPolicy(const ResourceRequest& request, bool shouldContinue)
 {
-    // FIXME:
-    // some functions check m_quickRedirectComing, and others check for
-    // FrameLoadTypeRedirectWithLockedHistory.  
+    // FIXME: Some functions check m_quickRedirectComing, and others check for
+    // FrameLoadTypeRedirectWithLockedHistory; need to unify these.  
     bool isRedirect = m_quickRedirectComing || m_policyLoadType == FrameLoadTypeRedirectWithLockedHistory;
     m_quickRedirectComing = false;
@@ -3424 +3421 @@
     scrollToAnchor(url);
     
-    if (!isRedirect)
+    if (!isRedirect) {
         // This will clear previousItem from the rest of the frame tree that didn't
         // doing any loading. We need to make a pass on this now, since for anchor nav
         // we'll not go through a real load and reach Completed state.
         checkLoadComplete();
+    }
  
     m_client->dispatchDidChangeLocationWithinPage();
     m_client->didFinishLoad();
+
+    if (m_scheduledRedirection && !m_redirectionTimer.isActive())
+        startRedirectionTimer();
 }