Changeset 30738 in webkit
- Timestamp:
- Mar 4, 2008 1:11:35 AM (16 years ago)
- Location:
- trunk
- Files:
-
- 3 deleted
- 3 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/LayoutTests/ChangeLog
r30735 r30738 1 2008-03-04 Alexey Proskuryakov <ap@webkit.org> 2 3 Suggested by Darin, rubber-stamped by Mark. 4 5 http://bugs.webkit.org/show_bug.cgi?id=17569 6 REGRESSION (r30571): Buzzword.com doesn't load 7 8 Rolling out r30571, as determining what is wrong with it proved tricky. 9 10 * fast/loader/meta-refresh-anchor-click-expected.txt: Removed. 11 * fast/loader/meta-refresh-anchor-click.html: Removed. 12 * fast/loader/resources/meta-refresh-subframe.html: Removed. 13 1 14 2008-03-03 Sam Weinig <sam@webkit.org> 2 15 -
trunk/WebCore/ChangeLog
r30736 r30738 1 2008-03-04 Alexey Proskuryakov <ap@webkit.org> 2 3 Suggested by Darin, rubber-stamped by Mark. 4 5 http://bugs.webkit.org/show_bug.cgi?id=17569 6 REGRESSION (r30571): Buzzword.com doesn't load 7 8 Rolling out r30571, as determining what is wrong with it proved tricky. 9 10 * loader/FrameLoader.cpp: 11 (WebCore::FrameLoader::load): 12 (WebCore::FrameLoader::tokenizerProcessedData): 13 (WebCore::FrameLoader::continueFragmentScrollAfterNavigationPolicy): 14 1 15 2008-03-04 Sam Weinig <sam@webkit.org> 2 16 -
trunk/WebCore/loader/FrameLoader.cpp
r30709 r30738 2014 2014 // work properly. 2015 2015 if (!isFormSubmission 2016 && newLoadType != FrameLoadTypeRedirectWithLockedHistory 2017 && newLoadType != FrameLoadTypeReload 2018 && newLoadType != FrameLoadTypeSame 2019 && !shouldReload(newURL, url()) 2020 && !m_frame->isFrameSet()) { 2016 && newLoadType != FrameLoadTypeReload 2017 && newLoadType != FrameLoadTypeSame 2018 && !shouldReload(newURL, url()) 2019 // We don't want to just scroll if a link from within a 2020 // frameset is trying to reload the frameset into _top. 2021 && !m_frame->isFrameSet()) { 2021 2022 2022 2023 // Just do anchor navigation within the existing content. … … 2024 2025 // We don't do this if we are submitting a form, explicitly reloading, 2025 2026 // currently displaying a frameset, or if the new URL does not have a fragment. 2026 2027 // These rules were originally based on what KHTML was doing in KHTMLPart::openURL. 2027 // These rules are based on what KHTML was doing in KHTMLPart::openURL. 2028 2028 2029 2029 // FIXME: What about load types other than Standard and Reload? … … 2034 2034 callContinueFragmentScrollAfterNavigationPolicy, this); 2035 2035 } else { 2036 // must grab m_quickRedirectComing now, since this load may stop the previous load and clear this flag.2036 // must grab this now, since this load may stop the previous load and clear this flag 2037 2037 bool isRedirect = m_quickRedirectComing; 2038 2038 load(request, action, newLoadType, formState); … … 2041 2041 if (m_provisionalDocumentLoader) 2042 2042 m_provisionalDocumentLoader->setIsClientRedirect(true); 2043 } else if (sameURL) {2043 } else if (sameURL) 2044 2044 // Example of this case are sites that reload the same URL with a different cookie 2045 2045 // driving the generated content, or a master frame with links that drive a target 2046 2046 // frame, where the user has clicked on the same link repeatedly. 2047 2047 m_loadType = FrameLoadTypeSame; 2048 }2049 2048 } 2050 2049 } … … 3151 3150 void FrameLoader::tokenizerProcessedData() 3152 3151 { 3152 // ASSERT(m_frame->page()); 3153 // ASSERT(m_frame->document()); 3154 3153 3155 checkCompleted(); 3154 3156 } … … 3395 3397 void FrameLoader::continueFragmentScrollAfterNavigationPolicy(const ResourceRequest& request, bool shouldContinue) 3396 3398 { 3397 // FIXME: Some functions check m_quickRedirectComing, and others check for 3398 // FrameLoadTypeRedirectWithLockedHistory; need to unify these. 3399 // FIXME: 3400 // some functions check m_quickRedirectComing, and others check for 3401 // FrameLoadTypeRedirectWithLockedHistory. 3399 3402 bool isRedirect = m_quickRedirectComing || m_policyLoadType == FrameLoadTypeRedirectWithLockedHistory; 3400 3403 m_quickRedirectComing = false; … … 3423 3426 scrollToAnchor(url); 3424 3427 3425 if (!isRedirect) {3428 if (!isRedirect) 3426 3429 // This will clear previousItem from the rest of the frame tree that didn't 3427 3430 // doing any loading. We need to make a pass on this now, since for anchor nav 3428 3431 // we'll not go through a real load and reach Completed state. 3429 3432 checkLoadComplete(); 3430 }3431 3433 3432 3434 m_client->dispatchDidChangeLocationWithinPage(); 3433 3435 m_client->didFinishLoad(); 3434 3435 if (m_scheduledRedirection && !m_redirectionTimer.isActive())3436 startRedirectionTimer();3437 3436 } 3438 3437
Note: See TracChangeset
for help on using the changeset viewer.