Changeset 30738 in webkit


Ignore:
Timestamp:
Mar 4, 2008 1:11:35 AM (16 years ago)
Author:
ap@webkit.org
Message:

Suggested by Darin, rubber-stamped by Mark.

http://bugs.webkit.org/show_bug.cgi?id=17569
REGRESSION (r30571): Buzzword.com doesn't load

Rolling out r30571, as determining what is wrong with it proved tricky.

  • loader/FrameLoader.cpp: (WebCore::FrameLoader::load): (WebCore::FrameLoader::tokenizerProcessedData): (WebCore::FrameLoader::continueFragmentScrollAfterNavigationPolicy):
Location:
trunk
Files:
3 deleted
3 edited

Legend:

Unmodified
Added
Removed
  • trunk/LayoutTests/ChangeLog

    r30735 r30738  
     12008-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
    1142008-03-03  Sam Weinig  <sam@webkit.org>
    215
  • trunk/WebCore/ChangeLog

    r30736 r30738  
     12008-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
    1152008-03-04  Sam Weinig  <sam@webkit.org>
    216
  • trunk/WebCore/loader/FrameLoader.cpp

    r30709 r30738  
    20142014    // work properly.
    20152015    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()) {
    20212022
    20222023        // Just do anchor navigation within the existing content.
     
    20242025        // We don't do this if we are submitting a form, explicitly reloading,
    20252026        // 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.
    20282028       
    20292029        // FIXME: What about load types other than Standard and Reload?
     
    20342034            callContinueFragmentScrollAfterNavigationPolicy, this);
    20352035    } 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
    20372037        bool isRedirect = m_quickRedirectComing;
    20382038        load(request, action, newLoadType, formState);
     
    20412041            if (m_provisionalDocumentLoader)
    20422042                m_provisionalDocumentLoader->setIsClientRedirect(true);
    2043         } else if (sameURL) {
     2043        } else if (sameURL)
    20442044            // Example of this case are sites that reload the same URL with a different cookie
    20452045            // driving the generated content, or a master frame with links that drive a target
    20462046            // frame, where the user has clicked on the same link repeatedly.
    20472047            m_loadType = FrameLoadTypeSame;
    2048         }
    20492048    }
    20502049}
     
    31513150void FrameLoader::tokenizerProcessedData()
    31523151{
     3152//    ASSERT(m_frame->page());
     3153//    ASSERT(m_frame->document());
     3154
    31533155    checkCompleted();
    31543156}
     
    33953397void FrameLoader::continueFragmentScrollAfterNavigationPolicy(const ResourceRequest& request, bool shouldContinue)
    33963398{
    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. 
    33993402    bool isRedirect = m_quickRedirectComing || m_policyLoadType == FrameLoadTypeRedirectWithLockedHistory;
    34003403    m_quickRedirectComing = false;
     
    34233426    scrollToAnchor(url);
    34243427   
    3425     if (!isRedirect) {
     3428    if (!isRedirect)
    34263429        // This will clear previousItem from the rest of the frame tree that didn't
    34273430        // doing any loading. We need to make a pass on this now, since for anchor nav
    34283431        // we'll not go through a real load and reach Completed state.
    34293432        checkLoadComplete();
    3430     }
    34313433 
    34323434    m_client->dispatchDidChangeLocationWithinPage();
    34333435    m_client->didFinishLoad();
    3434 
    3435     if (m_scheduledRedirection && !m_redirectionTimer.isActive())
    3436         startRedirectionTimer();
    34373436}
    34383437
Note: See TracChangeset for help on using the changeset viewer.