Changeset 237264 in webkit


Ignore:
Timestamp:
Oct 18, 2018 2:16:52 PM (5 years ago)
Author:
achristensen@apple.com
Message:

Clean up FrameLoader two-state enums
https://bugs.webkit.org/show_bug.cgi?id=190731

Reviewed by Chris Dumez.

Source/WebCore:

This patch does three things:

  1. Add an overload to EnumTraits so we do not need to list out the valid values of boolean enum classes.

The valid values are always 0 and 1. This is used when decoding from IPC.

  1. Add a 2-state enum class for NewLoadInProgress instad of a bool so we can understand the code better.
  2. Begin passing LockBackForwardList to the UIProcess. We will need it soon for PSON.
  • history/CachedFrame.h:
  • loader/EmptyFrameLoaderClient.h:
  • loader/FrameLoader.cpp:

(WebCore::FrameLoader::provisionalLoadStarted):
(WebCore::FrameLoader::loadWithDocumentLoader):
(WebCore::FrameLoader::commitProvisionalLoad):
(WebCore::FrameLoader::clientRedirectCancelledOrFinished):
(WebCore::FrameLoader::clientRedirected):
(WebCore::FrameLoader::receivedMainResourceError):
(WebCore::FrameLoader::continueLoadAfterNavigationPolicy):

  • loader/FrameLoader.h:
  • loader/FrameLoaderClient.h:
  • loader/FrameLoaderTypes.h:
  • loader/NavigationScheduler.cpp:

(WebCore::ScheduledNavigation::didStopTimer):
(WebCore::NavigationScheduler::cancel):

  • loader/NavigationScheduler.h:
  • platform/network/StoredCredentialsPolicy.h:

Source/WebKit:

  • NetworkProcess/NetworkProcess.h:
  • NetworkProcess/NetworkProcess.messages.in:
  • Shared/WebCoreArgumentCoders.h:
  • UIProcess/WebPageProxy.cpp:

(WebKit::WebPageProxy::willPerformClientRedirectForFrame):

  • UIProcess/WebPageProxy.h:
  • UIProcess/WebPageProxy.messages.in:
  • WebProcess/WebCoreSupport/WebFrameLoaderClient.cpp:

(WebKit::WebFrameLoaderClient::dispatchWillPerformClientRedirect):

  • WebProcess/WebCoreSupport/WebFrameLoaderClient.h:

Source/WebKitLegacy/mac:

  • WebCoreSupport/WebFrameLoaderClient.h:
  • WebCoreSupport/WebFrameLoaderClient.mm:

(WebFrameLoaderClient::dispatchWillPerformClientRedirect):

Source/WebKitLegacy/win:

  • WebCoreSupport/WebFrameLoaderClient.cpp:

(WebFrameLoaderClient::dispatchWillPerformClientRedirect):

  • WebCoreSupport/WebFrameLoaderClient.h:

Source/WTF:

  • wtf/EnumTraits.h:

(WTF::isValidEnum):

Location:
trunk/Source
Files:
28 edited

Legend:

Unmodified
Added
Removed
  • trunk/Source/WTF/ChangeLog

    r237237 r237264  
     12018-10-18  Alex Christensen  <achristensen@webkit.org>
     2
     3        Clean up FrameLoader two-state enums
     4        https://bugs.webkit.org/show_bug.cgi?id=190731
     5
     6        Reviewed by Chris Dumez.
     7
     8        * wtf/EnumTraits.h:
     9        (WTF::isValidEnum):
     10
    1112018-10-17  Commit Queue  <commit-queue@webkit.org>
    212
  • trunk/Source/WTF/wtf/EnumTraits.h

    r224505 r237264  
    5252};
    5353
    54 template<typename E, typename T>
    55 constexpr auto isValidEnum(T t) -> std::enable_if_t<std::is_enum<E>::value, bool>
     54template<typename E, typename T, std::enable_if_t<std::is_enum<E>::value && !std::is_same<std::underlying_type_t<E>, bool>::value>* = nullptr>
     55constexpr bool isValidEnum(T t)
    5656{
    5757    static_assert(sizeof(T) >= std::underlying_type_t<E>(), "Integral type must be at least the size of the underlying enum type");
    5858
    5959    return EnumValueChecker<T, typename EnumTraits<E>::values>::isValidEnum(t);
     60}
     61
     62template<typename E, typename T, std::enable_if_t<std::is_same<std::underlying_type_t<E>, bool>::value>* = nullptr>
     63constexpr bool isValidEnum(T t)
     64{
     65    return !t || t == 1;
    6066}
    6167
  • trunk/Source/WebCore/ChangeLog

    r237262 r237264  
     12018-10-18  Alex Christensen  <achristensen@webkit.org>
     2
     3        Clean up FrameLoader two-state enums
     4        https://bugs.webkit.org/show_bug.cgi?id=190731
     5
     6        Reviewed by Chris Dumez.
     7
     8        This patch does three things:
     9        1. Add an overload to EnumTraits so we do not need to list out the valid values of boolean enum classes.
     10        The valid values are always 0 and 1.  This is used when decoding from IPC.
     11        2. Add a 2-state enum class for NewLoadInProgress instad of a bool so we can understand the code better.
     12        3. Begin passing LockBackForwardList to the UIProcess.  We will need it soon for PSON.
     13
     14        * history/CachedFrame.h:
     15        * loader/EmptyFrameLoaderClient.h:
     16        * loader/FrameLoader.cpp:
     17        (WebCore::FrameLoader::provisionalLoadStarted):
     18        (WebCore::FrameLoader::loadWithDocumentLoader):
     19        (WebCore::FrameLoader::commitProvisionalLoad):
     20        (WebCore::FrameLoader::clientRedirectCancelledOrFinished):
     21        (WebCore::FrameLoader::clientRedirected):
     22        (WebCore::FrameLoader::receivedMainResourceError):
     23        (WebCore::FrameLoader::continueLoadAfterNavigationPolicy):
     24        * loader/FrameLoader.h:
     25        * loader/FrameLoaderClient.h:
     26        * loader/FrameLoaderTypes.h:
     27        * loader/NavigationScheduler.cpp:
     28        (WebCore::ScheduledNavigation::didStopTimer):
     29        (WebCore::NavigationScheduler::cancel):
     30        * loader/NavigationScheduler.h:
     31        * platform/network/StoredCredentialsPolicy.h:
     32
    1332018-10-18  Wenson Hsieh  <wenson_hsieh@apple.com>
    234
  • trunk/Source/WebCore/history/CachedFrame.h

    r237074 r237264  
    3939class FrameView;
    4040class Node;
    41 enum class HasInsecureContent : uint8_t;
     41enum class HasInsecureContent : bool;
    4242
    4343class CachedFrameBase {
  • trunk/Source/WebCore/loader/EmptyFrameLoaderClient.h

    r237148 r237264  
    7676    void dispatchDidReceiveServerRedirectForProvisionalLoad() final { }
    7777    void dispatchDidCancelClientRedirect() final { }
    78     void dispatchWillPerformClientRedirect(const URL&, double, WallTime) final { }
     78    void dispatchWillPerformClientRedirect(const URL&, double, WallTime, LockBackForwardList) final { }
    7979    void dispatchDidChangeLocationWithinPage() final { }
    8080    void dispatchDidPushStateWithinPage() final { }
  • trunk/Source/WebCore/loader/FrameLoader.cpp

    r237184 r237264  
    10691069    if (m_stateMachine.firstLayoutDone())
    10701070        m_stateMachine.advanceTo(FrameLoaderStateMachine::CommittedFirstRealLoad);
    1071     m_frame.navigationScheduler().cancel(true);
     1071    m_frame.navigationScheduler().cancel(NewLoadInProgress::Yes);
    10721072    m_client.provisionalLoadStarted();
    10731073
     
    15931593    }
    15941594
    1595     m_frame.navigationScheduler().cancel(true);
     1595    m_frame.navigationScheduler().cancel(NewLoadInProgress::Yes);
    15961596
    15971597    if (m_currentLoadShouldBeTreatedAsContinuingLoad) {
     
    19711971    // just about to commit a new page, there cannot possibly be a pending redirect at this point.
    19721972    if (m_sentRedirectNotification)
    1973         clientRedirectCancelledOrFinished(false);
     1973        clientRedirectCancelledOrFinished(NewLoadInProgress::No);
    19741974   
    19751975    if (cachedPage && cachedPage->document()) {
     
    21592159}
    21602160
    2161 void FrameLoader::clientRedirectCancelledOrFinished(bool cancelWithLoadInProgress)
     2161void FrameLoader::clientRedirectCancelledOrFinished(NewLoadInProgress newLoadInProgress)
    21622162{
    21632163    // Note that -webView:didCancelClientRedirectForFrame: is called on the frame load delegate even if
     
    21662166    m_client.dispatchDidCancelClientRedirect();
    21672167
    2168     if (!cancelWithLoadInProgress)
     2168    if (newLoadInProgress == NewLoadInProgress::No)
    21692169        m_quickRedirectComing = false;
    21702170
     
    21742174void FrameLoader::clientRedirected(const URL& url, double seconds, WallTime fireDate, LockBackForwardList lockBackForwardList)
    21752175{
    2176     m_client.dispatchWillPerformClientRedirect(url, seconds, fireDate);
     2176    m_client.dispatchWillPerformClientRedirect(url, seconds, fireDate, lockBackForwardList);
    21772177   
    21782178    // Remember that we sent a redirect notification to the frame load delegate so that when we commit
     
    30343034        // has ended.
    30353035        if (m_sentRedirectNotification)
    3036             clientRedirectCancelledOrFinished(false);
     3036            clientRedirectCancelledOrFinished(NewLoadInProgress::No);
    30373037    }
    30383038
     
    32903290        // FIXME: The client should be told about ignored non-quick redirects, too.
    32913291        if (m_quickRedirectComing)
    3292             clientRedirectCancelledOrFinished(false);
     3292            clientRedirectCancelledOrFinished(NewLoadInProgress::No);
    32933293
    32943294        setPolicyDocumentLoader(nullptr);
  • trunk/Source/WebCore/loader/FrameLoader.h

    r237110 r237264  
    8484class SubstituteData;
    8585
     86enum class NewLoadInProgress : bool;
    8687enum class ShouldContinue;
    8788enum class ShouldTreatAsContinuingLoad : bool;
     
    281282    bool allAncestorsAreComplete() const; // including this
    282283    void clientRedirected(const URL&, double delay, WallTime fireDate, LockBackForwardList);
    283     void clientRedirectCancelledOrFinished(bool cancelWithLoadInProgress);
     284    void clientRedirectCancelledOrFinished(NewLoadInProgress);
    284285
    285286    WEBCORE_EXPORT void setOriginalURLForDownloadRequest(ResourceRequest&);
  • trunk/Source/WebCore/loader/FrameLoaderClient.h

    r237148 r237264  
    104104class Widget;
    105105
     106enum class LockBackForwardList : bool;
    106107enum class PolicyDecisionMode;
    107108enum class ShouldSkipSafeBrowsingCheck : bool;
     
    165166    virtual void dispatchDidChangeProvisionalURL() { }
    166167    virtual void dispatchDidCancelClientRedirect() = 0;
    167     virtual void dispatchWillPerformClientRedirect(const URL&, double interval, WallTime fireDate) = 0;
     168    virtual void dispatchWillPerformClientRedirect(const URL&, double interval, WallTime fireDate, LockBackForwardList) = 0;
    168169    virtual void dispatchDidChangeMainDocument() { }
    169170    virtual void dispatchWillChangeDocument(const URL&, const URL&) { }
  • trunk/Source/WebCore/loader/FrameLoaderTypes.h

    r237074 r237264  
    130130};
    131131
    132 enum class LockHistory : uint8_t {
    133     Yes,
    134     No
    135 };
    136 
    137 enum class LockBackForwardList : uint8_t {
    138     Yes,
    139     No
    140 };
    141 
    142 enum class AllowNavigationToInvalidURL : uint8_t {
    143     Yes,
    144     No
    145 };
    146 
    147 enum class HasInsecureContent : uint8_t {
    148     Yes,
    149     No,
    150 };
    151 
     132enum class LockHistory : bool { No, Yes };
     133enum class LockBackForwardList : bool { No, Yes };
     134enum class AllowNavigationToInvalidURL : bool { No, Yes };
     135enum class HasInsecureContent : bool { No, Yes };
    152136
    153137struct SystemPreviewInfo {
  • trunk/Source/WebCore/loader/NavigationScheduler.cpp

    r237233 r237264  
    9292    virtual bool shouldStartTimer(Frame&) { return true; }
    9393    virtual void didStartTimer(Frame&, Timer&) { }
    94     virtual void didStopTimer(Frame&, bool /* newLoadInProgress */) { }
     94    virtual void didStopTimer(Frame&, NewLoadInProgress) { }
    9595
    9696    double delay() const { return m_delay; }
     
    138138    }
    139139
    140     void didStopTimer(Frame& frame, bool newLoadInProgress) override
     140    void didStopTimer(Frame& frame, NewLoadInProgress newLoadInProgress) override
    141141    {
    142142        if (!m_haveToldClient)
     
    288288    }
    289289
    290     void didStopTimer(Frame& frame, bool newLoadInProgress) override
     290    void didStopTimer(Frame& frame, NewLoadInProgress newLoadInProgress) override
    291291    {
    292292        if (!m_haveToldClient)
     
    556556}
    557557
    558 void NavigationScheduler::cancel(bool newLoadInProgress)
    559 {
    560     LOG(History, "NavigationScheduler %p cancel(newLoadInProgress=%d)", this, newLoadInProgress);
     558void NavigationScheduler::cancel(NewLoadInProgress newLoadInProgress)
     559{
     560    LOG(History, "NavigationScheduler %p cancel(newLoadInProgress=%d)", this, newLoadInProgress == NewLoadInProgress::Yes);
    561561
    562562    if (m_timer.isActive())
     
    564564    m_timer.stop();
    565565
    566     if (std::unique_ptr<ScheduledNavigation> redirect = WTFMove(m_redirect))
     566    if (auto redirect = WTFMove(m_redirect))
    567567        redirect->didStopTimer(m_frame, newLoadInProgress);
    568568}
  • trunk/Source/WebCore/loader/NavigationScheduler.h

    r219008 r237264  
    4444class URL;
    4545
     46enum class NewLoadInProgress : bool { No, Yes };
     47   
    4648class NavigationScheduler {
    4749public:
     
    6163    void startTimer();
    6264
    63     void cancel(bool newLoadInProgress = false);
     65    void cancel(NewLoadInProgress = NewLoadInProgress::No);
    6466    void clear();
    6567
  • trunk/Source/WebCore/platform/network/StoredCredentialsPolicy.h

    r237110 r237264  
    2828namespace WebCore {
    2929
    30 enum class StoredCredentialsPolicy : uint8_t {
     30enum class StoredCredentialsPolicy : bool {
    3131    DoNotUse,
    3232    Use,
  • trunk/Source/WebKit/ChangeLog

    r237261 r237264  
     12018-10-18  Alex Christensen  <achristensen@webkit.org>
     2
     3        Clean up FrameLoader two-state enums
     4        https://bugs.webkit.org/show_bug.cgi?id=190731
     5
     6        Reviewed by Chris Dumez.
     7
     8        * NetworkProcess/NetworkProcess.h:
     9        * NetworkProcess/NetworkProcess.messages.in:
     10        * Shared/WebCoreArgumentCoders.h:
     11        * UIProcess/WebPageProxy.cpp:
     12        (WebKit::WebPageProxy::willPerformClientRedirectForFrame):
     13        * UIProcess/WebPageProxy.h:
     14        * UIProcess/WebPageProxy.messages.in:
     15        * WebProcess/WebCoreSupport/WebFrameLoaderClient.cpp:
     16        (WebKit::WebFrameLoaderClient::dispatchWillPerformClientRedirect):
     17        * WebProcess/WebCoreSupport/WebFrameLoaderClient.h:
     18
    1192018-10-18  Youenn Fablet  <youenn@apple.com>
    220
  • trunk/Source/WebKit/NetworkProcess/NetworkProcess.h

    r237110 r237264  
    6767class SecurityOrigin;
    6868class URL;
    69 enum class StoredCredentialsPolicy : uint8_t;
     69enum class StoredCredentialsPolicy : bool;
    7070struct MessageWithMessagePorts;
    7171struct SecurityOriginData;
  • trunk/Source/WebKit/NetworkProcess/NetworkProcess.messages.in

    r237110 r237264  
    8080    WriteBlobToFilePath(WebCore::URL blobURL, String path, WebKit::SandboxExtension::Handle handle, uint64_t callbackID)
    8181
    82     PreconnectTo(WebCore::URL url, enum:uint8_t WebCore::StoredCredentialsPolicy storedCredentialsPolicy);
     82    PreconnectTo(WebCore::URL url, enum:bool WebCore::StoredCredentialsPolicy storedCredentialsPolicy);
    8383
    8484#if ENABLE(RESOURCE_LOAD_STATISTICS)
  • trunk/Source/WebKit/Scripts/webkit/messages.py

    r237110 r237264  
    389389        'WebCore::KeyframeValueList': ['<WebCore/GraphicsLayer.h>'],
    390390        'WebCore::KeypressCommand': ['<WebCore/KeyboardEvent.h>'],
     391        'WebCore::LockBackForwardList': ['<WebCore/FrameLoaderTypes.h>'],
    391392        'WebCore::NetworkTransactionInformation': ['<WebCore/NetworkLoadInformation.h>'],
    392393        'WebCore::PasteboardCustomData': ['<WebCore/Pasteboard.h>'],
  • trunk/Source/WebKit/Shared/WebCoreArgumentCoders.h

    r236998 r237264  
    734734};
    735735
    736 template<> struct EnumTraits<WebCore::HasInsecureContent> {
    737     using values = EnumValues<
    738         WebCore::HasInsecureContent,
    739         WebCore::HasInsecureContent::No,
    740         WebCore::HasInsecureContent::Yes
    741     >;
    742 };
    743 
    744736template<> struct EnumTraits<WebCore::AutoplayEvent> {
    745737    using values = EnumValues<
     
    752744};
    753745
    754 template<> struct EnumTraits<WebCore::ShouldSample> {
    755     using values = EnumValues<
    756         WebCore::ShouldSample,
    757         WebCore::ShouldSample::No,
    758         WebCore::ShouldSample::Yes
    759     >;
    760 };
    761 
    762746template<> struct EnumTraits<WebCore::NetworkLoadPriority> {
    763747    using values = EnumValues<
     
    809793};
    810794
    811 template <> struct EnumTraits<WebCore::StoredCredentialsPolicy> {
    812     using values = EnumValues<
    813         WebCore::StoredCredentialsPolicy,
    814         WebCore::StoredCredentialsPolicy::DoNotUse,
    815         WebCore::StoredCredentialsPolicy::Use
    816     >;
    817 };
    818 
    819795template <> struct EnumTraits<WebCore::WorkerType> {
    820796    using values = EnumValues<
  • trunk/Source/WebKit/UIProcess/WebPageProxy.cpp

    r237257 r237264  
    36063606}
    36073607
    3608 void WebPageProxy::willPerformClientRedirectForFrame(uint64_t frameID, const String& url, double delay)
     3608void WebPageProxy::willPerformClientRedirectForFrame(uint64_t frameID, const String& url, double delay, WebCore::LockBackForwardList)
    36093609{
    36103610    PageClientProtector protector(pageClient());
  • trunk/Source/WebKit/UIProcess/WebPageProxy.h

    r237257 r237264  
    178178
    179179enum class AutoplayEvent : uint8_t;
    180 enum class HasInsecureContent : uint8_t;
     180enum class LockBackForwardList : bool;
     181enum class HasInsecureContent : bool;
    181182enum class NotificationDirection : uint8_t;
    182183enum class ShouldSample : bool;
     
    14171418    void didStartProvisionalLoadForFrame(uint64_t frameID, uint64_t navigationID, WebCore::URL&&, WebCore::URL&& unreachableURL, const UserData&);
    14181419    void didReceiveServerRedirectForProvisionalLoadForFrame(uint64_t frameID, uint64_t navigationID, WebCore::ResourceRequest&&, const UserData&);
    1419     void willPerformClientRedirectForFrame(uint64_t frameID, const String& url, double delay);
     1420    void willPerformClientRedirectForFrame(uint64_t frameID, const String& url, double delay, WebCore::LockBackForwardList);
    14201421    void didCancelClientRedirectForFrame(uint64_t frameID);
    14211422    void didChangeProvisionalURLForFrame(uint64_t frameID, uint64_t navigationID, WebCore::URL&&);
  • trunk/Source/WebKit/UIProcess/WebPageProxy.messages.in

    r237233 r237264  
    131131    DidStartProvisionalLoadForFrame(uint64_t frameID, uint64_t navigationID, WebCore::URL url, WebCore::URL unreachableURL, WebKit::UserData userData)
    132132    DidReceiveServerRedirectForProvisionalLoadForFrame(uint64_t frameID, uint64_t navigationID, WebCore::ResourceRequest request, WebKit::UserData userData)
    133     WillPerformClientRedirectForFrame(uint64_t frameID, String url, double delay)
     133    WillPerformClientRedirectForFrame(uint64_t frameID, String url, double delay, enum:bool WebCore::LockBackForwardList lockBackForwardList)
    134134    DidCancelClientRedirectForFrame(uint64_t frameID)
    135135    DidChangeProvisionalURLForFrame(uint64_t frameID, uint64_t navigationID, WebCore::URL url)
     
    150150    DidDestroyNavigation(uint64_t navigationID)
    151151
    152     HasInsecureContent() -> (enum:uint8_t WebCore::HasInsecureContent hasInsecureContent)
     152    HasInsecureContent() -> (enum:bool WebCore::HasInsecureContent hasInsecureContent)
    153153
    154154    MainFramePluginHandlesPageScaleGestureDidChange(bool mainFramePluginHandlesPageScaleGesture)
  • trunk/Source/WebKit/WebProcess/WebCoreSupport/WebFrameLoaderClient.cpp

    r237205 r237264  
    345345}
    346346
    347 void WebFrameLoaderClient::dispatchWillPerformClientRedirect(const URL& url, double interval, WallTime fireDate)
     347void WebFrameLoaderClient::dispatchWillPerformClientRedirect(const URL& url, double interval, WallTime fireDate, LockBackForwardList lockBackForwardList)
    348348{
    349349    WebPage* webPage = m_frame->page();
     
    355355
    356356    // Notify the UIProcess.
    357     webPage->send(Messages::WebPageProxy::WillPerformClientRedirectForFrame(m_frame->frameID(), url.string(), interval));
     357    webPage->send(Messages::WebPageProxy::WillPerformClientRedirectForFrame(m_frame->frameID(), url.string(), interval, lockBackForwardList));
    358358}
    359359
  • trunk/Source/WebKit/WebProcess/WebCoreSupport/WebFrameLoaderClient.h

    r237138 r237264  
    104104    void dispatchDidChangeProvisionalURL() final;
    105105    void dispatchDidCancelClientRedirect() final;
    106     void dispatchWillPerformClientRedirect(const WebCore::URL&, double interval, WallTime fireDate) final;
     106    void dispatchWillPerformClientRedirect(const WebCore::URL&, double interval, WallTime fireDate, WebCore::LockBackForwardList) final;
    107107    void dispatchDidChangeLocationWithinPage() final;
    108108    void dispatchDidPushStateWithinPage() final;
  • trunk/Source/WebKitLegacy/mac/ChangeLog

    r237260 r237264  
     12018-10-18  Alex Christensen  <achristensen@webkit.org>
     2
     3        Clean up FrameLoader two-state enums
     4        https://bugs.webkit.org/show_bug.cgi?id=190731
     5
     6        Reviewed by Chris Dumez.
     7
     8        * WebCoreSupport/WebFrameLoaderClient.h:
     9        * WebCoreSupport/WebFrameLoaderClient.mm:
     10        (WebFrameLoaderClient::dispatchWillPerformClientRedirect):
     11
    1122018-10-18  Alex Christensen  <achristensen@webkit.org>
    213
  • trunk/Source/WebKitLegacy/mac/WebCoreSupport/WebFrameLoaderClient.h

    r237148 r237264  
    108108    void dispatchDidReceiveServerRedirectForProvisionalLoad() final;
    109109    void dispatchDidCancelClientRedirect() final;
    110     void dispatchWillPerformClientRedirect(const WebCore::URL&, double interval, WallTime fireDate) final;
     110    void dispatchWillPerformClientRedirect(const WebCore::URL&, double interval, WallTime fireDate, WebCore::LockBackForwardList) final;
    111111    void dispatchDidChangeLocationWithinPage() final;
    112112    void dispatchDidPushStateWithinPage() final;
  • trunk/Source/WebKitLegacy/mac/WebCoreSupport/WebFrameLoaderClient.mm

    r237157 r237264  
    603603}
    604604
    605 void WebFrameLoaderClient::dispatchWillPerformClientRedirect(const URL& url, double delay, WallTime fireDate)
     605void WebFrameLoaderClient::dispatchWillPerformClientRedirect(const URL& url, double delay, WallTime fireDate, LockBackForwardList)
    606606{
    607607    WebView *webView = getWebView(m_webFrame.get());
  • trunk/Source/WebKitLegacy/win/ChangeLog

    r237233 r237264  
     12018-10-18  Alex Christensen  <achristensen@webkit.org>
     2
     3        Clean up FrameLoader two-state enums
     4        https://bugs.webkit.org/show_bug.cgi?id=190731
     5
     6        Reviewed by Chris Dumez.
     7
     8        * WebCoreSupport/WebFrameLoaderClient.cpp:
     9        (WebFrameLoaderClient::dispatchWillPerformClientRedirect):
     10        * WebCoreSupport/WebFrameLoaderClient.h:
     11
    1122018-10-17  Alex Christensen  <achristensen@webkit.org>
    213
  • trunk/Source/WebKitLegacy/win/WebCoreSupport/WebFrameLoaderClient.cpp

    r237148 r237264  
    355355}
    356356
    357 void WebFrameLoaderClient::dispatchWillPerformClientRedirect(const URL& url, double delay, WallTime fireDate)
     357void WebFrameLoaderClient::dispatchWillPerformClientRedirect(const URL& url, double delay, WallTime fireDate, WebCore::LockBackForwardList)
    358358{
    359359    WebView* webView = m_webFrame->webView();
  • trunk/Source/WebKitLegacy/win/WebCoreSupport/WebFrameLoaderClient.h

    r237148 r237264  
    8686    void dispatchDidReceiveServerRedirectForProvisionalLoad() override;
    8787    void dispatchDidCancelClientRedirect() override;
    88     void dispatchWillPerformClientRedirect(const WebCore::URL&, double interval, WallTime fireDate) override;
     88    void dispatchWillPerformClientRedirect(const WebCore::URL&, double interval, WallTime fireDate, WebCore::LockBackForwardList) override;
    8989    void dispatchDidChangeLocationWithinPage() override;
    9090    void dispatchDidPushStateWithinPage() override;
Note: See TracChangeset for help on using the changeset viewer.