⚠ Archived content — this site is no longer maintained.   Current WebKit documentation is at docs.webkit.org.

Changeset 242888 in webkit


Ignore:
Timestamp:
Mar 13, 2019, 10:28:21 AM (7 years ago)
Author:
bshafiei@apple.com
Message:

Apply patch. rdar://problem/48839383

Cherry-pick r242230. rdar://problem/48839383

Revert r232263: it caused processes to crash because process was suspended with locked file
​https://bugs.webkit.org/show_bug.cgi?id=195122
<rdar://problem/48444599>

Reviewed by Geoffrey Garen.

  • NetworkProcess/NetworkProcess.cpp: (WebKit::NetworkProcess::NetworkProcess):
  • NetworkProcess/NetworkProcess.h:
  • Shared/WebSQLiteDatabaseTracker.cpp: (WebKit::WebSQLiteDatabaseTracker::WebSQLiteDatabaseTracker): (WebKit::WebSQLiteDatabaseTracker::hysteresisUpdated):
  • Shared/WebSQLiteDatabaseTracker.h:
  • WebProcess/WebProcess.cpp: (WebKit::m_webSQLiteDatabaseTracker): (WebKit::m_nonVisibleProcessCleanupTimer): Deleted.
  • WebProcess/WebProcess.h:

git-svn-id: ​http://svn.webkit.org/repository/webkit/trunk@242230 268f45cc-cd09-0410-ab3c-d52691b4dbfc

Location:
branches/safari-607-branch/Source/WebKit
Files:
6 edited

Legend:

Unmodified
Added
Removed

  • branches/safari-607-branch/Source/WebKit/ChangeLog

    r242860 r242888  
     12019-03-13  Babak Shafiei  <bshafiei@apple.com>
     2
     3        Apply patch. rdar://problem/48839383
     4
     5    Cherry-pick r242230. rdar://problem/48839383
     6   
     7        Revert r232263: it caused processes to crash because process was suspended with locked file
     8        https://bugs.webkit.org/show_bug.cgi?id=195122
     9        <rdar://problem/48444599>
     10   
     11        Reviewed by Geoffrey Garen.
     12   
     13        * NetworkProcess/NetworkProcess.cpp:
     14        (WebKit::NetworkProcess::NetworkProcess):
     15        * NetworkProcess/NetworkProcess.h:
     16        * Shared/WebSQLiteDatabaseTracker.cpp:
     17        (WebKit::WebSQLiteDatabaseTracker::WebSQLiteDatabaseTracker):
     18        (WebKit::WebSQLiteDatabaseTracker::hysteresisUpdated):
     19        * Shared/WebSQLiteDatabaseTracker.h:
     20        * WebProcess/WebProcess.cpp:
     21        (WebKit::m_webSQLiteDatabaseTracker):
     22        (WebKit::m_nonVisibleProcessCleanupTimer): Deleted.
     23        * WebProcess/WebProcess.h:
     24   
     25        git-svn-id: http://svn.webkit.org/repository/webkit/trunk@242230 268f45cc-cd09-0410-ab3c-d52691b4dbfc
     26
     27    2019-03-13  Babak Shafiei  <bshafiei@apple.com>
     28
     29            Cherry-pick r242230. rdar://problem/48839383
     30
     31        Revert r232263: it caused processes to crash because process was suspended with locked file
     32        https://bugs.webkit.org/show_bug.cgi?id=195122
     33        <rdar://problem/48444599>
     34
     35        Reviewed by Geoffrey Garen.
     36
     37        * NetworkProcess/NetworkProcess.cpp:
     38        (WebKit::NetworkProcess::NetworkProcess):
     39        * NetworkProcess/NetworkProcess.h:
     40        * Shared/WebSQLiteDatabaseTracker.cpp:
     41        (WebKit::WebSQLiteDatabaseTracker::WebSQLiteDatabaseTracker):
     42        (WebKit::WebSQLiteDatabaseTracker::hysteresisUpdated):
     43        * Shared/WebSQLiteDatabaseTracker.h:
     44        * WebProcess/WebProcess.cpp:
     45        (WebKit::m_webSQLiteDatabaseTracker):
     46        (WebKit::m_nonVisibleProcessCleanupTimer): Deleted.
     47        * WebProcess/WebProcess.h:
     48
     49
     50        git-svn-id: http://svn.webkit.org/repository/webkit/trunk@242230 268f45cc-cd09-0410-ab3c-d52691b4dbfc
     51
     52        2019-02-28  Sihui Liu  <sihui_liu@apple.com>
     53
     54            Revert r232263: it caused processes to crash because process was suspended with locked file
     55            https://bugs.webkit.org/show_bug.cgi?id=195122
     56            <rdar://problem/48444599>
     57
     58            Reviewed by Geoffrey Garen.
     59
     60            * NetworkProcess/NetworkProcess.cpp:
     61            (WebKit::NetworkProcess::NetworkProcess):
     62            * NetworkProcess/NetworkProcess.h:
     63            * Shared/WebSQLiteDatabaseTracker.cpp:
     64            (WebKit::WebSQLiteDatabaseTracker::WebSQLiteDatabaseTracker):
     65            (WebKit::WebSQLiteDatabaseTracker::hysteresisUpdated):
     66            * Shared/WebSQLiteDatabaseTracker.h:
     67            * WebProcess/WebProcess.cpp:
     68            (WebKit::m_webSQLiteDatabaseTracker):
     69            (WebKit::m_nonVisibleProcessCleanupTimer): Deleted.
     70            * WebProcess/WebProcess.h:
     71
    1722019-03-13  Babak Shafiei  <bshafiei@apple.com>
    273

  • branches/safari-607-branch/Source/WebKit/NetworkProcess/NetworkProcess.cpp

    r239671 r242888  
    128128    , m_clearCacheDispatchGroup(0)
    129129#endif
     130#if PLATFORM(IOS_FAMILY)
     131    , m_webSQLiteDatabaseTracker(*this)
     132#endif
    130133    , m_storageTaskQueue(WorkQueue::create("com.apple.WebKit.StorageTask"))
    131134#if ENABLE(INDEXED_DATABASE)

  • branches/safari-607-branch/Source/WebKit/NetworkProcess/NetworkProcess.h

    r239671 r242888  
    4646#include <wtf/RetainPtr.h>
    4747
     48#if PLATFORM(IOS_FAMILY)
     49#include "WebSQLiteDatabaseTracker.h"
     50#endif
     51
    4852namespace IPC {
    4953class FormDataReference;
    … …  
    379383#endif
    380384
     385#if PLATFORM(IOS_FAMILY)
     386    WebSQLiteDatabaseTracker m_webSQLiteDatabaseTracker;
     387#endif
     388
    381389    Ref<WorkQueue> m_storageTaskQueue;
    382390

  • branches/safari-607-branch/Source/WebKit/Shared/WebSQLiteDatabaseTracker.cpp

    r239124 r242888  
    7676        m_process.parentProcessConnection()->send(Messages::NetworkProcessProxy::SetIsHoldingLockedFiles(state == PAL::HysteresisState::Started), 0);
    7777        break;
     78    default:
     79        ASSERT_NOT_REACHED();
    7880    }
    7981}

  • branches/safari-607-branch/Source/WebKit/WebProcess/WebProcess.cpp

    r242135 r242888  
    183183#endif
    184184    , m_nonVisibleProcessCleanupTimer(*this, &WebProcess::nonVisibleProcessCleanupTimerFired)
     185#if PLATFORM(IOS_FAMILY)
     186    , m_webSQLiteDatabaseTracker(*this)
     187#endif
    185188{
    186189    // Initialize our platform strategies.

  • branches/safari-607-branch/Source/WebKit/WebProcess/WebProcess.h

    r242135 r242888  
    5353#endif
    5454
     55#if PLATFORM(IOS_FAMILY)
     56#include "WebSQLiteDatabaseTracker.h"
     57#endif
     58
    5559namespace API {
    5660class Object;
    … …  
    463467    RefPtr<WebCore::ApplicationCacheStorage> m_applicationCacheStorage;
    464468
     469#if PLATFORM(IOS_FAMILY)
     470    WebSQLiteDatabaseTracker m_webSQLiteDatabaseTracker;
     471#endif
     472
    465473    enum PageMarkingLayersAsVolatileCounterType { };
    466474    using PageMarkingLayersAsVolatileCounter = RefCounter<PageMarkingLayersAsVolatileCounterType>;
Note: See TracChangeset for help on using the changeset viewer.