Changeset 222619 in webkit


Ignore:
Timestamp:
Sep 28, 2017 11:37:22 AM (7 years ago)
Author:
commit-queue@webkit.org
Message:

[PAL] Move HysteresisActivity into PAL
​https://bugs.webkit.org/show_bug.cgi?id=177516

Patch by Ross Kirsling <Ross Kirsling> on 2017-09-28
Reviewed by Alex Christensen.

Source/WebCore:

  • WebCore.xcodeproj/project.pbxproj:
  • platform/UserActivity.cpp:

(WebCore::UserActivity::UserActivity):
(WebCore::UserActivity::hysteresisUpdated):

  • platform/UserActivity.h:
  • platform/graphics/cairo/BackingStoreBackendCairoImpl.cpp:

(WebCore::BackingStoreBackendCairoImpl::BackingStoreBackendCairoImpl):

  • platform/graphics/cairo/BackingStoreBackendCairoImpl.h:
  • platform/ios/WebSQLiteDatabaseTrackerClient.h:
  • platform/ios/WebSQLiteDatabaseTrackerClient.mm:

(WebCore::WebSQLiteDatabaseTrackerClient::WebSQLiteDatabaseTrackerClient):
(WebCore::WebSQLiteDatabaseTrackerClient::hysteresisUpdated):

Source/WebCore/PAL:

  • PAL.xcodeproj/project.pbxproj:
  • pal/HysteresisActivity.h: Renamed from Source/WebCore/platform/HysteresisActivity.h.

Source/WebKit:

  • NetworkProcess/cache/NetworkCacheSpeculativeLoadManager.cpp:

(WebKit::NetworkCache::SpeculativeLoadManager::PendingFrameLoad::PendingFrameLoad):

  • Shared/WebSQLiteDatabaseTracker.cpp:

(WebKit::WebSQLiteDatabaseTracker::WebSQLiteDatabaseTracker):
(WebKit::WebSQLiteDatabaseTracker::hysteresisUpdated):

  • Shared/WebSQLiteDatabaseTracker.h:
  • WebProcess/WebPage/WebPage.cpp:

(WebKit::m_pageScrolledHysteresis):
(WebKit::m_userActivityHysteresis):
(WebKit::WebPage::updateUserActivity):

  • WebProcess/WebPage/WebPage.h:
  • WebProcess/WebProcess.cpp:

(WebKit::WebProcess::WebProcess):

  • WebProcess/WebProcess.h:
Location:
trunk/Source
Files:
18 edited
1 moved

Legend:

Unmodified
Added
Removed

  • trunk/Source/WebCore/ChangeLog

    r222613 r222619  
     12017-09-28  Ross Kirsling  <ross.kirsling@sony.com>
     2
     3        [PAL] Move HysteresisActivity into PAL
     4        https://bugs.webkit.org/show_bug.cgi?id=177516
     5
     6        Reviewed by Alex Christensen.
     7
     8        * WebCore.xcodeproj/project.pbxproj:
     9        * platform/UserActivity.cpp:
     10        (WebCore::UserActivity::UserActivity):
     11        (WebCore::UserActivity::hysteresisUpdated):
     12        * platform/UserActivity.h:
     13        * platform/graphics/cairo/BackingStoreBackendCairoImpl.cpp:
     14        (WebCore::BackingStoreBackendCairoImpl::BackingStoreBackendCairoImpl):
     15        * platform/graphics/cairo/BackingStoreBackendCairoImpl.h:
     16        * platform/ios/WebSQLiteDatabaseTrackerClient.h:
     17        * platform/ios/WebSQLiteDatabaseTrackerClient.mm:
     18        (WebCore::WebSQLiteDatabaseTrackerClient::WebSQLiteDatabaseTrackerClient):
     19        (WebCore::WebSQLiteDatabaseTrackerClient::hysteresisUpdated):
     20
    1212017-09-28  Chris Dumez  <cdumez@apple.com>
    222

  • trunk/Source/WebCore/PAL/ChangeLog

    r222613 r222619  
     12017-09-28  Ross Kirsling  <ross.kirsling@sony.com>
     2
     3        [PAL] Move HysteresisActivity into PAL
     4        https://bugs.webkit.org/show_bug.cgi?id=177516
     5
     6        Reviewed by Alex Christensen.
     7
     8        * PAL.xcodeproj/project.pbxproj:
     9        * pal/HysteresisActivity.h: Renamed from Source/WebCore/platform/HysteresisActivity.h.
     10
    1112017-09-28  Chris Dumez  <cdumez@apple.com>
    212

  • trunk/Source/WebCore/PAL/PAL.xcodeproj/project.pbxproj

    r222515 r222619  
    128128                A3788E9C1F05B78200679425 /* Sound.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A3788E9B1F05B78200679425 /* Sound.cpp */; };
    129129                A3788E9E1F05B78E00679425 /* SoundMac.mm in Sources */ = {isa = PBXBuildFile; fileRef = A3788E9D1F05B78E00679425 /* SoundMac.mm */; };
     130                A39DE74E1F7C443D007BCB00 /* HysteresisActivity.h in Headers */ = {isa = PBXBuildFile; fileRef = A39DE74D1F7C443C007BCB00 /* HysteresisActivity.h */; };
    130131                A3AB6E521F3D1DC5009C14B1 /* SleepDisabler.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A3AB6E511F3D1DC5009C14B1 /* SleepDisabler.cpp */; };
    131132                A3AB6E561F3D1DDB009C14B1 /* SleepDisabler.h in Headers */ = {isa = PBXBuildFile; fileRef = A3AB6E531F3D1DDB009C14B1 /* SleepDisabler.h */; };
    … …  
    263264                A3788E9B1F05B78200679425 /* Sound.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = Sound.cpp; sourceTree = "<group>"; };
    264265                A3788E9D1F05B78E00679425 /* SoundMac.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = SoundMac.mm; sourceTree = "<group>"; };
     266                A39DE74D1F7C443C007BCB00 /* HysteresisActivity.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = HysteresisActivity.h; sourceTree = "<group>"; };
    265267                A3AB6E511F3D1DC5009C14B1 /* SleepDisabler.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = SleepDisabler.cpp; sourceTree = "<group>"; };
    266268                A3AB6E531F3D1DDB009C14B1 /* SleepDisabler.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SleepDisabler.h; sourceTree = "<group>"; };
    … …  
    430432                                0CF99CA71F738437007EE793 /* CoreMediaSoftLink.h */,
    431433                        );
    432                         name = cf;
    433                         path = "New Group";
     434                        path = cf;
    434435                        sourceTree = "<group>";
    435436                };
    … …  
    462463                                A30D411D1F0DD0AC00B71954 /* text */,
    463464                                0C2D9E721EEF5AF600DBC317 /* ExportMacros.h */,
     465                                A39DE74D1F7C443C007BCB00 /* HysteresisActivity.h */,
    464466                                0708AC321F4C874A001F788F /* Logger.h */,
    465467                                07377ADB1F5777D70027F16D /* LoggerHelper.h */,
    … …  
    594596                                A102658E1F567E9D00B4C844 /* HIServicesSPI.h in Headers */,
    595597                                A10265891F56747A00B4C844 /* HIToolboxSPI.h in Headers */,
     598                                A39DE74E1F7C443D007BCB00 /* HysteresisActivity.h in Headers */,
    596599                                0C2DA11F1F3BE9E000DBC317 /* ImageIOSPI.h in Headers */,
    597600                                0C2DA1421F3BEB4900DBC317 /* IOPMLibSPI.h in Headers */,

  • trunk/Source/WebCore/PAL/pal/HysteresisActivity.h

    r222618 r222619  
    2424 */
    2525
    26 #ifndef HysteresisActivity_h
    27 #define HysteresisActivity_h
     26#pragma once
    2827
    2928#include <wtf/RunLoop.h>
    3029#include <wtf/Seconds.h>
    3130
    32 namespace WebCore {
     31namespace PAL {
    3332
    3433static const Seconds defaultHysteresisDuration { 5_s };
    … …  
    9695};
    9796
    98 } // namespace WebCore
    99 
    100 #endif // HysteresisActivity_h
     97} // namespace PAL

  • trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj

    r222595 r222619  
    37303730                861C2EA413FB4FDD00062ABB /* LoadTiming.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 861C2EA313FB4FDD00062ABB /* LoadTiming.cpp */; };
    37313731                862F129E18C1576F005C54AF /* CountedUserActivity.h in Headers */ = {isa = PBXBuildFile; fileRef = 862F129D18C1572C005C54AF /* CountedUserActivity.h */; settings = {ATTRIBUTES = (Private, ); }; };
    3732                 862F12A018C1DD02005C54AF /* HysteresisActivity.h in Headers */ = {isa = PBXBuildFile; fileRef = 862F129F18C1DCE4005C54AF /* HysteresisActivity.h */; settings = {ATTRIBUTES = (Private, ); }; };
    37333732                86512EDE154A2AEF00A90426 /* PerformanceResourceTiming.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 86512EDB154A2AEE00A90426 /* PerformanceResourceTiming.cpp */; };
    37343733                86512EDF154A2AEF00A90426 /* PerformanceResourceTiming.h in Headers */ = {isa = PBXBuildFile; fileRef = 86512EDC154A2AEF00A90426 /* PerformanceResourceTiming.h */; };
    … …  
    1206712066                861C2EA313FB4FDD00062ABB /* LoadTiming.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = LoadTiming.cpp; sourceTree = "<group>"; };
    1206812067                862F129D18C1572C005C54AF /* CountedUserActivity.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CountedUserActivity.h; sourceTree = "<group>"; };
    12069                 862F129F18C1DCE4005C54AF /* HysteresisActivity.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = HysteresisActivity.h; sourceTree = "<group>"; };
    1207012068                86512EDB154A2AEE00A90426 /* PerformanceResourceTiming.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = PerformanceResourceTiming.cpp; sourceTree = "<group>"; };
    1207112069                86512EDC154A2AEF00A90426 /* PerformanceResourceTiming.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PerformanceResourceTiming.h; sourceTree = "<group>"; };
    … …  
    2461124609                                A8748BDF12CBF2DC001FBA41 /* HashTools.h */,
    2461224610                                BC3BC29B0E91AB0F00835588 /* HostWindow.h */,
    24613                                 862F129F18C1DCE4005C54AF /* HysteresisActivity.h */,
    2461424611                                1AE00D57182DAC8D00087DD7 /* KeyedCoding.h */,
    2461524612                                E15FF7D418C9553800FE4C87 /* KeypressCommand.h */,
    … …  
    2813928136                                514C76730CE923A1007EF3CD /* HTTPParsers.h in Headers */,
    2814028137                                375CD232119D43C800A2A859 /* Hyphenation.h in Headers */,
    28141                                 862F12A018C1DD02005C54AF /* HysteresisActivity.h in Headers */,
    2814228138                                5EBB89331C77782900C65D41 /* IceCandidate.h in Headers */,
    2814328139                                B275356E0B053814002CE64F /* Icon.h in Headers */,

  • trunk/Source/WebCore/platform/UserActivity.cpp

    r177295 r222619  
    4646
    4747UserActivity::UserActivity(const char* description)
    48     : HysteresisActivity([this](HysteresisState state) { hysteresisUpdated(state); })
     48    : PAL::HysteresisActivity([this](PAL::HysteresisState state) { hysteresisUpdated(state); })
    4949    , m_impl(description)
    5050{
    5151}
    5252
    53 void UserActivity::hysteresisUpdated(HysteresisState state)
     53void UserActivity::hysteresisUpdated(PAL::HysteresisState state)
    5454{
    55     if (state == HysteresisState::Started)
     55    if (state == PAL::HysteresisState::Started)
    5656        m_impl.beginActivity();
    5757    else

  • trunk/Source/WebCore/platform/UserActivity.h

    r183746 r222619  
    2727#define UserActivity_h
    2828
    29 #include "HysteresisActivity.h"
     29#include <pal/HysteresisActivity.h>
    3030
    3131#if HAVE(NS_ACTIVITY)
    … …  
    4141// a user initiated or visible action is taking place, and as such that
    4242// resources should be allocated to the process accordingly.
    43 class UserActivity : public HysteresisActivity {
     43class UserActivity : public PAL::HysteresisActivity {
    4444public:
    4545    class Impl {
    … …  
    6060
    6161private:
    62     void hysteresisUpdated(HysteresisState);
     62    void hysteresisUpdated(PAL::HysteresisState);
    6363
    6464    Impl m_impl;

  • trunk/Source/WebCore/platform/graphics/cairo/BackingStoreBackendCairoImpl.cpp

    r221521 r222619  
    4242BackingStoreBackendCairoImpl::BackingStoreBackendCairoImpl(const IntSize& size, float deviceScaleFactor)
    4343    : BackingStoreBackendCairo(size)
    44     , m_scrolledHysteresis([this](HysteresisState state) { if (state == HysteresisState::Stopped) m_scrollSurface = nullptr; }, scrollHysteresisDuration)
     44    , m_scrolledHysteresis([this](PAL::HysteresisState state) { if (state == PAL::HysteresisState::Stopped) m_scrollSurface = nullptr; }, scrollHysteresisDuration)
    4545{
    4646    IntSize scaledSize = m_size;

  • trunk/Source/WebCore/platform/graphics/cairo/BackingStoreBackendCairoImpl.h

    r221521 r222619  
    2121#if USE(CAIRO)
    2222#include "BackingStoreBackendCairo.h"
    23 #include <WebCore/HysteresisActivity.h>
     23#include <pal/HysteresisActivity.h>
    2424
    2525namespace WebCore {
    … …  
    3434
    3535    RefPtr<cairo_surface_t> m_scrollSurface;
    36     WebCore::HysteresisActivity m_scrolledHysteresis;
     36    PAL::HysteresisActivity m_scrolledHysteresis;
    3737};
    3838

  • trunk/Source/WebCore/platform/ios/WebSQLiteDatabaseTrackerClient.h

    r219595 r222619  
    2828#if PLATFORM(IOS)
    2929
    30 #include "HysteresisActivity.h"
    3130#include "SQLiteDatabaseTrackerClient.h"
     31#include <pal/HysteresisActivity.h>
    3232#include <wtf/Forward.h>
    3333#include <wtf/Noncopyable.h>
    … …  
    4848    virtual ~WebSQLiteDatabaseTrackerClient();
    4949
    50     void hysteresisUpdated(HysteresisState);
     50    void hysteresisUpdated(PAL::HysteresisState);
    5151
    52     HysteresisActivity m_hysteresis;
     52    PAL::HysteresisActivity m_hysteresis;
    5353};
    5454

  • trunk/Source/WebCore/platform/ios/WebSQLiteDatabaseTrackerClient.mm

    r218864 r222619  
    5151
    5252WebSQLiteDatabaseTrackerClient::WebSQLiteDatabaseTrackerClient()
    53     : m_hysteresis([this](HysteresisState state) { hysteresisUpdated(state); }, hysteresisDuration)
     53    : m_hysteresis([this](PAL::HysteresisState state) { hysteresisUpdated(state); }, hysteresisDuration)
    5454{
    5555}
    … …  
    7373}
    7474
    75 void WebSQLiteDatabaseTrackerClient::hysteresisUpdated(HysteresisState state)
     75void WebSQLiteDatabaseTrackerClient::hysteresisUpdated(PAL::HysteresisState state)
    7676{
    77     if (state == HysteresisState::Started)
     77    if (state == PAL::HysteresisState::Started)
    7878        [WebDatabaseTransactionBackgroundTaskController startBackgroundTask];
    7979    else

  • trunk/Source/WebKit/ChangeLog

    r222613 r222619  
     12017-09-28  Ross Kirsling  <ross.kirsling@sony.com>
     2
     3        [PAL] Move HysteresisActivity into PAL
     4        https://bugs.webkit.org/show_bug.cgi?id=177516
     5
     6        Reviewed by Alex Christensen.
     7
     8        * NetworkProcess/cache/NetworkCacheSpeculativeLoadManager.cpp:
     9        (WebKit::NetworkCache::SpeculativeLoadManager::PendingFrameLoad::PendingFrameLoad):
     10        * Shared/WebSQLiteDatabaseTracker.cpp:
     11        (WebKit::WebSQLiteDatabaseTracker::WebSQLiteDatabaseTracker):
     12        (WebKit::WebSQLiteDatabaseTracker::hysteresisUpdated):
     13        * Shared/WebSQLiteDatabaseTracker.h:
     14        * WebProcess/WebPage/WebPage.cpp:
     15        (WebKit::m_pageScrolledHysteresis):
     16        (WebKit::m_userActivityHysteresis):
     17        (WebKit::WebPage::updateUserActivity):
     18        * WebProcess/WebPage/WebPage.h:
     19        * WebProcess/WebProcess.cpp:
     20        (WebKit::WebProcess::WebProcess):
     21        * WebProcess/WebProcess.h:
     22
    1232017-09-28  Chris Dumez  <cdumez@apple.com>
    224

  • trunk/Source/WebKit/NetworkProcess/cache/NetworkCacheSpeculativeLoadManager.cpp

    r220267 r222619  
    3535#include "NetworkProcess.h"
    3636#include <WebCore/DiagnosticLoggingKeys.h>
    37 #include <WebCore/HysteresisActivity.h>
     37#include <pal/HysteresisActivity.h>
    3838#include <wtf/HashCountedSet.h>
    3939#include <wtf/NeverDestroyed.h>
    … …  
    208208        , m_mainResourceKey(mainResourceKey)
    209209        , m_loadCompletionHandler(WTFMove(loadCompletionHandler))
    210         , m_loadHysteresisActivity([this](HysteresisState state) { if (state == HysteresisState::Stopped) markLoadAsCompleted(); })
     210        , m_loadHysteresisActivity([this](PAL::HysteresisState state) { if (state == PAL::HysteresisState::Stopped) markLoadAsCompleted(); })
    211211    {
    212212        m_loadHysteresisActivity.impulse();
    … …  
    240240    Vector<std::unique_ptr<SubresourceLoad>> m_subresourceLoads;
    241241    WTF::Function<void()> m_loadCompletionHandler;
    242     HysteresisActivity m_loadHysteresisActivity;
     242    PAL::HysteresisActivity m_loadHysteresisActivity;
    243243    std::unique_ptr<SubresourcesEntry> m_existingEntry;
    244244    bool m_didFinishLoad { false };

  • trunk/Source/WebKit/Shared/WebSQLiteDatabaseTracker.cpp

    r182323 r222619  
    4040WebSQLiteDatabaseTracker::WebSQLiteDatabaseTracker(NetworkProcess& process)
    4141    : m_process(process)
    42     , m_hysteresis([this](HysteresisState state) { hysteresisUpdated(state); })
     42    , m_hysteresis([this](PAL::HysteresisState state) { hysteresisUpdated(state); })
    4343    , m_childProcessType(ChildProcessType::Network)
    4444{
    … …  
    4848WebSQLiteDatabaseTracker::WebSQLiteDatabaseTracker(WebProcess& process)
    4949    : m_process(process)
    50     , m_hysteresis([this](HysteresisState state) { hysteresisUpdated(state); })
     50    , m_hysteresis([this](PAL::HysteresisState state) { hysteresisUpdated(state); })
    5151    , m_childProcessType(ChildProcessType::WebContent)
    5252{
    … …  
    6868}
    6969
    70 void WebSQLiteDatabaseTracker::hysteresisUpdated(HysteresisState state)
     70void WebSQLiteDatabaseTracker::hysteresisUpdated(PAL::HysteresisState state)
    7171{
    7272    switch (m_childProcessType) {
    7373    case ChildProcessType::WebContent:
    74         m_process.parentProcessConnection()->send(Messages::WebProcessProxy::SetIsHoldingLockedFiles(state == HysteresisState::Started), 0);
     74        m_process.parentProcessConnection()->send(Messages::WebProcessProxy::SetIsHoldingLockedFiles(state == PAL::HysteresisState::Started), 0);
    7575        break;
    7676    case ChildProcessType::Network:
    77         m_process.parentProcessConnection()->send(Messages::NetworkProcessProxy::SetIsHoldingLockedFiles(state == HysteresisState::Started), 0);
     77        m_process.parentProcessConnection()->send(Messages::NetworkProcessProxy::SetIsHoldingLockedFiles(state == PAL::HysteresisState::Started), 0);
    7878        break;
    7979    }

  • trunk/Source/WebKit/Shared/WebSQLiteDatabaseTracker.h

    r197563 r222619  
    2727#define WebSQLiteDatabaseTracker_h
    2828
    29 #include <WebCore/HysteresisActivity.h>
    3029#include <WebCore/SQLiteDatabaseTrackerClient.h>
     30#include <pal/HysteresisActivity.h>
    3131#include <wtf/Noncopyable.h>
    3232
    … …  
    4848
    4949private:
    50     void hysteresisUpdated(WebCore::HysteresisState);
     50    void hysteresisUpdated(PAL::HysteresisState);
    5151
    5252    ChildProcess& m_process;
    53     WebCore::HysteresisActivity m_hysteresis;
     53    PAL::HysteresisActivity m_hysteresis;
    5454    enum class ChildProcessType { Network, WebContent };
    5555    ChildProcessType m_childProcessType;

  • trunk/Source/WebKit/WebProcess/WebPage/WebPage.cpp

    r222613 r222619  
    340340    , m_userMediaPermissionRequestManager { std::make_unique<UserMediaPermissionRequestManager>(*this) }
    341341#endif
    342     , m_pageScrolledHysteresis([this](HysteresisState state) { if (state == HysteresisState::Stopped) pageStoppedScrolling(); }, pageScrollHysteresisDuration)
     342    , m_pageScrolledHysteresis([this](PAL::HysteresisState state) { if (state == PAL::HysteresisState::Stopped) pageStoppedScrolling(); }, pageScrollHysteresisDuration)
    343343    , m_canRunBeforeUnloadConfirmPanel(parameters.canRunBeforeUnloadConfirmPanel)
    344344    , m_canRunModal(parameters.canRunModal)
    … …  
    353353    , m_processSuppressionEnabled(true)
    354354    , m_userActivity("Process suppression disabled for page.")
    355     , m_userActivityHysteresis([this](HysteresisState) { updateUserActivity(); })
     355    , m_userActivityHysteresis([this](PAL::HysteresisState) { updateUserActivity(); })
    356356    , m_userInterfaceLayoutDirection(parameters.userInterfaceLayoutDirection)
    357357    , m_overrideContentSecurityPolicy { parameters.overrideContentSecurityPolicy }
    … …  
    621621void WebPage::updateUserActivity()
    622622{
    623     if (m_userActivityHysteresis.state() == HysteresisState::Started)
     623    if (m_userActivityHysteresis.state() == PAL::HysteresisState::Started)
    624624        m_userActivity.start();
    625625    else

  • trunk/Source/WebKit/WebProcess/WebPage/WebPage.h

    r222492 r222619  
    5050#include <WebCore/DictionaryPopupInfo.h>
    5151#include <WebCore/FrameLoaderTypes.h>
    52 #include <WebCore/HysteresisActivity.h>
    5352#include <WebCore/IntRect.h>
    5453#include <WebCore/IntSizeHash.h>
    … …  
    6261#include <WebCore/WebCoreKeyboardUIMode.h>
    6362#include <memory>
     63#include <pal/HysteresisActivity.h>
    6464#include <wtf/HashMap.h>
    6565#include <wtf/MonotonicTime.h>
    … …  
    14541454    Vector<RefPtr<SandboxExtension>> m_pendingDropExtensionsForFileUpload;
    14551455
    1456     WebCore::HysteresisActivity m_pageScrolledHysteresis;
     1456    PAL::HysteresisActivity m_pageScrolledHysteresis;
    14571457
    14581458    bool m_canRunBeforeUnloadConfirmPanel { false };
    … …  
    15541554    bool m_processSuppressionEnabled;
    15551555    UserActivity m_userActivity;
    1556     WebCore::HysteresisActivity m_userActivityHysteresis;
     1556    PAL::HysteresisActivity m_userActivityHysteresis;
    15571557
    15581558    uint64_t m_pendingNavigationID { 0 };

  • trunk/Source/WebKit/WebProcess/WebProcess.cpp

    r221768 r222619  
    163163    , m_webLoaderStrategy(*new WebLoaderStrategy)
    164164    , m_cacheStorageProvider(WebCacheStorageProvider::create())
    165     , m_dnsPrefetchHystereris([this](HysteresisState state) { if (state == HysteresisState::Stopped) m_dnsPrefetchedHosts.clear(); })
     165    , m_dnsPrefetchHystereris([this](PAL::HysteresisState state) { if (state == PAL::HysteresisState::Stopped) m_dnsPrefetchedHosts.clear(); })
    166166#if ENABLE(NETSCAPE_PLUGIN_API)
    167167    , m_pluginProcessConnectionManager(PluginProcessConnectionManager::create())

  • trunk/Source/WebKit/WebProcess/WebProcess.h

    r221743 r222619  
    3535#include "WebInspectorInterruptDispatcher.h"
    3636#include <WebCore/ActivityState.h>
    37 #include <WebCore/HysteresisActivity.h>
    3837#include <WebCore/Timer.h>
     38#include <pal/HysteresisActivity.h>
    3939#include <pal/SessionID.h>
    4040#include <wtf/Forward.h>
    … …  
    390390
    391391    HashSet<String> m_dnsPrefetchedHosts;
    392     WebCore::HysteresisActivity m_dnsPrefetchHystereris;
     392    PAL::HysteresisActivity m_dnsPrefetchHystereris;
    393393
    394394    std::unique_ptr<WebAutomationSessionProxy> m_automationSessionProxy;
Note: See TracChangeset for help on using the changeset viewer.