ChangeLog

2018-02-12  Chris Dumez  <cdumez@apple.com>

        REGRESSION (r228299): Broke reader mode in Safari

        https://bugs.webkit.org/show_bug.cgi?id=182697

        <rdar://problem/37399012>

        Reviewed by NOBODY (OOPS!).

        Make the fix from r228299 more specific to the bug it was trying to fix by moving the

        policyChecker().stopCheck() call from the FrameLoader::stopLoading() to NavigationScheduler::schedule(),

        when a previous load gets cancelled. This greatly reduces the chances of bad side effects

        from this change. Reader mode works again and the sites fixed by r228299 still work after

        this more limited fix.

        * loader/FrameLoader.cpp:

        (WebCore::FrameLoader::stopLoading):

        * loader/NavigationScheduler.cpp:

        (WebCore::NavigationScheduler::schedule):

2018-02-11  Gustavo Noronha Silva  <gustavo.noronha@collabora.co.uk>

        [GTK] Scrolling sometimes jumps around

Source/WebCore/loader/FrameLoader.cpp

@@void FrameLoader::stopLoading(UnloadEventPolicy unloadEventPolicy)

        DatabaseManager::singleton().stopDatabases(*document, nullptr);

    }

491 policyChecker().stopCheck();

492

    // FIXME: This will cancel redirection timer, which really needs to be restarted when restoring the frame from b/f cache.

    m_frame.navigationScheduler().cancel();

}

Source/WebCore/loader/NavigationScheduler.cpp

#include "Logging.h"

#include "NavigationDisabler.h"

#include "Page.h"

53#include "PolicyChecker.h"

#include "ScriptController.h"

#include "UserGestureIndicator.h"

#include <wtf/CurrentTime.h>

@@void NavigationScheduler::schedule(std::unique_ptr<ScheduledNavigation> redirect

    if (redirect->wasDuringLoad()) {

        if (DocumentLoader* provisionalDocumentLoader = m_frame.loader().provisionalDocumentLoader())

            provisionalDocumentLoader->stopLoading();

524 m_frame.loader().policyChecker().stopCheck();

        m_frame.loader().stopLoading(UnloadEventPolicyUnloadAndPageHide);

    }