Changeset 148147 in webkit


Ignore:
Timestamp:
Apr 10, 2013 4:21:59 PM (11 years ago)
Author:
andersca@apple.com
Message:

Rename StorageNamespaceProxy to StorageNamespaceImpl.

Rubber-stamped by Beth Dakin.

  • WebKit2.xcodeproj/project.pbxproj:
  • WebProcess/Storage/StorageAreaProxy.cpp:

(WebKit::StorageAreaProxy::create):
(WebKit::StorageAreaProxy::StorageAreaProxy):

  • WebProcess/Storage/StorageAreaProxy.h:

(StorageAreaProxy):

  • WebProcess/Storage/StorageNamespaceImpl.cpp: Renamed from Source/WebKit2/WebProcess/Storage/StorageNamespaceProxy.cpp.
  • WebProcess/Storage/StorageNamespaceImpl.h: Renamed from Source/WebKit2/WebProcess/Storage/StorageNamespaceProxy.h.
  • WebProcess/WebCoreSupport/WebPlatformStrategies.cpp:

(WebKit::WebPlatformStrategies::sessionStorageNamespace):

Location:
trunk/Source/WebKit2
Files:
5 edited
2 moved

Legend:

Unmodified
Added
Removed

  • trunk/Source/WebKit2/ChangeLog

    r148143 r148147  
     12013-04-10  Anders Carlsson  <andersca@apple.com>
     2
     3        Rename StorageNamespaceProxy to StorageNamespaceImpl.
     4
     5        Rubber-stamped by Beth Dakin.
     6
     7        * WebKit2.xcodeproj/project.pbxproj:
     8        * WebProcess/Storage/StorageAreaProxy.cpp:
     9        (WebKit::StorageAreaProxy::create):
     10        (WebKit::StorageAreaProxy::StorageAreaProxy):
     11        * WebProcess/Storage/StorageAreaProxy.h:
     12        (StorageAreaProxy):
     13        * WebProcess/Storage/StorageNamespaceImpl.cpp: Renamed from Source/WebKit2/WebProcess/Storage/StorageNamespaceProxy.cpp.
     14        * WebProcess/Storage/StorageNamespaceImpl.h: Renamed from Source/WebKit2/WebProcess/Storage/StorageNamespaceProxy.h.
     15        * WebProcess/WebCoreSupport/WebPlatformStrategies.cpp:
     16        (WebKit::WebPlatformStrategies::sessionStorageNamespace):
     17
    1182013-04-10  Tim Horton  <timothy_horton@apple.com>
    219

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

    r147049 r148147  
    138138                1A3EED12161A53D600AEB4F5 /* MessageReceiver.h in Headers */ = {isa = PBXBuildFile; fileRef = 1A3EED11161A53D600AEB4F5 /* MessageReceiver.h */; };
    139139                1A433F0D113C53DD00FACDE9 /* WebErrors.h in Headers */ = {isa = PBXBuildFile; fileRef = 1A433F0C113C53DD00FACDE9 /* WebErrors.h */; };
    140                 1A44B95716B737AA00B7BBD8 /* StorageNamespaceProxy.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1A17635416B1D5D000D88FD6 /* StorageNamespaceProxy.cpp */; };
     140                1A44B95716B737AA00B7BBD8 /* StorageNamespaceImpl.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1A17635416B1D5D000D88FD6 /* StorageNamespaceImpl.cpp */; };
    141141                1A44B95B16B73F9F00B7BBD8 /* StorageManager.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1A44B95916B73F9F00B7BBD8 /* StorageManager.cpp */; };
    142142                1A44B95C16B73F9F00B7BBD8 /* StorageManager.h in Headers */ = {isa = PBXBuildFile; fileRef = 1A44B95A16B73F9F00B7BBD8 /* StorageManager.h */; };
    … …  
    14341434                1A13BEB11635A9C800F19C03 /* StringReference.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = StringReference.cpp; sourceTree = "<group>"; };
    14351435                1A13BEB21635A9C800F19C03 /* StringReference.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = StringReference.h; sourceTree = "<group>"; };
    1436                 1A17635416B1D5D000D88FD6 /* StorageNamespaceProxy.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = StorageNamespaceProxy.cpp; sourceTree = "<group>"; };
    1437                 1A17635516B1D5D000D88FD6 /* StorageNamespaceProxy.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = StorageNamespaceProxy.h; sourceTree = "<group>"; };
     1436                1A17635416B1D5D000D88FD6 /* StorageNamespaceImpl.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = StorageNamespaceImpl.cpp; sourceTree = "<group>"; };
     1437                1A17635516B1D5D000D88FD6 /* StorageNamespaceImpl.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = StorageNamespaceImpl.h; sourceTree = "<group>"; };
    14381438                1A17977D137EE82C00F97D45 /* PluginCreationParameters.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = PluginCreationParameters.cpp; sourceTree = "<group>"; };
    14391439                1A17977E137EE82C00F97D45 /* PluginCreationParameters.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PluginCreationParameters.h; sourceTree = "<group>"; };
    … …  
    30933093                                1AD3306D16B1D991004F60E7 /* StorageAreaProxy.h */,
    30943094                                1A334DEA16DE8B68006A8E38 /* StorageAreaProxy.messages.in */,
    3095                                 1A17635416B1D5D000D88FD6 /* StorageNamespaceProxy.cpp */,
    3096                                 1A17635516B1D5D000D88FD6 /* StorageNamespaceProxy.h */,
     3095                                1A17635416B1D5D000D88FD6 /* StorageNamespaceImpl.cpp */,
     3096                                1A17635516B1D5D000D88FD6 /* StorageNamespaceImpl.h */,
    30973097                                1AAC4DE116B1CBF6009425E3 /* WebKeyValueStorageManager.cpp */,
    30983098                                1AAC4DE216B1CBF6009425E3 /* WebKeyValueStorageManager.h */,
    … …  
    65616561                                1A44B95B16B73F9F00B7BBD8 /* StorageManager.cpp in Sources */,
    65626562                                1AB31A9616BC688100F6DBC9 /* StorageManagerMessageReceiver.cpp in Sources */,
    6563                                 1A44B95716B737AA00B7BBD8 /* StorageNamespaceProxy.cpp in Sources */,
     6563                                1A44B95716B737AA00B7BBD8 /* StorageNamespaceImpl.cpp in Sources */,
    65646564                                1A13BEB31635A9C800F19C03 /* StringReference.cpp in Sources */,
    65656565                                296BD85E15019BC30071F424 /* StringUtilities.mm in Sources */,

  • trunk/Source/WebKit2/WebProcess/Storage/StorageAreaProxy.cpp

    r148000 r148147  
    3030#include "StorageAreaProxyMessages.h"
    3131#include "StorageManagerMessages.h"
    32 #include "StorageNamespaceProxy.h"
     32#include "StorageNamespaceImpl.h"
    3333#include "WebProcess.h"
    3434#include <WebCore/ExceptionCode.h>
    … …  
    4949}
    5050
    51 PassRefPtr<StorageAreaProxy> StorageAreaProxy::create(StorageNamespaceProxy* storageNamespaceProxy, PassRefPtr<SecurityOrigin> securityOrigin)
    52 {
    53     return adoptRef(new StorageAreaProxy(storageNamespaceProxy, securityOrigin));
    54 }
    55 
    56 StorageAreaProxy::StorageAreaProxy(StorageNamespaceProxy* storageNamespaceProxy, PassRefPtr<SecurityOrigin> securityOrigin)
    57     : m_storageNamespaceID(storageNamespaceProxy->storageNamespaceID())
    58     , m_quotaInBytes(storageNamespaceProxy->quotaInBytes())
     51PassRefPtr<StorageAreaProxy> StorageAreaProxy::create(StorageNamespaceImpl* StorageNamespaceImpl, PassRefPtr<SecurityOrigin> securityOrigin)
     52{
     53    return adoptRef(new StorageAreaProxy(StorageNamespaceImpl, securityOrigin));
     54}
     55
     56StorageAreaProxy::StorageAreaProxy(StorageNamespaceImpl* StorageNamespaceImpl, PassRefPtr<SecurityOrigin> securityOrigin)
     57    : m_storageNamespaceID(StorageNamespaceImpl->storageNamespaceID())
     58    , m_quotaInBytes(StorageNamespaceImpl->quotaInBytes())
    5959    , m_storageAreaID(generateStorageAreaID())
    6060    , m_securityOrigin(securityOrigin)
    6161{
    62     WebProcess::shared().connection()->send(Messages::StorageManager::CreateStorageArea(m_storageAreaID, storageNamespaceProxy->storageNamespaceID(), SecurityOriginData::fromSecurityOrigin(m_securityOrigin.get())), 0);
     62    WebProcess::shared().connection()->send(Messages::StorageManager::CreateStorageArea(m_storageAreaID, StorageNamespaceImpl->storageNamespaceID(), SecurityOriginData::fromSecurityOrigin(m_securityOrigin.get())), 0);
    6363    WebProcess::shared().addMessageReceiver(Messages::StorageAreaProxy::messageReceiverName(), m_storageAreaID, this);
    6464}

  • trunk/Source/WebKit2/WebProcess/Storage/StorageAreaProxy.h

    r147354 r148147  
    3838namespace WebKit {
    3939
    40 class StorageNamespaceProxy;
     40class StorageNamespaceImpl;
    4141
    4242class StorageAreaProxy : public WebCore::StorageArea, private CoreIPC::MessageReceiver {
    4343public:
    44     static PassRefPtr<StorageAreaProxy> create(StorageNamespaceProxy*, PassRefPtr<WebCore::SecurityOrigin>);
     44    static PassRefPtr<StorageAreaProxy> create(StorageNamespaceImpl*, PassRefPtr<WebCore::SecurityOrigin>);
    4545    virtual ~StorageAreaProxy();
    4646
    4747private:
    48     StorageAreaProxy(StorageNamespaceProxy*, PassRefPtr<WebCore::SecurityOrigin>);
     48    StorageAreaProxy(StorageNamespaceImpl*, PassRefPtr<WebCore::SecurityOrigin>);
    4949
    5050    // WebCore::StorageArea.

  • trunk/Source/WebKit2/WebProcess/Storage/StorageNamespaceImpl.cpp

    r148146 r148147  
    2525
    2626#include "config.h"
    27 #include "StorageNamespaceProxy.h"
     27#include "StorageNamespaceImpl.h"
    2828
    2929#include "StorageAreaProxy.h"
    … …  
    3636namespace WebKit {
    3737
    38 PassRefPtr<StorageNamespaceProxy> StorageNamespaceProxy::createSessionStorageNamespace(WebPage* webPage)
     38PassRefPtr<StorageNamespaceImpl> StorageNamespaceImpl::createSessionStorageNamespace(WebPage* webPage)
    3939{
    40     return adoptRef(new StorageNamespaceProxy(webPage->pageID(), webPage->corePage()->settings()->sessionStorageQuota()));
     40    return adoptRef(new StorageNamespaceImpl(webPage->pageID(), webPage->corePage()->settings()->sessionStorageQuota()));
    4141}
    4242
    43 StorageNamespaceProxy::StorageNamespaceProxy(uint64_t storageNamespaceID, unsigned quotaInBytes)
     43StorageNamespaceImpl::StorageNamespaceImpl(uint64_t storageNamespaceID, unsigned quotaInBytes)
    4444    : m_storageNamespaceID(storageNamespaceID)
    4545    , m_quotaInBytes(quotaInBytes)
    … …  
    4747}
    4848
    49 StorageNamespaceProxy::~StorageNamespaceProxy()
     49StorageNamespaceImpl::~StorageNamespaceImpl()
    5050{
    5151}
    5252
    53 PassRefPtr<StorageArea> StorageNamespaceProxy::storageArea(PassRefPtr<SecurityOrigin> securityOrigin)
     53PassRefPtr<StorageArea> StorageNamespaceImpl::storageArea(PassRefPtr<SecurityOrigin> securityOrigin)
    5454{
    5555    HashMap<RefPtr<WebCore::SecurityOrigin>, RefPtr<StorageAreaProxy> >::AddResult result = m_storageAreaMap.add(securityOrigin.get(), 0);
    … …  
    6060}
    6161
    62 PassRefPtr<StorageNamespace> StorageNamespaceProxy::copy()
     62PassRefPtr<StorageNamespace> StorageNamespaceImpl::copy()
    6363{
    6464    // FIXME: Implement this.
    … …  
    6767}
    6868
    69 void StorageNamespaceProxy::close()
     69void StorageNamespaceImpl::close()
    7070{
    7171    // FIXME: Implement this.
    … …  
    7373}
    7474
    75 void StorageNamespaceProxy::clearOriginForDeletion(SecurityOrigin*)
     75void StorageNamespaceImpl::clearOriginForDeletion(SecurityOrigin*)
    7676{
    7777    // FIXME: Implement this.
    … …  
    7979}
    8080
    81 void StorageNamespaceProxy::clearAllOriginsForDeletion()
     81void StorageNamespaceImpl::clearAllOriginsForDeletion()
    8282{
    8383    // FIXME: Implement this.
    … …  
    8585}
    8686
    87 void StorageNamespaceProxy::sync()
     87void StorageNamespaceImpl::sync()
    8888{
    8989    // FIXME: Implement this.
    … …  
    9191}
    9292
    93 void StorageNamespaceProxy::closeIdleLocalStorageDatabases()
     93void StorageNamespaceImpl::closeIdleLocalStorageDatabases()
    9494{
    9595    // FIXME: Implement this.

  • trunk/Source/WebKit2/WebProcess/Storage/StorageNamespaceImpl.h

    r148146 r148147  
    2424 */
    2525
    26 #ifndef StorageNamespaceProxy_h
    27 #define StorageNamespaceProxy_h
     26#ifndef StorageNamespaceImpl_h
     27#define StorageNamespaceImpl_h
    2828
    2929#include <WebCore/SecurityOriginHash.h>
    … …  
    3737class WebPage;
    3838
    39 class StorageNamespaceProxy : public WebCore::StorageNamespace {
     39class StorageNamespaceImpl : public WebCore::StorageNamespace {
    4040public:
    41     static PassRefPtr<StorageNamespaceProxy> createSessionStorageNamespace(WebPage*);
    42     virtual ~StorageNamespaceProxy();
     41    static PassRefPtr<StorageNamespaceImpl> createSessionStorageNamespace(WebPage*);
     42    virtual ~StorageNamespaceImpl();
    4343
    4444    uint64_t storageNamespaceID() const { return m_storageNamespaceID; }
    … …  
    4646
    4747private:
    48     explicit StorageNamespaceProxy(uint64_t storageNamespaceID, unsigned quotaInBytes);
     48    explicit StorageNamespaceImpl(uint64_t storageNamespaceID, unsigned quotaInBytes);
    4949
    5050    virtual PassRefPtr<WebCore::StorageArea> storageArea(PassRefPtr<WebCore::SecurityOrigin>) OVERRIDE;
    … …  
    6464} // namespace WebKit
    6565
    66 #endif // StorageNamespaceProxy_h
     66#endif // StorageNamespaceImpl_h

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

    r147360 r148147  
    3333#include "NetworkResourceLoadParameters.h"
    3434#include "PluginInfoStore.h"
    35 #include "StorageNamespaceProxy.h"
     35#include "StorageNamespaceImpl.h"
    3636#include "WebContextMessages.h"
    3737#include "WebCookieManager.h"
    … …  
    307307{
    308308#if ENABLE(UI_PROCESS_STORAGE)
    309     return StorageNamespaceProxy::createSessionStorageNamespace(WebPage::fromCorePage(page));
     309    return StorageNamespaceImpl::createSessionStorageNamespace(WebPage::fromCorePage(page));
    310310#else
    311311    return StorageStrategy::sessionStorageNamespace(page, quota);
Note: See TracChangeset for help on using the changeset viewer.