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

Changeset 180704 in webkit


Ignore:
Timestamp:
Feb 26, 2015, 3:22:17 PM (12 years ago)
Author:
Chris Dumez
Message:

Rename DatabaseManager::manager() to DatabaseManager::singleton()
​https://bugs.webkit.org/show_bug.cgi?id=142054

Reviewed by Ryosuke Niwa.

Rename DatabaseManager::manager() to DatabaseManager::singleton() as
per coding style and use WTF::NeverDestroyed.

Source/WebCore:

  • Modules/webdatabase/DOMWindowWebDatabase.cpp:

(WebCore::DOMWindowWebDatabase::openDatabase):

  • Modules/webdatabase/DatabaseBackendBase.cpp:

(WebCore::DatabaseBackendBase::DatabaseBackendBase):

  • Modules/webdatabase/DatabaseContext.cpp:

(WebCore::DatabaseContext::DatabaseContext):
(WebCore::DatabaseContext::~DatabaseContext):
(WebCore::DatabaseContext::stopDatabases):
(WebCore::DatabaseContext::databaseExceededQuota):

  • Modules/webdatabase/DatabaseManager.cpp:

(WebCore::DatabaseManager::singleton):
(WebCore::DatabaseManager::manager): Deleted.

  • Modules/webdatabase/DatabaseManager.h:

(WebCore::DatabaseManager::~DatabaseManager): Deleted.

  • Modules/webdatabase/SQLTransactionClient.cpp:

(WebCore::SQLTransactionClient::didExceedQuota):

  • history/PageCache.cpp:

(WebCore::logCanCacheFrameDecision):
(WebCore::PageCache::canCachePageContainingThisFrame):

  • loader/FrameLoader.cpp:

(WebCore::FrameLoader::stopLoading):

Source/WebKit/mac:

  • Storage/WebDatabaseManager.mm:

(-[WebDatabaseManager init]):
(-[WebDatabaseManager origins]):
(-[WebDatabaseManager databasesWithOrigin:]):
(-[WebDatabaseManager detailsForDatabase:withOrigin:]):
(-[WebDatabaseManager deleteAllDatabases]):
(-[WebDatabaseManager deleteOrigin:]):
(-[WebDatabaseManager deleteDatabase:withOrigin:]):

  • Storage/WebDatabaseQuotaManager.mm:

(-[WebDatabaseQuotaManager usage]):
(-[WebDatabaseQuotaManager quota]):
(-[WebDatabaseQuotaManager setQuota:]):

  • WebCoreSupport/WebSecurityOrigin.mm:

(-[WebSecurityOrigin usage]):
(-[WebSecurityOrigin quota]):
(-[WebSecurityOrigin setQuota:]):

  • WebView/WebFrame.mm:

(-[WebFrame _cacheabilityDictionary]):

  • WebView/WebView.mm:

(-[WebView _preferencesChanged:]):

Source/WebKit/win:

  • WebDatabaseManager.cpp:

(WebDatabaseManager::sharedWebDatabaseManager):
(WebDatabaseManager::origins):
(WebDatabaseManager::databasesWithOrigin):
(WebDatabaseManager::detailsForDatabase):
(WebDatabaseManager::deleteAllDatabases):
(WebDatabaseManager::deleteOrigin):
(WebDatabaseManager::deleteDatabase):
(WebDatabaseManager::setQuota):
(WebKitInitializeWebDatabasesIfNecessary):

  • WebSecurityOrigin.cpp:

(WebSecurityOrigin::usage):
(WebSecurityOrigin::quota):
(WebSecurityOrigin::setQuota):

  • WebView.cpp:

(WebView::notifyPreferencesChanged):

Source/WebKit2:

  • WebProcess/WebCoreSupport/WebChromeClient.cpp:

(WebKit::WebChromeClient::exceededDatabaseQuota):

  • WebProcess/WebCoreSupport/WebDatabaseManager.cpp:

(WebKit::WebDatabaseManager::initialize):
(WebKit::WebDatabaseManager::getDatabasesByOrigin):
(WebKit::WebDatabaseManager::getDatabaseOrigins):
(WebKit::WebDatabaseManager::deleteDatabaseWithNameForOrigin):
(WebKit::WebDatabaseManager::deleteDatabasesForOrigin):
(WebKit::WebDatabaseManager::deleteAllDatabases):
(WebKit::WebDatabaseManager::setQuotaForOrigin):

  • WebProcess/WebPage/WebPage.cpp:

(WebKit::WebPage::updatePreferences):

Location:
trunk/Source
Files:
23 edited

Legend:

Unmodified
Added
Removed

  • trunk/Source/WebCore/ChangeLog

    r180700 r180704  
     12015-02-26  Chris Dumez  <cdumez@apple.com>
     2
     3        Rename DatabaseManager::manager() to DatabaseManager::singleton()
     4        https://bugs.webkit.org/show_bug.cgi?id=142054
     5
     6        Reviewed by Ryosuke Niwa.
     7
     8        Rename DatabaseManager::manager() to DatabaseManager::singleton() as
     9        per coding style and use WTF::NeverDestroyed.
     10
     11        * Modules/webdatabase/DOMWindowWebDatabase.cpp:
     12        (WebCore::DOMWindowWebDatabase::openDatabase):
     13        * Modules/webdatabase/DatabaseBackendBase.cpp:
     14        (WebCore::DatabaseBackendBase::DatabaseBackendBase):
     15        * Modules/webdatabase/DatabaseContext.cpp:
     16        (WebCore::DatabaseContext::DatabaseContext):
     17        (WebCore::DatabaseContext::~DatabaseContext):
     18        (WebCore::DatabaseContext::stopDatabases):
     19        (WebCore::DatabaseContext::databaseExceededQuota):
     20        * Modules/webdatabase/DatabaseManager.cpp:
     21        (WebCore::DatabaseManager::singleton):
     22        (WebCore::DatabaseManager::manager): Deleted.
     23        * Modules/webdatabase/DatabaseManager.h:
     24        (WebCore::DatabaseManager::~DatabaseManager): Deleted.
     25        * Modules/webdatabase/SQLTransactionClient.cpp:
     26        (WebCore::SQLTransactionClient::didExceedQuota):
     27        * history/PageCache.cpp:
     28        (WebCore::logCanCacheFrameDecision):
     29        (WebCore::PageCache::canCachePageContainingThisFrame):
     30        * loader/FrameLoader.cpp:
     31        (WebCore::FrameLoader::stopLoading):
     32
    1332015-02-26  Csaba Osztrogonác  <ossy@webkit.org>
    234

  • trunk/Source/WebCore/Modules/webdatabase/DOMWindowWebDatabase.cpp

    r178575 r180704  
    4444
    4545    RefPtr<Database> database = 0;
    46     DatabaseManager& dbManager = DatabaseManager::manager();
     46    DatabaseManager& dbManager = DatabaseManager::singleton();
    4747    DatabaseError error = DatabaseError::None;
    4848    if (dbManager.isAvailable() && window->document()->securityOrigin()->canAccessDatabase(window->document()->topOrigin())) {

  • trunk/Source/WebCore/Modules/webdatabase/DatabaseBackendBase.cpp

    r178575 r180704  
    230230    }
    231231
    232     m_filename = DatabaseManager::manager().fullPathForDatabase(securityOrigin(), m_name);
     232    m_filename = DatabaseManager::singleton().fullPathForDatabase(securityOrigin(), m_name);
    233233}
    234234

  • trunk/Source/WebCore/Modules/webdatabase/DatabaseContext.cpp

    r178575 r180704  
    111111    // For debug accounting only. We must do this before we register the
    112112    // instance. The assertions assume this.
    113     DatabaseManager::manager().didConstructDatabaseContext();
    114 
    115     DatabaseManager::manager().registerDatabaseContext(this);
     113    auto& databaseManager = DatabaseManager::singleton();
     114    databaseManager.didConstructDatabaseContext();
     115
     116    databaseManager.registerDatabaseContext(this);
    116117}
    117118
    … …  
    123124    // For debug accounting only. We must call this last. The assertions assume
    124125    // this.
    125     DatabaseManager::manager().didDestructDatabaseContext();
     126    DatabaseManager::singleton().didDestructDatabaseContext();
    126127}
    127128
    … …  
    186187{
    187188    if (m_isRegistered) {
    188         DatabaseManager::manager().unregisterDatabaseContext(this);
     189        DatabaseManager::singleton().unregisterDatabaseContext(this);
    189190        m_isRegistered = false;
    190191    }
    … …  
    232233    // FIXME: This needs a real implementation; this is a temporary solution for testing.
    233234    const unsigned long long defaultQuota = 5 * 1024 * 1024;
    234     DatabaseManager::manager().setQuota(m_scriptExecutionContext->securityOrigin(), defaultQuota);
     235    DatabaseManager::singleton().setQuota(m_scriptExecutionContext->securityOrigin(), defaultQuota);
    235236}
    236237

  • trunk/Source/WebCore/Modules/webdatabase/DatabaseManager.cpp

    r178575 r180704  
    4242#include "ScriptExecutionContext.h"
    4343#include "SecurityOrigin.h"
     44#include <wtf/NeverDestroyed.h>
    4445
    4546namespace WebCore {
    … …  
    5859}
    5960
    60 DatabaseManager& DatabaseManager::manager()
    61 {
    62     static DatabaseManager* dbManager = 0;
    63     // FIXME: The following is vulnerable to a race between threads. Need to
    64     // implement a thread safe on-first-use static initializer.
    65     if (!dbManager)
    66         dbManager = new DatabaseManager();
    67 
    68     return *dbManager;
     61DatabaseManager& DatabaseManager::singleton()
     62{
     63    static NeverDestroyed<DatabaseManager> instance;
     64    return instance;
    6965}
    7066

  • trunk/Source/WebCore/Modules/webdatabase/DatabaseManager.h

    r178575 r180704  
    5252class DatabaseManager {
    5353    WTF_MAKE_NONCOPYABLE(DatabaseManager); WTF_MAKE_FAST_ALLOCATED;
     54    friend class WTF::NeverDestroyed<DatabaseManager>;
    5455public:
    55     WEBCORE_EXPORT static DatabaseManager& manager();
     56    WEBCORE_EXPORT static DatabaseManager& singleton();
    5657
    5758    WEBCORE_EXPORT void initialize(const String& databasePath);
    … …  
    122123
    123124    DatabaseManager();
    124     ~DatabaseManager() { }
     125    ~DatabaseManager() = delete;
    125126
    126127    // This gets a DatabaseContext for the specified ScriptExecutionContext if

  • trunk/Source/WebCore/Modules/webdatabase/SQLTransactionClient.cpp

    r178575 r180704  
    5050{
    5151    ASSERT(database->databaseContext()->scriptExecutionContext()->isContextThread());
    52     unsigned long long currentQuota = DatabaseManager::manager().quotaForOrigin(database->securityOrigin());
     52    auto& databaseManager = DatabaseManager::singleton();
     53    unsigned long long currentQuota = databaseManager.quotaForOrigin(database->securityOrigin());
    5354    database->databaseContext()->databaseExceededQuota(database->stringIdentifier(), database->details());
    54     unsigned long long newQuota = DatabaseManager::manager().quotaForOrigin(database->securityOrigin());
     55    unsigned long long newQuota = databaseManager.quotaForOrigin(database->securityOrigin());
    5556    return (newQuota > currentQuota);
    5657}

  • trunk/Source/WebCore/history/PageCache.cpp

    r180534 r180704  
    154154        rejectReasons |= 1 << IsHttpsAndCacheControlled;
    155155    }
    156     if (DatabaseManager::manager().hasOpenDatabases(frame.document())) {
     156    if (DatabaseManager::singleton().hasOpenDatabases(frame.document())) {
    157157        PCLOG("   -Frame has open database handles");
    158158        logPageCacheFailureDiagnosticMessage(diagnosticLoggingClient, DiagnosticLoggingKeys::hasOpenDatabasesKey());
    … …  
    320320        && (!frameLoader.subframeLoader().containsPlugins() || frame.page()->settings().pageCacheSupportsPlugins())
    321321        && !(frame.isMainFrame() && document->url().protocolIs("https") && documentLoader->response().cacheControlContainsNoStore())
    322         && !DatabaseManager::manager().hasOpenDatabases(document)
     322        && !DatabaseManager::singleton().hasOpenDatabases(document)
    323323        && frameLoader.history().currentItem()
    324324        && !frameLoader.quickRedirectComing()

  • trunk/Source/WebCore/loader/FrameLoader.cpp

    r180517 r180704  
    489489
    490490        // FIXME: Should the DatabaseManager watch for something like ActiveDOMObject::stop() rather than being special-cased here?
    491         DatabaseManager::manager().stopDatabases(doc, 0);
     491        DatabaseManager::singleton().stopDatabases(doc, 0);
    492492    }
    493493

  • trunk/Source/WebKit/mac/ChangeLog

    r180689 r180704  
     12015-02-26  Chris Dumez  <cdumez@apple.com>
     2
     3        Rename DatabaseManager::manager() to DatabaseManager::singleton()
     4        https://bugs.webkit.org/show_bug.cgi?id=142054
     5
     6        Reviewed by Ryosuke Niwa.
     7
     8        Rename DatabaseManager::manager() to DatabaseManager::singleton() as
     9        per coding style and use WTF::NeverDestroyed.
     10
     11        * Storage/WebDatabaseManager.mm:
     12        (-[WebDatabaseManager init]):
     13        (-[WebDatabaseManager origins]):
     14        (-[WebDatabaseManager databasesWithOrigin:]):
     15        (-[WebDatabaseManager detailsForDatabase:withOrigin:]):
     16        (-[WebDatabaseManager deleteAllDatabases]):
     17        (-[WebDatabaseManager deleteOrigin:]):
     18        (-[WebDatabaseManager deleteDatabase:withOrigin:]):
     19        * Storage/WebDatabaseQuotaManager.mm:
     20        (-[WebDatabaseQuotaManager usage]):
     21        (-[WebDatabaseQuotaManager quota]):
     22        (-[WebDatabaseQuotaManager setQuota:]):
     23        * WebCoreSupport/WebSecurityOrigin.mm:
     24        (-[WebSecurityOrigin usage]):
     25        (-[WebSecurityOrigin quota]):
     26        (-[WebSecurityOrigin setQuota:]):
     27        * WebView/WebFrame.mm:
     28        (-[WebFrame _cacheabilityDictionary]):
     29        * WebView/WebView.mm:
     30        (-[WebView _preferencesChanged:]):
     31
    1322015-02-26  Myles C. Maxfield  <mmaxfield@apple.com>
    233

  • trunk/Source/WebKit/mac/Storage/WebDatabaseManager.mm

    r178575 r180704  
    7575    WebPlatformStrategies::initializeIfNecessary();
    7676
    77     DatabaseManager& dbManager = DatabaseManager::manager();
     77    DatabaseManager& dbManager = DatabaseManager::singleton();
    7878
    7979    // Set the database root path in WebCore
    … …  
    8989{
    9090    Vector<RefPtr<SecurityOrigin>> coreOrigins;
    91     DatabaseManager::manager().origins(coreOrigins);
     91    DatabaseManager::singleton().origins(coreOrigins);
    9292    NSMutableArray *webOrigins = [[NSMutableArray alloc] initWithCapacity:coreOrigins.size()];
    9393
    … …  
    104104{
    105105    Vector<String> nameVector;
    106     if (!DatabaseManager::manager().databaseNamesForOrigin([origin _core], nameVector))
     106    if (!DatabaseManager::singleton().databaseNamesForOrigin([origin _core], nameVector))
    107107        return nil;
    108108   
    … …  
    119119    static id keys[3] = {WebDatabaseDisplayNameKey, WebDatabaseExpectedSizeKey, WebDatabaseUsageKey};
    120120   
    121     DatabaseDetails details = DatabaseManager::manager().detailsForNameAndOrigin(databaseIdentifier, [origin _core]);
     121    DatabaseDetails details = DatabaseManager::singleton().detailsForNameAndOrigin(databaseIdentifier, [origin _core]);
    122122    if (details.name().isNull())
    123123        return nil;
    … …  
    133133- (void)deleteAllDatabases
    134134{
    135     DatabaseManager::manager().deleteAllDatabases();
     135    DatabaseManager::singleton().deleteAllDatabases();
    136136#if PLATFORM(IOS)
    137137    // FIXME: This needs to be removed once DatabaseTrackers in multiple processes
    … …  
    143143- (BOOL)deleteOrigin:(WebSecurityOrigin *)origin
    144144{
    145     return DatabaseManager::manager().deleteOrigin([origin _core]);
     145    return DatabaseManager::singleton().deleteOrigin([origin _core]);
    146146}
    147147
    148148- (BOOL)deleteDatabase:(NSString *)databaseIdentifier withOrigin:(WebSecurityOrigin *)origin
    149149{
    150     return DatabaseManager::manager().deleteDatabase([origin _core], databaseIdentifier);
     150    return DatabaseManager::singleton().deleteDatabase([origin _core], databaseIdentifier);
    151151}
    152152

  • trunk/Source/WebKit/mac/Storage/WebDatabaseQuotaManager.mm

    r178575 r180704  
    5050- (unsigned long long)usage
    5151{
    52     return DatabaseManager::manager().usageForOrigin([_origin _core]);
     52    return DatabaseManager::singleton().usageForOrigin([_origin _core]);
    5353}
    5454
    5555- (unsigned long long)quota
    5656{
    57     return DatabaseManager::manager().quotaForOrigin([_origin _core]);
     57    return DatabaseManager::singleton().quotaForOrigin([_origin _core]);
    5858}
    5959
    … …  
    6363- (void)setQuota:(unsigned long long)quota
    6464{
    65     DatabaseManager::manager().setQuota([_origin _core], quota);
     65    DatabaseManager::singleton().setQuota([_origin _core], quota);
    6666}
    6767

  • trunk/Source/WebKit/mac/WebCoreSupport/WebSecurityOrigin.mm

    r178575 r180704  
    180180- (unsigned long long)usage
    181181{
    182     return DatabaseManager::manager().usageForOrigin(reinterpret_cast<SecurityOrigin*>(_private));
     182    return DatabaseManager::singleton().usageForOrigin(reinterpret_cast<SecurityOrigin*>(_private));
    183183}
    184184
    185185- (unsigned long long)quota
    186186{
    187     return DatabaseManager::manager().quotaForOrigin(reinterpret_cast<SecurityOrigin*>(_private));
     187    return DatabaseManager::singleton().quotaForOrigin(reinterpret_cast<SecurityOrigin*>(_private));
    188188}
    189189
    190190- (void)setQuota:(unsigned long long)quota
    191191{
    192     DatabaseManager::manager().setQuota(reinterpret_cast<SecurityOrigin*>(_private), quota);
     192    DatabaseManager::singleton().setQuota(reinterpret_cast<SecurityOrigin*>(_private), quota);
    193193}
    194194

  • trunk/Source/WebKit/mac/WebView/WebFrame.mm

    r179236 r180704  
    20942094   
    20952095    if (Document* document = _private->coreFrame->document()) {
    2096         if (DatabaseManager::manager().hasOpenDatabases(document))
     2096        if (DatabaseManager::singleton().hasOpenDatabases(document))
    20972097            [result setObject:[NSNumber numberWithBool:YES] forKey:WebFrameUsesDatabases];
    20982098        if (!document->canSuspendActiveDOMObjects())

  • trunk/Source/WebKit/mac/WebView/WebView.mm

    r180570 r180704  
    23642364#endif // PLATFORM(MAC)
    23652365
    2366     DatabaseManager::manager().setIsAvailable([preferences databasesEnabled]);
     2366    DatabaseManager::singleton().setIsAvailable([preferences databasesEnabled]);
    23672367
    23682368#if ENABLE(MEDIA_SOURCE)

  • trunk/Source/WebKit/win/ChangeLog

    r180653 r180704  
     12015-02-26  Chris Dumez  <cdumez@apple.com>
     2
     3        Rename DatabaseManager::manager() to DatabaseManager::singleton()
     4        https://bugs.webkit.org/show_bug.cgi?id=142054
     5
     6        Reviewed by Ryosuke Niwa.
     7
     8        Rename DatabaseManager::manager() to DatabaseManager::singleton() as
     9        per coding style and use WTF::NeverDestroyed.
     10
     11        * WebDatabaseManager.cpp:
     12        (WebDatabaseManager::sharedWebDatabaseManager):
     13        (WebDatabaseManager::origins):
     14        (WebDatabaseManager::databasesWithOrigin):
     15        (WebDatabaseManager::detailsForDatabase):
     16        (WebDatabaseManager::deleteAllDatabases):
     17        (WebDatabaseManager::deleteOrigin):
     18        (WebDatabaseManager::deleteDatabase):
     19        (WebDatabaseManager::setQuota):
     20        (WebKitInitializeWebDatabasesIfNecessary):
     21        * WebSecurityOrigin.cpp:
     22        (WebSecurityOrigin::usage):
     23        (WebSecurityOrigin::quota):
     24        (WebSecurityOrigin::setQuota):
     25        * WebView.cpp:
     26        (WebView::notifyPreferencesChanged):
     27
    1282015-02-25  Brent Fulgham  <bfulgham@apple.com>
    229

  • trunk/Source/WebKit/win/WebDatabaseManager.cpp

    r178669 r180704  
    202202    if (!s_sharedWebDatabaseManager) {
    203203        s_sharedWebDatabaseManager.adoptRef(WebDatabaseManager::createInstance());
    204         DatabaseManager::manager().setClient(s_sharedWebDatabaseManager.get());
     204        DatabaseManager::singleton().setClient(s_sharedWebDatabaseManager.get());
    205205    }
    206206
    … …  
    220220
    221221    Vector<RefPtr<SecurityOrigin> > origins;
    222     DatabaseManager::manager().origins(origins);
     222    DatabaseManager::singleton().origins(origins);
    223223        COMPtr<COMEnumVariant<Vector<RefPtr<SecurityOrigin> > > > enumVariant(AdoptCOM, COMEnumVariant<Vector<RefPtr<SecurityOrigin> > >::adopt(origins));
    224224
    … …  
    244244
    245245    Vector<String> databaseNames;
    246     DatabaseManager::manager().databaseNamesForOrigin(webSecurityOrigin->securityOrigin(), databaseNames);
     246    DatabaseManager::singleton().databaseNamesForOrigin(webSecurityOrigin->securityOrigin(), databaseNames);
    247247
    248248    COMPtr<COMEnumVariant<Vector<String> > > enumVariant(AdoptCOM, COMEnumVariant<Vector<String> >::adopt(databaseNames));
    … …  
    269269        return E_FAIL;
    270270
    271     DatabaseDetails details = DatabaseManager::manager().detailsForNameAndOrigin(String(databaseName, SysStringLen(databaseName)),
     271    DatabaseDetails details = DatabaseManager::singleton().detailsForNameAndOrigin(String(databaseName, SysStringLen(databaseName)),
    272272        webSecurityOrigin->securityOrigin());
    273273
    … …  
    284284        return E_FAIL;
    285285
    286     DatabaseManager::manager().deleteAllDatabases();
     286    DatabaseManager::singleton().deleteAllDatabases();
    287287
    288288    return S_OK;
    … …  
    302302        return E_FAIL;
    303303
    304     DatabaseManager::manager().deleteOrigin(webSecurityOrigin->securityOrigin());
     304    DatabaseManager::singleton().deleteOrigin(webSecurityOrigin->securityOrigin());
    305305
    306306    return S_OK;
    … …  
    324324        return E_FAIL;
    325325
    326     DatabaseManager::manager().deleteDatabase(webSecurityOrigin->securityOrigin(), String(databaseName, SysStringLen(databaseName)));
     326    DatabaseManager::singleton().deleteDatabase(webSecurityOrigin->securityOrigin(), String(databaseName, SysStringLen(databaseName)));
    327327
    328328    return S_OK;
    … …  
    381381        return E_FAIL;
    382382
    383     DatabaseManager::manager().setQuota(SecurityOrigin::createFromString(origin).ptr(), quota);
     383    DatabaseManager::singleton().setQuota(SecurityOrigin::createFromString(origin).ptr(), quota);
    384384
    385385    return S_OK;
    … …  
    422422        return;
    423423
    424     WebCore::DatabaseManager::manager().initialize(databasesDirectory());
     424    WebCore::DatabaseManager::singleton().initialize(databasesDirectory());
    425425
    426426    initialized = true;

  • trunk/Source/WebKit/win/WebSecurityOrigin.cpp

    r178575 r180704  
    127127        return E_POINTER;
    128128
    129     *result = DatabaseManager::manager().usageForOrigin(m_securityOrigin.get());
     129    *result = DatabaseManager::singleton().usageForOrigin(m_securityOrigin.get());
    130130
    131131    return S_OK;
    … …  
    137137        return E_POINTER;
    138138
    139     *result = DatabaseManager::manager().quotaForOrigin(m_securityOrigin.get());
     139    *result = DatabaseManager::singleton().quotaForOrigin(m_securityOrigin.get());
    140140    return S_OK;
    141141}
    … …  
    143143HRESULT WebSecurityOrigin::setQuota(/* [in] */ unsigned long long quota)
    144144{
    145     DatabaseManager::manager().setQuota(m_securityOrigin.get(), quota);
     145    DatabaseManager::singleton().setQuota(m_securityOrigin.get(), quota);
    146146
    147147    return S_OK;

  • trunk/Source/WebKit/win/WebView.cpp

    r180653 r180704  
    49974997    if (FAILED(hr))
    49984998        return hr;
    4999     DatabaseManager::manager().setIsAvailable(enabled);
     4999    DatabaseManager::singleton().setIsAvailable(enabled);
    50005000
    50015001    hr = prefsPrivate->localStorageEnabled(&enabled);

  • trunk/Source/WebKit2/ChangeLog

    r180689 r180704  
     12015-02-26  Chris Dumez  <cdumez@apple.com>
     2
     3        Rename DatabaseManager::manager() to DatabaseManager::singleton()
     4        https://bugs.webkit.org/show_bug.cgi?id=142054
     5
     6        Reviewed by Ryosuke Niwa.
     7
     8        Rename DatabaseManager::manager() to DatabaseManager::singleton() as
     9        per coding style and use WTF::NeverDestroyed.
     10
     11        * WebProcess/WebCoreSupport/WebChromeClient.cpp:
     12        (WebKit::WebChromeClient::exceededDatabaseQuota):
     13        * WebProcess/WebCoreSupport/WebDatabaseManager.cpp:
     14        (WebKit::WebDatabaseManager::initialize):
     15        (WebKit::WebDatabaseManager::getDatabasesByOrigin):
     16        (WebKit::WebDatabaseManager::getDatabaseOrigins):
     17        (WebKit::WebDatabaseManager::deleteDatabaseWithNameForOrigin):
     18        (WebKit::WebDatabaseManager::deleteDatabasesForOrigin):
     19        (WebKit::WebDatabaseManager::deleteAllDatabases):
     20        (WebKit::WebDatabaseManager::setQuotaForOrigin):
     21        * WebProcess/WebPage/WebPage.cpp:
     22        (WebKit::WebPage::updatePreferences):
     23
    1242015-02-26  Myles C. Maxfield  <mmaxfield@apple.com>
    225

  • trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebChromeClient.cpp

    r180607 r180704  
    690690    SecurityOrigin* origin = frame->document()->securityOrigin();
    691691
    692     DatabaseManager& dbManager = DatabaseManager::manager();
     692    DatabaseManager& dbManager = DatabaseManager::singleton();
    693693    uint64_t currentQuota = dbManager.quotaForOrigin(origin);
    694694    uint64_t currentOriginUsage = dbManager.usageForOrigin(origin);

  • trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebDatabaseManager.cpp

    r178575 r180704  
    5454void WebDatabaseManager::initialize(const WebProcessCreationParameters& parameters)
    5555{
    56     DatabaseManager::manager().initialize(parameters.webSQLDatabaseDirectory);
    57     DatabaseManager::manager().setClient(this);
     56    auto& databaseManager = DatabaseManager::singleton();
     57    databaseManager.initialize(parameters.webSQLDatabaseDirectory);
     58    databaseManager.setClient(this);
    5859}
    5960
    … …  
    6465    // shot.  That would avoid taking the numerous locks this requires.
    6566
     67    auto& databaseManager = DatabaseManager::singleton();
    6668    Vector<RefPtr<SecurityOrigin>> origins;
    67     DatabaseManager::manager().origins(origins);
     69    databaseManager.origins(origins);
    6870
    6971    Vector<OriginAndDatabases> originAndDatabasesVector;
    … …  
    7476
    7577        Vector<String> nameVector;
    76         if (!DatabaseManager::manager().databaseNamesForOrigin(origins[i].get(), nameVector))
     78        if (!databaseManager.databaseNamesForOrigin(origins[i].get(), nameVector))
    7779            continue;
    7880
    … …  
    8082        detailsVector.reserveInitialCapacity(nameVector.size());
    8183        for (size_t j = 0; j < nameVector.size(); j++) {
    82             DatabaseDetails details = DatabaseManager::manager().detailsForNameAndOrigin(nameVector[j], origins[i].get());
     84            DatabaseDetails details = databaseManager.detailsForNameAndOrigin(nameVector[j], origins[i].get());
    8385            if (details.name().isNull())
    8486                continue;
    … …  
    9193
    9294        originAndDatabases.originIdentifier = origins[i]->databaseIdentifier();
    93         originAndDatabases.originQuota = DatabaseManager::manager().quotaForOrigin(origins[i].get());
    94         originAndDatabases.originUsage = DatabaseManager::manager().usageForOrigin(origins[i].get());
     95        originAndDatabases.originQuota = databaseManager.quotaForOrigin(origins[i].get());
     96        originAndDatabases.originUsage = databaseManager.usageForOrigin(origins[i].get());
    9597        originAndDatabases.databases.swap(detailsVector);
    9698        originAndDatabasesVector.append(originAndDatabases);
    … …  
    103105{
    104106    Vector<RefPtr<SecurityOrigin>> origins;
    105     DatabaseManager::manager().origins(origins);
     107    DatabaseManager::singleton().origins(origins);
    106108
    107109    size_t numOrigins = origins.size();
    … …  
    119121        return;
    120122
    121     DatabaseManager::manager().deleteDatabase(origin.get(), databaseIdentifier);
     123    DatabaseManager::singleton().deleteDatabase(origin.get(), databaseIdentifier);
    122124}
    123125
    … …  
    128130        return;
    129131
    130     DatabaseManager::manager().deleteOrigin(origin.get());
     132    DatabaseManager::singleton().deleteOrigin(origin.get());
    131133}
    132134
    133135void WebDatabaseManager::deleteAllDatabases() const
    134136{
    135     DatabaseManager::manager().deleteAllDatabases();
     137    DatabaseManager::singleton().deleteAllDatabases();
    136138}
    137139
    … …  
    146148        return;
    147149
    148     DatabaseManager::manager().setQuota(origin.get(), quota);
     150    DatabaseManager::singleton().setQuota(origin.get(), quota);
    149151}
    150152

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

    r180570 r180704  
    27152715    settings.setSpatialNavigationEnabled(store.getBoolValueForKey(WebPreferencesKey::spatialNavigationEnabledKey()));
    27162716
    2717     DatabaseManager::manager().setIsAvailable(store.getBoolValueForKey(WebPreferencesKey::databasesEnabledKey()));
     2717    DatabaseManager::singleton().setIsAvailable(store.getBoolValueForKey(WebPreferencesKey::databasesEnabledKey()));
    27182718
    27192719#if ENABLE(FULLSCREEN_API)
Note: See TracChangeset for help on using the changeset viewer.