Rename StorageAreaProxy to StorageAreaImpl.
authorandersca@apple.com <andersca@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Wed, 10 Apr 2013 23:22:02 +0000 (23:22 +0000)
committerandersca@apple.com <andersca@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Wed, 10 Apr 2013 23:22:02 +0000 (23:22 +0000)
Rubber-stamped by Beth Dakin.

* DerivedSources.make:
* UIProcess/Storage/StorageManager.cpp:
(WebKit::StorageManager::StorageArea::dispatchEvents):
(WebKit::StorageManager::setItem):
* WebKit2.xcodeproj/project.pbxproj:
* WebProcess/Storage/StorageAreaImpl.cpp: Renamed from Source/WebKit2/WebProcess/Storage/StorageAreaProxy.cpp.
* WebProcess/Storage/StorageAreaImpl.h: Renamed from Source/WebKit2/WebProcess/Storage/StorageAreaProxy.h.
* WebProcess/Storage/StorageAreaImpl.messages.in: Renamed from Source/WebKit2/WebProcess/Storage/StorageAreaProxy.messages.in.
* WebProcess/Storage/StorageNamespaceImpl.cpp:
(WebKit::StorageNamespaceImpl::storageArea):
* WebProcess/Storage/StorageNamespaceImpl.h:
(WebKit):
(StorageNamespaceImpl):

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@148148 268f45cc-cd09-0410-ab3c-d52691b4dbfc

Source/WebKit2/ChangeLog
Source/WebKit2/DerivedSources.make
Source/WebKit2/UIProcess/Storage/StorageManager.cpp
Source/WebKit2/WebKit2.xcodeproj/project.pbxproj
Source/WebKit2/WebProcess/Storage/StorageAreaImpl.cpp [moved from Source/WebKit2/WebProcess/Storage/StorageAreaProxy.cpp with 77% similarity]
Source/WebKit2/WebProcess/Storage/StorageAreaImpl.h [moved from Source/WebKit2/WebProcess/Storage/StorageAreaProxy.h with 90% similarity]
Source/WebKit2/WebProcess/Storage/StorageAreaImpl.messages.in [moved from Source/WebKit2/WebProcess/Storage/StorageAreaProxy.messages.in with 97% similarity]
Source/WebKit2/WebProcess/Storage/StorageNamespaceImpl.cpp
Source/WebKit2/WebProcess/Storage/StorageNamespaceImpl.h

index 996c07b..81e94a2 100644 (file)
@@ -1,5 +1,25 @@
 2013-04-10  Anders Carlsson  <andersca@apple.com>
 
+        Rename StorageAreaProxy to StorageAreaImpl.
+
+        Rubber-stamped by Beth Dakin.
+
+        * DerivedSources.make:
+        * UIProcess/Storage/StorageManager.cpp:
+        (WebKit::StorageManager::StorageArea::dispatchEvents):
+        (WebKit::StorageManager::setItem):
+        * WebKit2.xcodeproj/project.pbxproj:
+        * WebProcess/Storage/StorageAreaImpl.cpp: Renamed from Source/WebKit2/WebProcess/Storage/StorageAreaProxy.cpp.
+        * WebProcess/Storage/StorageAreaImpl.h: Renamed from Source/WebKit2/WebProcess/Storage/StorageAreaProxy.h.
+        * WebProcess/Storage/StorageAreaImpl.messages.in: Renamed from Source/WebKit2/WebProcess/Storage/StorageAreaProxy.messages.in.
+        * WebProcess/Storage/StorageNamespaceImpl.cpp:
+        (WebKit::StorageNamespaceImpl::storageArea):
+        * WebProcess/Storage/StorageNamespaceImpl.h:
+        (WebKit):
+        (StorageNamespaceImpl):
+
+2013-04-10  Anders Carlsson  <andersca@apple.com>
+
         Rename StorageNamespaceProxy to StorageNamespaceImpl.
 
         Rubber-stamped by Beth Dakin.
index df2dbcb..7b246f5 100644 (file)
@@ -90,7 +90,7 @@ MESSAGE_RECEIVERS = \
     RemoteLayerTreeHost \
     SecItemShim \
     SecItemShimProxy \
-    StorageAreaProxy \
+    StorageAreaImpl \
     WebContext \
     WebDatabaseManager \
     WebDatabaseManagerProxy \
index 547da39..fa7403d 100644 (file)
@@ -27,7 +27,7 @@
 #include "StorageManager.h"
 
 #include "SecurityOriginData.h"
-#include "StorageAreaProxyMessages.h"
+#include "StorageAreaImplMessages.h"
 #include "StorageManagerMessages.h"
 #include "WebProcessProxy.h"
 #include "WorkQueue.h"
@@ -103,7 +103,7 @@ void StorageManager::StorageArea::dispatchEvents(CoreIPC::Connection* connection
             continue;
         }
 
-        it->first->send(Messages::StorageAreaProxy::DispatchStorageEvent(key, oldValue, newValue, urlString), it->second);
+        it->first->send(Messages::StorageAreaImpl::DispatchStorageEvent(key, oldValue, newValue, urlString), it->second);
     }
 }
 
@@ -273,7 +273,7 @@ void StorageManager::setItem(CoreIPC::Connection* connection, uint64_t storageAr
 
     bool quotaError;
     storageArea->setItem(connection, storageAreaID, key, value, urlString, quotaError);
-    connection->send(Messages::StorageAreaProxy::DidSetItem(key, quotaError), storageAreaID);
+    connection->send(Messages::StorageAreaImpl::DidSetItem(key, quotaError), storageAreaID);
 }
 
 void StorageManager::createSessionStorageNamespaceInternal(uint64_t storageNamespaceID, CoreIPC::Connection* allowedConnection, unsigned quotaInBytes)
index 50b2e55..2964148 100644 (file)
                1A2D957012848564001EB962 /* ChildProcess.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1A2D956E12848564001EB962 /* ChildProcess.cpp */; };
                1A30066E1110F4F70031937C /* ResponsivenessTimer.h in Headers */ = {isa = PBXBuildFile; fileRef = 1A30066C1110F4F70031937C /* ResponsivenessTimer.h */; };
                1A30EAC6115D7DA30053E937 /* ConnectionMac.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1A30EAC5115D7DA30053E937 /* ConnectionMac.cpp */; };
-               1A334DED16DE8F88006A8E38 /* StorageAreaProxyMessageReceiver.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1A334DEB16DE8F88006A8E38 /* StorageAreaProxyMessageReceiver.cpp */; };
-               1A334DEE16DE8F88006A8E38 /* StorageAreaProxyMessages.h in Headers */ = {isa = PBXBuildFile; fileRef = 1A334DEC16DE8F88006A8E38 /* StorageAreaProxyMessages.h */; };
+               1A334DED16DE8F88006A8E38 /* StorageAreaImplMessageReceiver.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1A334DEB16DE8F88006A8E38 /* StorageAreaImplMessageReceiver.cpp */; };
+               1A334DEE16DE8F88006A8E38 /* StorageAreaImplMessages.h in Headers */ = {isa = PBXBuildFile; fileRef = 1A334DEC16DE8F88006A8E38 /* StorageAreaImplMessages.h */; };
                1A3979F61332983A00E00300 /* AppKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 0867D6A5FE840307C02AAC07 /* AppKit.framework */; };
                1A3979F71332983F00E00300 /* QuartzCore.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 1AA1CC5C100FA1A10078DEBC /* QuartzCore.framework */; };
                1A3D610113A7CC2A00F95D4E /* PluginModuleInfo.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1A3D60FF13A7CC2A00F95D4E /* PluginModuleInfo.cpp */; };
                1AC8702E130B49A2002C1257 /* WebPluginSiteDataManager.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1AC8702C130B49A2002C1257 /* WebPluginSiteDataManager.cpp */; };
                1AD25E95167AB08100EA9BCD /* DownloadProxyMap.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1AD25E93167AB08100EA9BCD /* DownloadProxyMap.cpp */; };
                1AD25E96167AB08100EA9BCD /* DownloadProxyMap.h in Headers */ = {isa = PBXBuildFile; fileRef = 1AD25E94167AB08100EA9BCD /* DownloadProxyMap.h */; };
-               1AD3306E16B1D991004F60E7 /* StorageAreaProxy.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1AD3306C16B1D991004F60E7 /* StorageAreaProxy.cpp */; };
-               1AD3306F16B1D991004F60E7 /* StorageAreaProxy.h in Headers */ = {isa = PBXBuildFile; fileRef = 1AD3306D16B1D991004F60E7 /* StorageAreaProxy.h */; };
+               1AD3306E16B1D991004F60E7 /* StorageAreaImpl.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1AD3306C16B1D991004F60E7 /* StorageAreaImpl.cpp */; };
+               1AD3306F16B1D991004F60E7 /* StorageAreaImpl.h in Headers */ = {isa = PBXBuildFile; fileRef = 1AD3306D16B1D991004F60E7 /* StorageAreaImpl.h */; };
                1AE117F611DBB30900981615 /* ProcessLauncher.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1AE117F511DBB30900981615 /* ProcessLauncher.cpp */; };
                1AE4976811FF658E0048B464 /* NPJSObject.h in Headers */ = {isa = PBXBuildFile; fileRef = 1AE4976611FF658E0048B464 /* NPJSObject.h */; };
                1AE4976911FF658E0048B464 /* NPJSObject.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1AE4976711FF658E0048B464 /* NPJSObject.cpp */; };
                1A2D956E12848564001EB962 /* ChildProcess.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = ChildProcess.cpp; sourceTree = "<group>"; };
                1A30066C1110F4F70031937C /* ResponsivenessTimer.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ResponsivenessTimer.h; sourceTree = "<group>"; };
                1A30EAC5115D7DA30053E937 /* ConnectionMac.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = ConnectionMac.cpp; sourceTree = "<group>"; };
-               1A334DEA16DE8B68006A8E38 /* StorageAreaProxy.messages.in */ = {isa = PBXFileReference; lastKnownFileType = text; path = StorageAreaProxy.messages.in; sourceTree = "<group>"; };
-               1A334DEB16DE8F88006A8E38 /* StorageAreaProxyMessageReceiver.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = StorageAreaProxyMessageReceiver.cpp; sourceTree = "<group>"; };
-               1A334DEC16DE8F88006A8E38 /* StorageAreaProxyMessages.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = StorageAreaProxyMessages.h; sourceTree = "<group>"; };
+               1A334DEA16DE8B68006A8E38 /* StorageAreaImpl.messages.in */ = {isa = PBXFileReference; lastKnownFileType = text; path = StorageAreaImpl.messages.in; sourceTree = "<group>"; };
+               1A334DEB16DE8F88006A8E38 /* StorageAreaImplMessageReceiver.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = StorageAreaImplMessageReceiver.cpp; sourceTree = "<group>"; };
+               1A334DEC16DE8F88006A8E38 /* StorageAreaImplMessages.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = StorageAreaImplMessages.h; sourceTree = "<group>"; };
                1A3D60FF13A7CC2A00F95D4E /* PluginModuleInfo.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = PluginModuleInfo.cpp; sourceTree = "<group>"; };
                1A3D610013A7CC2A00F95D4E /* PluginModuleInfo.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PluginModuleInfo.h; sourceTree = "<group>"; };
                1A3D610413A7F03A00F95D4E /* ArgumentCoders.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = ArgumentCoders.cpp; sourceTree = "<group>"; };
                1AC8702C130B49A2002C1257 /* WebPluginSiteDataManager.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = WebPluginSiteDataManager.cpp; sourceTree = "<group>"; };
                1AD25E93167AB08100EA9BCD /* DownloadProxyMap.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = DownloadProxyMap.cpp; sourceTree = "<group>"; };
                1AD25E94167AB08100EA9BCD /* DownloadProxyMap.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = DownloadProxyMap.h; sourceTree = "<group>"; };
-               1AD3306C16B1D991004F60E7 /* StorageAreaProxy.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = StorageAreaProxy.cpp; sourceTree = "<group>"; };
-               1AD3306D16B1D991004F60E7 /* StorageAreaProxy.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = StorageAreaProxy.h; sourceTree = "<group>"; };
+               1AD3306C16B1D991004F60E7 /* StorageAreaImpl.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = StorageAreaImpl.cpp; sourceTree = "<group>"; };
+               1AD3306D16B1D991004F60E7 /* StorageAreaImpl.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = StorageAreaImpl.h; sourceTree = "<group>"; };
                1AE117F511DBB30900981615 /* ProcessLauncher.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = ProcessLauncher.cpp; sourceTree = "<group>"; };
                1AE4976611FF658E0048B464 /* NPJSObject.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = NPJSObject.h; sourceTree = "<group>"; };
                1AE4976711FF658E0048B464 /* NPJSObject.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = NPJSObject.cpp; sourceTree = "<group>"; };
                1AAC4DDE16B1CBF6009425E3 /* Storage */ = {
                        isa = PBXGroup;
                        children = (
-                               1AD3306C16B1D991004F60E7 /* StorageAreaProxy.cpp */,
-                               1AD3306D16B1D991004F60E7 /* StorageAreaProxy.h */,
-                               1A334DEA16DE8B68006A8E38 /* StorageAreaProxy.messages.in */,
+                               1AD3306C16B1D991004F60E7 /* StorageAreaImpl.cpp */,
+                               1AD3306D16B1D991004F60E7 /* StorageAreaImpl.h */,
+                               1A334DEA16DE8B68006A8E38 /* StorageAreaImpl.messages.in */,
                                1A17635416B1D5D000D88FD6 /* StorageNamespaceImpl.cpp */,
                                1A17635516B1D5D000D88FD6 /* StorageNamespaceImpl.h */,
                                1AAC4DE116B1CBF6009425E3 /* WebKeyValueStorageManager.cpp */,
                                E1EDFDB21628AD730039ECDA /* SharedWorkerProcessMessages.h */,
                                E1EDFDB31628AD730039ECDA /* SharedWorkerProcessProxyMessageReceiver.cpp */,
                                E1EDFDB41628AD730039ECDA /* SharedWorkerProcessProxyMessages.h */,
-                               1A334DEB16DE8F88006A8E38 /* StorageAreaProxyMessageReceiver.cpp */,
-                               1A334DEC16DE8F88006A8E38 /* StorageAreaProxyMessages.h */,
+                               1A334DEB16DE8F88006A8E38 /* StorageAreaImplMessageReceiver.cpp */,
+                               1A334DEC16DE8F88006A8E38 /* StorageAreaImplMessages.h */,
                                1AB31A9416BC688100F6DBC9 /* StorageManagerMessageReceiver.cpp */,
                                1AB31A9516BC688100F6DBC9 /* StorageManagerMessages.h */,
                                512E3568130B57F000ABD19A /* WebApplicationCacheManagerMessageReceiver.cpp */,
                                E1EDFDBA1628B0450039ECDA /* SharedWorkerProcessProxy.h in Headers */,
                                E1EDFDB81628AD730039ECDA /* SharedWorkerProcessProxyMessages.h in Headers */,
                                5272B28B1406985D0096A5D0 /* StatisticsData.h in Headers */,
-                               1AD3306F16B1D991004F60E7 /* StorageAreaProxy.h in Headers */,
+                               1AD3306F16B1D991004F60E7 /* StorageAreaImpl.h in Headers */,
                                1A44B95C16B73F9F00B7BBD8 /* StorageManager.h in Headers */,
                                1AB31A9716BC688100F6DBC9 /* StorageManagerMessages.h in Headers */,
                                BCBD3C3B125BFA7A00D2C29F /* StringPairVector.h in Headers */,
                                1A3E736111CC2659007BD539 /* WebPlatformStrategies.h in Headers */,
                                31D5929F166E060000E6BF02 /* WebPlugInClient.h in Headers */,
                                1AC8702D130B49A2002C1257 /* WebPluginSiteDataManager.h in Headers */,
-                               1A334DEE16DE8F88006A8E38 /* StorageAreaProxyMessages.h in Headers */,
+                               1A334DEE16DE8F88006A8E38 /* StorageAreaImplMessages.h in Headers */,
                                BCB9F8B01124E07700A137E0 /* WebPolicyClient.h in Headers */,
                                BC5744F012638FB3006F0F12 /* WebPopupItem.h in Headers */,
                                D3B9484711FF4B6500032B39 /* WebPopupMenu.h in Headers */,
                                BCEE966C112FAF57006BCC24 /* Attachment.cpp in Sources */,
                                E1A31735134CEA80007C9A4F /* AttributedString.mm in Sources */,
                                512F589612A8838800629530 /* AuthenticationChallengeProxy.cpp in Sources */,
-                               1A334DED16DE8F88006A8E38 /* StorageAreaProxyMessageReceiver.cpp in Sources */,
+                               1A334DED16DE8F88006A8E38 /* StorageAreaImplMessageReceiver.cpp in Sources */,
                                512F589812A8838800629530 /* AuthenticationDecisionListener.cpp in Sources */,
                                518E8EF816B2091C00E91429 /* AuthenticationManager.cpp in Sources */,
                                518E8EFB16B2091C00E91429 /* AuthenticationManager.mac.mm in Sources */,
                                E1EDFDB71628AD730039ECDA /* SharedWorkerProcessProxyMessageReceiver.cpp in Sources */,
                                E199875E142C045400BB2DE7 /* SimplePDFPlugin.mm in Sources */,
                                5272B28A1406985D0096A5D0 /* StatisticsData.cpp in Sources */,
-                               1AD3306E16B1D991004F60E7 /* StorageAreaProxy.cpp in Sources */,
+                               1AD3306E16B1D991004F60E7 /* StorageAreaImpl.cpp in Sources */,
                                1A44B95B16B73F9F00B7BBD8 /* StorageManager.cpp in Sources */,
                                1AB31A9616BC688100F6DBC9 /* StorageManagerMessageReceiver.cpp in Sources */,
                                1A44B95716B737AA00B7BBD8 /* StorageNamespaceImpl.cpp in Sources */,
  */
 
 #include "config.h"
-#include "StorageAreaProxy.h"
+#include "StorageAreaImpl.h"
 
 #include "SecurityOriginData.h"
-#include "StorageAreaProxyMessages.h"
+#include "StorageAreaImplMessages.h"
 #include "StorageManagerMessages.h"
 #include "StorageNamespaceImpl.h"
 #include "WebProcess.h"
@@ -48,28 +48,28 @@ static uint64_t generateStorageAreaID()
     return ++storageAreaID;
 }
 
-PassRefPtr<StorageAreaProxy> StorageAreaProxy::create(StorageNamespaceImpl* StorageNamespaceImpl, PassRefPtr<SecurityOrigin> securityOrigin)
+PassRefPtr<StorageAreaImpl> StorageAreaImpl::create(StorageNamespaceImpl* StorageNamespaceImpl, PassRefPtr<SecurityOrigin> securityOrigin)
 {
-    return adoptRef(new StorageAreaProxy(StorageNamespaceImpl, securityOrigin));
+    return adoptRef(new StorageAreaImpl(StorageNamespaceImpl, securityOrigin));
 }
 
-StorageAreaProxy::StorageAreaProxy(StorageNamespaceImpl* StorageNamespaceImpl, PassRefPtr<SecurityOrigin> securityOrigin)
+StorageAreaImpl::StorageAreaImpl(StorageNamespaceImpl* StorageNamespaceImpl, PassRefPtr<SecurityOrigin> securityOrigin)
     : m_storageNamespaceID(StorageNamespaceImpl->storageNamespaceID())
     , m_quotaInBytes(StorageNamespaceImpl->quotaInBytes())
     , m_storageAreaID(generateStorageAreaID())
     , m_securityOrigin(securityOrigin)
 {
     WebProcess::shared().connection()->send(Messages::StorageManager::CreateStorageArea(m_storageAreaID, StorageNamespaceImpl->storageNamespaceID(), SecurityOriginData::fromSecurityOrigin(m_securityOrigin.get())), 0);
-    WebProcess::shared().addMessageReceiver(Messages::StorageAreaProxy::messageReceiverName(), m_storageAreaID, this);
+    WebProcess::shared().addMessageReceiver(Messages::StorageAreaImpl::messageReceiverName(), m_storageAreaID, this);
 }
 
-StorageAreaProxy::~StorageAreaProxy()
+StorageAreaImpl::~StorageAreaImpl()
 {
     WebProcess::shared().connection()->send(Messages::StorageManager::DestroyStorageArea(m_storageAreaID), 0);
-    WebProcess::shared().removeMessageReceiver(Messages::StorageAreaProxy::messageReceiverName(), m_storageAreaID);
+    WebProcess::shared().removeMessageReceiver(Messages::StorageAreaImpl::messageReceiverName(), m_storageAreaID);
 }
 
-unsigned StorageAreaProxy::length(ExceptionCode& ec, Frame* sourceFrame)
+unsigned StorageAreaImpl::length(ExceptionCode& ec, Frame* sourceFrame)
 {
     ec = 0;
     if (!canAccessStorage(sourceFrame)) {
@@ -84,7 +84,7 @@ unsigned StorageAreaProxy::length(ExceptionCode& ec, Frame* sourceFrame)
     return m_storageMap->length();
 }
 
-String StorageAreaProxy::key(unsigned index, ExceptionCode& ec, Frame* sourceFrame)
+String StorageAreaImpl::key(unsigned index, ExceptionCode& ec, Frame* sourceFrame)
 {
     ec = 0;
     if (!canAccessStorage(sourceFrame)) {
@@ -99,7 +99,7 @@ String StorageAreaProxy::key(unsigned index, ExceptionCode& ec, Frame* sourceFra
     return m_storageMap->key(index);
 }
 
-String StorageAreaProxy::getItem(const String& key, ExceptionCode& ec, Frame* sourceFrame)
+String StorageAreaImpl::getItem(const String& key, ExceptionCode& ec, Frame* sourceFrame)
 {
     ec = 0;
     if (!canAccessStorage(sourceFrame)) {
@@ -113,7 +113,7 @@ String StorageAreaProxy::getItem(const String& key, ExceptionCode& ec, Frame* so
     return m_storageMap->getItem(key);
 }
 
-void StorageAreaProxy::setItem(const String& key, const String& value, ExceptionCode& ec, Frame* sourceFrame)
+void StorageAreaImpl::setItem(const String& key, const String& value, ExceptionCode& ec, Frame* sourceFrame)
 {
     ec = 0;
     if (!canAccessStorage(sourceFrame)) {
@@ -148,7 +148,7 @@ void StorageAreaProxy::setItem(const String& key, const String& value, Exception
     WebProcess::shared().connection()->send(Messages::StorageManager::SetItem(m_storageAreaID, key, value, sourceFrame->document()->url()), 0);
 }
 
-void StorageAreaProxy::removeItem(const String& key, ExceptionCode&, Frame* sourceFrame)
+void StorageAreaImpl::removeItem(const String& key, ExceptionCode&, Frame* sourceFrame)
 {
     // FIXME: Implement this.
     ASSERT_NOT_REACHED();
@@ -156,14 +156,14 @@ void StorageAreaProxy::removeItem(const String& key, ExceptionCode&, Frame* sour
     UNUSED_PARAM(sourceFrame);
 }
 
-void StorageAreaProxy::clear(ExceptionCode&, Frame* sourceFrame)
+void StorageAreaImpl::clear(ExceptionCode&, Frame* sourceFrame)
 {
     // FIXME: Implement this.
     ASSERT_NOT_REACHED();
     UNUSED_PARAM(sourceFrame);
 }
 
-bool StorageAreaProxy::contains(const String& key, ExceptionCode& ec, Frame* sourceFrame)
+bool StorageAreaImpl::contains(const String& key, ExceptionCode& ec, Frame* sourceFrame)
 {
     ec = 0;
     if (!canAccessStorage(sourceFrame)) {
@@ -178,34 +178,34 @@ bool StorageAreaProxy::contains(const String& key, ExceptionCode& ec, Frame* sou
     return m_storageMap->contains(key);
 }
 
-bool StorageAreaProxy::canAccessStorage(Frame* frame)
+bool StorageAreaImpl::canAccessStorage(Frame* frame)
 {
     return frame && frame->page();
 }
 
-size_t StorageAreaProxy::memoryBytesUsedByCache()
+size_t StorageAreaImpl::memoryBytesUsedByCache()
 {
     return 0;
 }
 
-void StorageAreaProxy::incrementAccessCount()
+void StorageAreaImpl::incrementAccessCount()
 {
     // Storage access is handled in the UI process, so there's nothing to do here.
 }
 
-void StorageAreaProxy::decrementAccessCount()
+void StorageAreaImpl::decrementAccessCount()
 {
     // Storage access is handled in the UI process, so there's nothing to do here.
 }
 
-void StorageAreaProxy::closeDatabaseIfIdle()
+void StorageAreaImpl::closeDatabaseIfIdle()
 {
     // FIXME: Implement this.
     ASSERT_NOT_REACHED();
 }
 
 
-void StorageAreaProxy::didSetItem(const String& key, bool quotaError)
+void StorageAreaImpl::didSetItem(const String& key, bool quotaError)
 {
     ASSERT(m_pendingValueChanges.contains(key));
 
@@ -215,7 +215,7 @@ void StorageAreaProxy::didSetItem(const String& key, bool quotaError)
         resetValues();
 }
 
-void StorageAreaProxy::dispatchStorageEvent(const String& key, const String& oldValue, const String& newValue, const String& urlString)
+void StorageAreaImpl::dispatchStorageEvent(const String& key, const String& oldValue, const String& newValue, const String& urlString)
 {
     if (!shouldApplyChangesForKey(key))
         return;
@@ -232,7 +232,7 @@ void StorageAreaProxy::dispatchStorageEvent(const String& key, const String& old
         dispatchLocalStorageEvent(key, oldValue, newValue, urlString);
 }
 
-StorageType StorageAreaProxy::storageType() const
+StorageType StorageAreaImpl::storageType() const
 {
     // A zero storage namespace ID is used for local storage.
     if (!m_storageNamespaceID)
@@ -241,7 +241,7 @@ StorageType StorageAreaProxy::storageType() const
     return SessionStorage;
 }
 
-bool StorageAreaProxy::disabledByPrivateBrowsingInFrame(const Frame* sourceFrame) const
+bool StorageAreaImpl::disabledByPrivateBrowsingInFrame(const Frame* sourceFrame) const
 {
     if (!sourceFrame->page()->settings()->privateBrowsingEnabled())
         return false;
@@ -252,7 +252,7 @@ bool StorageAreaProxy::disabledByPrivateBrowsingInFrame(const Frame* sourceFrame
     return !SchemeRegistry::allowsLocalStorageAccessInPrivateBrowsing(sourceFrame->document()->securityOrigin()->protocol());
 }
 
-bool StorageAreaProxy::shouldApplyChangesForKey(const String& key) const
+bool StorageAreaImpl::shouldApplyChangesForKey(const String& key) const
 {
     // We have not yet loaded anything from this storage map.
     if (!m_storageMap)
@@ -267,7 +267,7 @@ bool StorageAreaProxy::shouldApplyChangesForKey(const String& key) const
     return true;
 }
 
-void StorageAreaProxy::loadValuesIfNeeded()
+void StorageAreaImpl::loadValuesIfNeeded()
 {
     if (m_storageMap)
         return;
@@ -281,13 +281,13 @@ void StorageAreaProxy::loadValuesIfNeeded()
     m_storageMap->importItems(values);
 }
 
-void StorageAreaProxy::resetValues()
+void StorageAreaImpl::resetValues()
 {
     m_storageMap = nullptr;
     m_pendingValueChanges.clear();
 }
 
-void StorageAreaProxy::dispatchSessionStorageEvent(const String& key, const String& oldValue, const String& newValue, const String& urlString)
+void StorageAreaImpl::dispatchSessionStorageEvent(const String& key, const String& oldValue, const String& newValue, const String& urlString)
 {
     ASSERT(storageType() == SessionStorage);
 
@@ -298,7 +298,7 @@ void StorageAreaProxy::dispatchSessionStorageEvent(const String& key, const Stri
     UNUSED_PARAM(urlString);
 }
 
-void StorageAreaProxy::dispatchLocalStorageEvent(const String& key, const String& oldValue, const String& newValue, const String& urlString)
+void StorageAreaImpl::dispatchLocalStorageEvent(const String& key, const String& oldValue, const String& newValue, const String& urlString)
 {
     ASSERT(storageType() == LocalStorage);
 
@@ -23,8 +23,8 @@
  * THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#ifndef StorageAreaProxy_h
-#define StorageAreaProxy_h
+#ifndef StorageAreaImpl_h
+#define StorageAreaImpl_h
 
 #include "MessageReceiver.h"
 #include <WebCore/StorageArea.h>
@@ -39,13 +39,13 @@ namespace WebKit {
 
 class StorageNamespaceImpl;
 
-class StorageAreaProxy : public WebCore::StorageArea, private CoreIPC::MessageReceiver {
+class StorageAreaImpl : public WebCore::StorageArea, private CoreIPC::MessageReceiver {
 public:
-    static PassRefPtr<StorageAreaProxy> create(StorageNamespaceImpl*, PassRefPtr<WebCore::SecurityOrigin>);
-    virtual ~StorageAreaProxy();
+    static PassRefPtr<StorageAreaImpl> create(StorageNamespaceImpl*, PassRefPtr<WebCore::SecurityOrigin>);
+    virtual ~StorageAreaImpl();
 
 private:
-    StorageAreaProxy(StorageNamespaceImpl*, PassRefPtr<WebCore::SecurityOrigin>);
+    StorageAreaImpl(StorageNamespaceImpl*, PassRefPtr<WebCore::SecurityOrigin>);
 
     // WebCore::StorageArea.
     virtual unsigned length(WebCore::ExceptionCode&, WebCore::Frame* sourceFrame) OVERRIDE;
@@ -89,4 +89,4 @@ private:
 
 } // namespace WebKit
 
-#endif // StorageAreaProxy_h
+#endif // StorageAreaImpl_h
@@ -20,7 +20,7 @@
 # OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
 # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
-messages -> StorageAreaProxy {
+messages -> StorageAreaImpl {
     DidSetItem(WTF::String key, bool quotaException)
 
     DispatchStorageEvent(WTF::String key, WTF::String oldValue, WTF::String newValue, WTF::String urlString)
index a3eb47d..04fc444 100644 (file)
@@ -26,7 +26,7 @@
 #include "config.h"
 #include "StorageNamespaceImpl.h"
 
-#include "StorageAreaProxy.h"
+#include "StorageAreaImpl.h"
 #include "WebPage.h"
 #include <WebCore/SecurityOrigin.h>
 #include <WebCore/Settings.h>
@@ -52,9 +52,9 @@ StorageNamespaceImpl::~StorageNamespaceImpl()
 
 PassRefPtr<StorageArea> StorageNamespaceImpl::storageArea(PassRefPtr<SecurityOrigin> securityOrigin)
 {
-    HashMap<RefPtr<WebCore::SecurityOrigin>, RefPtr<StorageAreaProxy> >::AddResult result = m_storageAreaMap.add(securityOrigin.get(), 0);
+    HashMap<RefPtr<WebCore::SecurityOrigin>, RefPtr<StorageAreaImpl> >::AddResult result = m_storageAreaMap.add(securityOrigin.get(), 0);
     if (result.isNewEntry)
-        result.iterator->value = StorageAreaProxy::create(this, securityOrigin);
+        result.iterator->value = StorageAreaImpl::create(this, securityOrigin);
 
     return result.iterator->value;
 }
index f3837f3..e7eb674 100644 (file)
@@ -33,7 +33,7 @@
 
 namespace WebKit {
 
-class StorageAreaProxy;
+class StorageAreaImpl;
 class WebPage;
 
 class StorageNamespaceImpl : public WebCore::StorageNamespace {
@@ -58,7 +58,7 @@ private:
     uint64_t m_storageNamespaceID;
     unsigned m_quotaInBytes;
 
-    HashMap<RefPtr<WebCore::SecurityOrigin>, RefPtr<StorageAreaProxy> > m_storageAreaMap;
+    HashMap<RefPtr<WebCore::SecurityOrigin>, RefPtr<StorageAreaImpl> > m_storageAreaMap;
 };
 
 } // namespace WebKit