Changeset 31793 in webkit


Ignore:
Timestamp:
Apr 10, 2008 6:06:27 PM (16 years ago)
Author:
beidson@apple.com
Message:

2008-04-10 Brady Eidson <​beidson@apple.com>

Reviewed by Sam Weinig

The name "OriginStorage" never felt right to a few of us. The HTML5 spec refers to our
concept of "OriginStorage" as a "storage area", which makes more sense here.

This patch is basically:
s/OriginStorage/StorageArea/

  • GNUmakefile.am:
  • WebCore.pro:
  • WebCore.vcproj/WebCore.vcproj:
  • WebCore.xcodeproj/project.pbxproj:
  • WebCoreSources.bkl:
  • loader/FrameLoader.cpp:
  • page/DOMWindow.cpp: (WebCore::DOMWindow::sessionStorage):
  • page/Page.cpp:
  • storage/OriginStorage.cpp: Removed.
  • storage/OriginStorage.h: Removed.
  • storage/SessionStorage.cpp: (WebCore::SessionStorage::copy): (WebCore::SessionStorage::storageArea):
  • storage/SessionStorage.h:
  • storage/Storage.cpp: (WebCore::Storage::create): (WebCore::Storage::Storage): (WebCore::Storage::length): (WebCore::Storage::key): (WebCore::Storage::getItem): (WebCore::Storage::setItem): (WebCore::Storage::removeItem): (WebCore::Storage::contains):
  • storage/Storage.h:
  • storage/StorageArea.cpp: Copied from storage/OriginStorage.cpp. (WebCore::StorageArea::create): (WebCore::StorageArea::StorageArea): (WebCore::StorageArea::~StorageArea): (WebCore::StorageArea::copy): (WebCore::StorageArea::length): (WebCore::StorageArea::key): (WebCore::StorageArea::getItem): (WebCore::StorageArea::setItem): (WebCore::StorageArea::removeItem): (WebCore::StorageArea::contains): (WebCore::StorageArea::dispatchStorageEvent):
  • storage/StorageArea.h: Copied from storage/OriginStorage.h.
Location:
trunk/WebCore
Files:
13 edited
2 moved

Legend:

Unmodified
Added
Removed

  • trunk/WebCore/ChangeLog

    r31792 r31793  
     12008-04-10  Brady Eidson  <beidson@apple.com>
     2
     3        Reviewed by Sam Weinig
     4
     5        The name "OriginStorage" never felt right to a few of us.  The HTML5 spec refers to our
     6        concept of "OriginStorage" as a "storage area", which makes more sense here.
     7
     8        This patch is basically:
     9        s/OriginStorage/StorageArea/
     10
     11        * GNUmakefile.am:
     12        * WebCore.pro:
     13        * WebCore.vcproj/WebCore.vcproj:
     14        * WebCore.xcodeproj/project.pbxproj:
     15        * WebCoreSources.bkl:
     16
     17        * loader/FrameLoader.cpp:
     18
     19        * page/DOMWindow.cpp:
     20        (WebCore::DOMWindow::sessionStorage):
     21        * page/Page.cpp:
     22
     23        * storage/OriginStorage.cpp: Removed.
     24        * storage/OriginStorage.h: Removed.
     25
     26        * storage/SessionStorage.cpp:
     27        (WebCore::SessionStorage::copy):
     28        (WebCore::SessionStorage::storageArea):
     29        * storage/SessionStorage.h:
     30
     31        * storage/Storage.cpp:
     32        (WebCore::Storage::create):
     33        (WebCore::Storage::Storage):
     34        (WebCore::Storage::length):
     35        (WebCore::Storage::key):
     36        (WebCore::Storage::getItem):
     37        (WebCore::Storage::setItem):
     38        (WebCore::Storage::removeItem):
     39        (WebCore::Storage::contains):
     40        * storage/Storage.h:
     41
     42        * storage/StorageArea.cpp: Copied from storage/OriginStorage.cpp.
     43        (WebCore::StorageArea::create):
     44        (WebCore::StorageArea::StorageArea):
     45        (WebCore::StorageArea::~StorageArea):
     46        (WebCore::StorageArea::copy):
     47        (WebCore::StorageArea::length):
     48        (WebCore::StorageArea::key):
     49        (WebCore::StorageArea::getItem):
     50        (WebCore::StorageArea::setItem):
     51        (WebCore::StorageArea::removeItem):
     52        (WebCore::StorageArea::contains):
     53        (WebCore::StorageArea::dispatchStorageEvent):
     54        * storage/StorageArea.h: Copied from storage/OriginStorage.h.
     55
    1562008-04-10  Xan Lopez  <xan@gnome.org>
    257

  • trunk/WebCore/GNUmakefile.am

    r31746 r31793  
    11901190
    11911191webcore_sources += \
    1192         WebCore/storage/OriginStorage.cpp \
    11931192        WebCore/storage/Storage.cpp \
     1193        WebCore/storage/StorageArea.cpp \
    11941194        WebCore/storage/StorageEvent.cpp \
    11951195        WebCore/storage/StorageMap.cpp \

  • trunk/WebCore/WebCore.pro

    r31746 r31793  
    12071207
    12081208    SOURCES += \
    1209         storage/OriginStorage.cpp \
    12101209        storage/Storage.cpp \
     1210        storage/StorageArea.cpp \
    12111211        storage/StorageEvent.cpp \
    12121212        storage/StorageMap.cpp \

  • trunk/WebCore/WebCore.vcproj/WebCore.vcproj

    r31746 r31793  
    1575115751                        </File>
    1575215752                        <File
    15753                                 RelativePath="..\storage\OriginStorage.cpp"
    15754                                 >
    15755                         </File>
    15756                         <File
    15757                                 RelativePath="..\storage\OriginStorage.h"
    15758                                 >
    15759                         </File>
    15760                         <File
    1576115753                                RelativePath="..\storage\OriginUsageRecord.cpp"
    1576215754                                >
    … …  
    1582815820                        <File
    1582915821                                RelativePath="..\storage\Storage.h"
     15822                                >
     15823                        </File>
     15824                        <File
     15825                                RelativePath="..\storage\StorageArea.cpp"
     15826                                >
     15827                        </File>
     15828                        <File
     15829                                RelativePath="..\storage\StorageArea.h"
    1583015830                                >
    1583115831                        </File>

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

    r31780 r31793  
    418418                5126E6BB0A2E3B12005C29FA /* IconDatabase.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 5126E6B90A2E3B12005C29FA /* IconDatabase.cpp */; };
    419419                5126E6BC0A2E3B12005C29FA /* IconDatabase.h in Headers */ = {isa = PBXBuildFile; fileRef = 5126E6BA0A2E3B12005C29FA /* IconDatabase.h */; settings = {ATTRIBUTES = (Private, ); }; };
    420                 51272D840DA9800900844E2F /* OriginStorage.h in Headers */ = {isa = PBXBuildFile; fileRef = 51272D820DA9800900844E2F /* OriginStorage.h */; };
    421                 51272D850DA9800900844E2F /* OriginStorage.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 51272D830DA9800900844E2F /* OriginStorage.cpp */; };
    422420                512DD8E30D91E2B4000F89EE /* SharedBufferCF.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 512DD8E20D91E2B4000F89EE /* SharedBufferCF.cpp */; };
    423421                512DD8F40D91E6AF000F89EE /* LegacyWebArchive.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 512DD8EA0D91E6AF000F89EE /* LegacyWebArchive.cpp */; };
    … …  
    495493                51AA3F6F0BD5AA9E00892971 /* ResourceLoaderMac.mm in Sources */ = {isa = PBXBuildFile; fileRef = 51AA3F6E0BD5AA9E00892971 /* ResourceLoaderMac.mm */; };
    496494                51B2417B0D931F3F00E83F5C /* LegacyWebArchiveMac.mm in Sources */ = {isa = PBXBuildFile; fileRef = 51B2417A0D931F3F00E83F5C /* LegacyWebArchiveMac.mm */; };
     495                51BE37DF0DAEE00E001085FC /* StorageArea.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 51BE37DD0DAEE00E001085FC /* StorageArea.cpp */; };
     496                51BE37E00DAEE00E001085FC /* StorageArea.h in Headers */ = {isa = PBXBuildFile; fileRef = 51BE37DE0DAEE00E001085FC /* StorageArea.h */; };
    497497                51C81B890C4422F70019ECE3 /* FTPDirectoryParser.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 51C81B870C4422F70019ECE3 /* FTPDirectoryParser.cpp */; };
    498498                51C81B8A0C4422F70019ECE3 /* FTPDirectoryParser.h in Headers */ = {isa = PBXBuildFile; fileRef = 51C81B880C4422F70019ECE3 /* FTPDirectoryParser.h */; };
    … …  
    48224822                5126E6B90A2E3B12005C29FA /* IconDatabase.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = IconDatabase.cpp; sourceTree = "<group>"; };
    48234823                5126E6BA0A2E3B12005C29FA /* IconDatabase.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = IconDatabase.h; sourceTree = "<group>"; };
    4824                 51272D820DA9800900844E2F /* OriginStorage.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = OriginStorage.h; sourceTree = "<group>"; };
    4825                 51272D830DA9800900844E2F /* OriginStorage.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = OriginStorage.cpp; sourceTree = "<group>"; };
    48264824                512DD8E20D91E2B4000F89EE /* SharedBufferCF.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = SharedBufferCF.cpp; sourceTree = "<group>"; };
    48274825                512DD8EA0D91E6AF000F89EE /* LegacyWebArchive.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = LegacyWebArchive.cpp; sourceTree = "<group>"; };
    … …  
    49034901                51AA3F6E0BD5AA9E00892971 /* ResourceLoaderMac.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = ResourceLoaderMac.mm; sourceTree = "<group>"; };
    49044902                51B2417A0D931F3F00E83F5C /* LegacyWebArchiveMac.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = LegacyWebArchiveMac.mm; sourceTree = "<group>"; };
     4903                51BE37DD0DAEE00E001085FC /* StorageArea.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = StorageArea.cpp; sourceTree = "<group>"; };
     4904                51BE37DE0DAEE00E001085FC /* StorageArea.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = StorageArea.h; sourceTree = "<group>"; };
    49054905                51C81B870C4422F70019ECE3 /* FTPDirectoryParser.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = FTPDirectoryParser.cpp; sourceTree = "<group>"; };
    49064906                51C81B880C4422F70019ECE3 /* FTPDirectoryParser.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = FTPDirectoryParser.h; sourceTree = "<group>"; };
    … …  
    84778477                                51A926780D53F0570063ECC2 /* OriginQuotaManager.cpp */,
    84788478                                51A926790D53F0570063ECC2 /* OriginQuotaManager.h */,
    8479                                 51272D830DA9800900844E2F /* OriginStorage.cpp */,
    8480                                 51272D820DA9800900844E2F /* OriginStorage.h */,
    84818479                                51A9267A0D53F0570063ECC2 /* OriginUsageRecord.cpp */,
    84828480                                51A9267B0D53F0570063ECC2 /* OriginUsageRecord.h */,
    … …  
    85058503                                51E3F9C40DA059DC00250911 /* Storage.h */,
    85068504                                51E3F9D10DA05D7100250911 /* Storage.idl */,
     8505                                51BE37DD0DAEE00E001085FC /* StorageArea.cpp */,
     8506                                51BE37DE0DAEE00E001085FC /* StorageArea.h */,
    85078507                                51E0BABA0DA5547100A9E417 /* StorageEvent.cpp */,
    85088508                                51E0BAB90DA5547100A9E417 /* StorageEvent.h */,
    … …  
    1475414754                                51E0BB380DA5ACB600A9E417 /* StorageMap.h in Headers */,
    1475514755                                BC53C5F50DA56B920021EB5D /* Gradient.h in Headers */,
    14756                                 51272D840DA9800900844E2F /* OriginStorage.h in Headers */,
     14756                                51BE37E00DAEE00E001085FC /* StorageArea.h in Headers */,
    1475714757                        );
    1475814758                        runOnlyForDeploymentPostprocessing = 0;
    … …  
    1643616436                                BC53C60B0DA56CF10021EB5D /* GradientCG.cpp in Sources */,
    1643716437                                4B24F9A80DA7050B00269E58 /* AXObjectCache.cpp in Sources */,
    16438                                 51272D850DA9800900844E2F /* OriginStorage.cpp in Sources */,
    1643916438                                51D0C5160DAA90B7003B3831 /* JSStorageCustom.cpp in Sources */,
     16439                                51BE37DF0DAEE00E001085FC /* StorageArea.cpp in Sources */,
    1644016440                        );
    1644116441                        runOnlyForDeploymentPostprocessing = 0;

  • trunk/WebCore/WebCoreSources.bkl

    r31746 r31793  
    793793        storage/DatabaseTracker.cpp
    794794        storage/OriginQuotaManager.cpp
    795         storage/OriginStorage.cpp
    796795        storage/OriginUsageRecord.cpp
    797796        storage/SQLResultSet.cpp
    … …  
    800799        storage/SQLTransaction.cpp
    801800        storage/Storage.cpp
     801        storage/StorageArea.cpp
    802802        storage/StorageEvent.cpp
    803803        storage/StorageMap.cpp

  • trunk/WebCore/loader/FrameLoader.cpp

    r31746 r31793  
    100100
    101101#if ENABLE(DOM_STORAGE)
    102 #include "OriginStorage.h"
    103102#include "SessionStorage.h"
     103#include "StorageArea.h"
    104104#endif
    105105

  • trunk/WebCore/page/DOMWindow.cpp

    r31697 r31793  
    6161
    6262#if ENABLE(DOM_STORAGE)
    63 #include "OriginStorage.h"
    6463#include "SessionStorage.h"
    6564#include "Storage.h"
     65#include "StorageArea.h"
    6666#endif
    6767
    … …  
    274274        return 0;
    275275
    276     RefPtr<OriginStorage> originStorage = page->sessionStorage()->originStorage(document->securityOrigin());
    277     m_sessionStorage = Storage::create(m_frame, originStorage.release());
     276    RefPtr<StorageArea> storageArea = page->sessionStorage()->storageArea(document->securityOrigin());
     277    m_sessionStorage = Storage::create(m_frame, storageArea.release());
    278278    return m_sessionStorage.get();
    279279}

  • trunk/WebCore/page/Page.cpp

    r31697 r31793  
    5555
    5656#if ENABLE(DOM_STORAGE)
    57 #include "OriginStorage.h"
    5857#include "SessionStorage.h"
     58#include "StorageArea.h"
    5959#endif
    6060

  • trunk/WebCore/storage/SessionStorage.cpp

    r31697 r31793  
    2727#include "SessionStorage.h"
    2828
    29 #include "OriginStorage.h"
     29#include "StorageArea.h"
    3030#include "StorageMap.h"
    3131
    … …  
    4646    RefPtr<SessionStorage> newSession = SessionStorage::create(newPage);
    4747   
    48     OriginStorageMap::iterator end = m_originStorageMap.end();
    49     for (OriginStorageMap::iterator i = m_originStorageMap.begin(); i != end; ++i)
    50         newSession->m_originStorageMap.set(i->first, i->second->copy(newPage, i->first.get()));
     48    StorageAreaMap::iterator end = m_storageAreaMap.end();
     49    for (StorageAreaMap::iterator i = m_storageAreaMap.begin(); i != end; ++i)
     50        newSession->m_storageAreaMap.set(i->first, i->second->copy(newPage, i->first.get()));
    5151       
    5252    return newSession.release();
    5353}
    5454
    55 PassRefPtr<OriginStorage> SessionStorage::originStorage(SecurityOrigin* origin)
     55PassRefPtr<StorageArea> SessionStorage::storageArea(SecurityOrigin* origin)
    5656{
    57     RefPtr<OriginStorage> originStorage;
    58     if (originStorage = m_originStorageMap.get(origin))
    59         return originStorage.release();
     57    RefPtr<StorageArea> storageArea;
     58    if (storageArea = m_storageAreaMap.get(origin))
     59        return storageArea.release();
    6060       
    61     originStorage = OriginStorage::create(m_page, origin);
    62     m_originStorageMap.set(origin, originStorage);
    63     return originStorage.release();
     61    storageArea = StorageArea::create(m_page, origin);
     62    m_storageAreaMap.set(origin, storageArea);
     63    return storageArea.release();
    6464}
    6565

  • trunk/WebCore/storage/SessionStorage.h

    r31697 r31793  
    3535namespace WebCore {
    3636
    37     class OriginStorage;
     37    class StorageArea;
    3838    class Page;
    3939
    … …  
    4343        PassRefPtr<SessionStorage> copy(Page*);
    4444       
    45         PassRefPtr<OriginStorage> originStorage(SecurityOrigin*);
     45        PassRefPtr<StorageArea> storageArea(SecurityOrigin*);
    4646
    4747#ifndef NDEBUG
    … …  
    5454        Page* m_page;
    5555       
    56         typedef HashMap<RefPtr<SecurityOrigin>, RefPtr<OriginStorage>, SecurityOriginHash, SecurityOriginTraits> OriginStorageMap;
    57         OriginStorageMap m_originStorageMap;
     56        typedef HashMap<RefPtr<SecurityOrigin>, RefPtr<StorageArea>, SecurityOriginHash, SecurityOriginTraits> StorageAreaMap;
     57        StorageAreaMap m_storageAreaMap;
    5858    };
    5959

  • trunk/WebCore/storage/Storage.cpp

    r31697 r31793  
    2727#include "Storage.h"
    2828
    29 #include "OriginStorage.h"
     29#include "StorageArea.h"
    3030#include "PlatformString.h"
    3131#include <wtf/PassRefPtr.h>
    … …  
    3333namespace WebCore {
    3434
    35 PassRefPtr<Storage> Storage::create(Frame* frame, PassRefPtr<OriginStorage> originStorage)
     35PassRefPtr<Storage> Storage::create(Frame* frame, PassRefPtr<StorageArea> storageArea)
    3636{
    37     return adoptRef(new Storage(frame, originStorage));
     37    return adoptRef(new Storage(frame, storageArea));
    3838}
    3939
    40 Storage::Storage(Frame* frame, PassRefPtr<OriginStorage> originStorage)
     40Storage::Storage(Frame* frame, PassRefPtr<StorageArea> storageArea)
    4141    : m_frame(frame)
    42     , m_originStorage(originStorage)
     42    , m_storageArea(storageArea)
    4343{
    4444    ASSERT(m_frame);
    45     ASSERT(m_originStorage);
     45    ASSERT(m_storageArea);
    4646}
    4747
    … …  
    5151        return 0;
    5252
    53     return m_originStorage->length();
     53    return m_storageArea->length();
    5454}
    5555
    … …  
    6060        return String();
    6161
    62     return m_originStorage->key(index, ec);
     62    return m_storageArea->key(index, ec);
    6363}
    6464
    … …  
    6868        return String();
    6969
    70     return m_originStorage->getItem(key);
     70    return m_storageArea->getItem(key);
    7171}
    7272
    … …  
    7777        return;
    7878
    79     m_originStorage->setItem(key, value, ec, m_frame);
     79    m_storageArea->setItem(key, value, ec, m_frame);
    8080}
    8181
    … …  
    8585        return;
    8686
    87     m_originStorage->removeItem(key, m_frame);
     87    m_storageArea->removeItem(key, m_frame);
    8888}
    8989
    … …  
    9393        return false;
    9494
    95     return m_originStorage->contains(key);
     95    return m_storageArea->contains(key);
    9696}
    9797

  • trunk/WebCore/storage/Storage.h

    r31697 r31793  
    2727#define Storage_h
    2828
    29 #include "OriginStorage.h"
     29#include "StorageArea.h"
    3030
    3131#include <wtf/Forward.h>
    … …  
    4141    class Storage : public RefCounted<Storage> {
    4242    public:
    43         static PassRefPtr<Storage> create(Frame*, PassRefPtr<OriginStorage>);
     43        static PassRefPtr<Storage> create(Frame*, PassRefPtr<StorageArea>);
    4444       
    4545        unsigned length() const;
    … …  
    5454
    5555    private:
    56         Storage(Frame*, PassRefPtr<OriginStorage>);
     56        Storage(Frame*, PassRefPtr<StorageArea>);
    5757           
    5858        Frame* m_frame;
    59         RefPtr<OriginStorage> m_originStorage;
     59        RefPtr<StorageArea> m_storageArea;
    6060    };
    6161

  • trunk/WebCore/storage/StorageArea.cpp

    r31777 r31793  
    2525 
    2626#include "config.h"
    27 #include "OriginStorage.h"
     27#include "StorageArea.h"
    2828
    2929#include "CString.h"
    … …  
    3939namespace WebCore {
    4040
    41 PassRefPtr<OriginStorage> OriginStorage::create(Page* page, SecurityOrigin* origin)
     41PassRefPtr<StorageArea> StorageArea::create(Page* page, SecurityOrigin* origin)
    4242{
    43     return adoptRef(new OriginStorage(page, origin));
     43    return adoptRef(new StorageArea(page, origin));
    4444}
    4545
    46 OriginStorage::OriginStorage(Page* page, SecurityOrigin* origin)
     46StorageArea::StorageArea(Page* page, SecurityOrigin* origin)
    4747    : m_page(page)
    4848    , m_securityOrigin(origin)
    … …  
    5151}
    5252
    53 OriginStorage::OriginStorage(Page* page, SecurityOrigin* origin, PassRefPtr<StorageMap> map)
     53StorageArea::StorageArea(Page* page, SecurityOrigin* origin, PassRefPtr<StorageMap> map)
    5454    : m_page(page)
    5555    , m_securityOrigin(origin)
    … …  
    5858}
    5959
    60 OriginStorage::~OriginStorage()
     60StorageArea::~StorageArea()
    6161{
    6262}
    6363
    64 PassRefPtr<OriginStorage> OriginStorage::copy(Page* newPage, SecurityOrigin* origin)
     64PassRefPtr<StorageArea> StorageArea::copy(Page* newPage, SecurityOrigin* origin)
    6565{
    66     return adoptRef(new OriginStorage(newPage, origin, m_storageMap));
     66    return adoptRef(new StorageArea(newPage, origin, m_storageMap));
    6767}
    6868
    69 unsigned OriginStorage::length() const
     69unsigned StorageArea::length() const
    7070{
    7171    return m_storageMap->length();
    7272}
    7373
    74 String OriginStorage::key(unsigned index, ExceptionCode& ec) const
     74String StorageArea::key(unsigned index, ExceptionCode& ec) const
    7575{
    7676    String key;
    … …  
    8484}
    8585
    86 String OriginStorage::getItem(const String& key) const
     86String StorageArea::getItem(const String& key) const
    8787{
    8888    return m_storageMap->getItem(key);
    8989}
    9090
    91 void OriginStorage::setItem(const String& key, const String& value, ExceptionCode& ec, Frame* frame)
     91void StorageArea::setItem(const String& key, const String& value, ExceptionCode& ec, Frame* frame)
    9292{
    9393    // Per the spec, inserting a NULL value into the map is the same as removing the key altogether
    … …  
    113113}
    114114
    115 void OriginStorage::removeItem(const String& key, Frame* frame)
     115void StorageArea::removeItem(const String& key, Frame* frame)
    116116{   
    117117    String oldValue;
    … …  
    125125}
    126126
    127 bool OriginStorage::contains(const String& key) const
     127bool StorageArea::contains(const String& key) const
    128128{
    129129    return m_storageMap->contains(key);
    130130}
    131131
    132 void OriginStorage::dispatchStorageEvent(const String& key, const String& oldValue, const String& newValue, Frame* sourceFrame)
     132void StorageArea::dispatchStorageEvent(const String& key, const String& oldValue, const String& newValue, Frame* sourceFrame)
    133133{
    134134    // For SessionStorage events, each frame in the page's frametree with the same origin as this Storage needs to be notified of the change

  • trunk/WebCore/storage/StorageArea.h

    r31777 r31793  
    2424 */
    2525
    26 #ifndef OriginStorage_h
    27 #define OriginStorage_h
     26#ifndef StorageArea_h
     27#define StorageArea_h
    2828
    2929#include <wtf/Forward.h>
    … …  
    4040    typedef int ExceptionCode;
    4141
    42     class OriginStorage : public RefCounted<OriginStorage> {
     42    class StorageArea : public RefCounted<StorageArea> {
    4343    public:
    44         virtual ~OriginStorage();
     44        virtual ~StorageArea();
    4545       
    46         static PassRefPtr<OriginStorage> create(Page*, SecurityOrigin*);
    47         PassRefPtr<OriginStorage> copy(Page*, SecurityOrigin*);
     46        static PassRefPtr<StorageArea> create(Page*, SecurityOrigin*);
     47        PassRefPtr<StorageArea> copy(Page*, SecurityOrigin*);
    4848       
    4949        unsigned length() const;
    … …  
    5656
    5757    private:
    58         OriginStorage(Page*, SecurityOrigin*);
    59         OriginStorage(Page*, SecurityOrigin*, PassRefPtr<StorageMap>);
     58        StorageArea(Page*, SecurityOrigin*);
     59        StorageArea(Page*, SecurityOrigin*, PassRefPtr<StorageMap>);
    6060       
    6161        void dispatchStorageEvent(const String& key, const String& oldValue, const String& newValue, Frame* sourceFrame);
    … …  
    6868} // namespace WebCore
    6969
    70 #endif // OriginStorage_h
     70#endif // StorageArea_h
Note: See TracChangeset for help on using the changeset viewer.