Changeset 148148 in webkit

Timestamp:

Apr 10, 2013 4:22:02 PM (11 years ago)

Author:

andersca@apple.com

Message:

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):

Location:

trunk/Source/WebKit2

Files:

• ChangeLog (modified) (1 diff)
• DerivedSources.make (modified) (1 diff)
• UIProcess/Storage/StorageManager.cpp (modified) (3 diffs)
• WebKit2.xcodeproj/project.pbxproj (modified) (10 diffs)
• WebProcess/Storage/StorageAreaImpl.cpp (moved) (moved from trunk/Source/WebKit2/WebProcess/Storage/StorageAreaProxy.cpp) (19 diffs)
• WebProcess/Storage/StorageAreaImpl.h (moved) (moved from trunk/Source/WebKit2/WebProcess/Storage/StorageAreaProxy.h) (3 diffs)
• WebProcess/Storage/StorageAreaImpl.messages.in (moved) (moved from trunk/Source/WebKit2/WebProcess/Storage/StorageAreaProxy.messages.in) (1 diff)
• WebProcess/Storage/StorageNamespaceImpl.cpp (modified) (2 diffs)
• WebProcess/Storage/StorageNamespaceImpl.h (modified) (2 diffs)

trunk/Source/WebKit2/ChangeLog

@@ +1 @@
+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>
 

trunk/Source/WebKit2/DerivedSources.make

@@ -91 +91 @@
     SecItemShim \
     SecItemShimProxy \
-    StorageAreaProxy \
+    StorageAreaImpl \
     WebContext \
     WebDatabaseManager \

trunk/Source/WebKit2/UIProcess/Storage/StorageManager.cpp

@@ -28 +28 @@
 
 #include "SecurityOriginData.h"
-#include "StorageAreaProxyMessages.h"
+#include "StorageAreaImplMessages.h"
 #include "StorageManagerMessages.h"
 #include "WebProcessProxy.h"
@@ -104 +104 @@
         }
 
-        it->first->send(Messages::StorageAreaProxy::DispatchStorageEvent(key, oldValue, newValue, urlString), it->second);
+        it->first->send(Messages::StorageAreaImpl::DispatchStorageEvent(key, oldValue, newValue, urlString), it->second);
     }
 }
@@ -274 +274 @@
     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);
 }
 

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

@@ -122 +122 @@
                 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 */; };
@@ -257 +257 @@
                 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 */; };
@@ -1485 +1485 @@
                 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>"; };
@@ -1639 +1639 @@
                 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>"; };
@@ -3090 +3090 @@
                         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 */,
@@ -4916 +4916 @@
                                 E1EDFDB31628AD730039ECDA /* SharedWorkerProcessProxyMessageReceiver.cpp */,
                                 E1EDFDB41628AD730039ECDA /* SharedWorkerProcessProxyMessages.h */,
-                                1A334DEB16DE8F88006A8E38 /* StorageAreaProxyMessageReceiver.cpp */,
-                                1A334DEC16DE8F88006A8E38 /* StorageAreaProxyMessages.h */,
+                                1A334DEB16DE8F88006A8E38 /* StorageAreaImplMessageReceiver.cpp */,
+                                1A334DEC16DE8F88006A8E38 /* StorageAreaImplMessages.h */,
                                 1AB31A9416BC688100F6DBC9 /* StorageManagerMessageReceiver.cpp */,
                                 1AB31A9516BC688100F6DBC9 /* StorageManagerMessages.h */,
@@ -5331 +5331 @@
                                 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 */,
@@ -5472 +5472 @@
                                 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 */,
@@ -6345 +6345 @@
                                 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 */,
@@ -6558 +6558 @@
                                 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 */,

trunk/Source/WebKit2/WebProcess/Storage/StorageAreaImpl.cpp

@@ -25 +25 @@
 
 #include "config.h"
-#include "StorageAreaProxy.h"
+#include "StorageAreaImpl.h"
 
 #include "SecurityOriginData.h"
-#include "StorageAreaProxyMessages.h"
+#include "StorageAreaImplMessages.h"
 #include "StorageManagerMessages.h"
 #include "StorageNamespaceImpl.h"
@@ -49 +49 @@
 }
 
-PassRefPtr<StorageAreaProxy> StorageAreaProxy::create(StorageNamespaceImpl* StorageNamespaceImpl, PassRefPtr<SecurityOrigin> securityOrigin)
-{
-    return adoptRef(new StorageAreaProxy(StorageNamespaceImpl, securityOrigin));
-}
-
-StorageAreaProxy::StorageAreaProxy(StorageNamespaceImpl* StorageNamespaceImpl, PassRefPtr<SecurityOrigin> securityOrigin)
+PassRefPtr<StorageAreaImpl> StorageAreaImpl::create(StorageNamespaceImpl* StorageNamespaceImpl, PassRefPtr<SecurityOrigin> securityOrigin)
+{
+    return adoptRef(new StorageAreaImpl(StorageNamespaceImpl, securityOrigin));
+}
+
+StorageAreaImpl::StorageAreaImpl(StorageNamespaceImpl* StorageNamespaceImpl, PassRefPtr<SecurityOrigin> securityOrigin)
     : m_storageNamespaceID(StorageNamespaceImpl->storageNamespaceID())
     , m_quotaInBytes(StorageNamespaceImpl->quotaInBytes())
@@ -61 +61 @@
 {
     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);
-}
-
-StorageAreaProxy::~StorageAreaProxy()
+    WebProcess::shared().addMessageReceiver(Messages::StorageAreaImpl::messageReceiverName(), m_storageAreaID, this);
+}
+
+StorageAreaImpl::~StorageAreaImpl()
 {
     WebProcess::shared().connection()->send(Messages::StorageManager::DestroyStorageArea(m_storageAreaID), 0);
-    WebProcess::shared().removeMessageReceiver(Messages::StorageAreaProxy::messageReceiverName(), m_storageAreaID);
-}
-
-unsigned StorageAreaProxy::length(ExceptionCode& ec, Frame* sourceFrame)
+    WebProcess::shared().removeMessageReceiver(Messages::StorageAreaImpl::messageReceiverName(), m_storageAreaID);
+}
+
+unsigned StorageAreaImpl::length(ExceptionCode& ec, Frame* sourceFrame)
 {
     ec = 0;
@@ -85 +85 @@
 }
 
-String StorageAreaProxy::key(unsigned index, ExceptionCode& ec, Frame* sourceFrame)
+String StorageAreaImpl::key(unsigned index, ExceptionCode& ec, Frame* sourceFrame)
 {
     ec = 0;
@@ -100 +100 @@
 }
 
-String StorageAreaProxy::getItem(const String& key, ExceptionCode& ec, Frame* sourceFrame)
+String StorageAreaImpl::getItem(const String& key, ExceptionCode& ec, Frame* sourceFrame)
 {
     ec = 0;
@@ -114 +114 @@
 }
 
-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;
@@ -149 +149 @@
 }
 
-void StorageAreaProxy::removeItem(const String& key, ExceptionCode&, Frame* sourceFrame)
+void StorageAreaImpl::removeItem(const String& key, ExceptionCode&, Frame* sourceFrame)
 {
     // FIXME: Implement this.
@@ -157 +157 @@
 }
 
-void StorageAreaProxy::clear(ExceptionCode&, Frame* sourceFrame)
+void StorageAreaImpl::clear(ExceptionCode&, Frame* sourceFrame)
 {
     // FIXME: Implement this.
@@ -164 +164 @@
 }
 
-bool StorageAreaProxy::contains(const String& key, ExceptionCode& ec, Frame* sourceFrame)
+bool StorageAreaImpl::contains(const String& key, ExceptionCode& ec, Frame* sourceFrame)
 {
     ec = 0;
@@ -179 +179 @@
 }
 
-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.
@@ -206 +206 @@
 
 
-void StorageAreaProxy::didSetItem(const String& key, bool quotaError)
+void StorageAreaImpl::didSetItem(const String& key, bool quotaError)
 {
     ASSERT(m_pendingValueChanges.contains(key));
@@ -216 +216 @@
 }
 
-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))
@@ -233 +233 @@
 }
 
-StorageType StorageAreaProxy::storageType() const
+StorageType StorageAreaImpl::storageType() const
 {
     // A zero storage namespace ID is used for local storage.
@@ -242 +242 @@
 }
 
-bool StorageAreaProxy::disabledByPrivateBrowsingInFrame(const Frame* sourceFrame) const
+bool StorageAreaImpl::disabledByPrivateBrowsingInFrame(const Frame* sourceFrame) const
 {
     if (!sourceFrame->page()->settings()->privateBrowsingEnabled())
@@ -253 +253 @@
 }
 
-bool StorageAreaProxy::shouldApplyChangesForKey(const String& key) const
+bool StorageAreaImpl::shouldApplyChangesForKey(const String& key) const
 {
     // We have not yet loaded anything from this storage map.
@@ -268 +268 @@
 }
 
-void StorageAreaProxy::loadValuesIfNeeded()
+void StorageAreaImpl::loadValuesIfNeeded()
 {
     if (m_storageMap)
@@ -282 +282 @@
 }
 
-void StorageAreaProxy::resetValues()
+void StorageAreaImpl::resetValues()
 {
     m_storageMap = nullptr;
@@ -288 +288 @@
 }
 
-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);
@@ -299 +299 @@
 }
 
-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);

trunk/Source/WebKit2/WebProcess/Storage/StorageAreaImpl.h

@@ -24 +24 @@
  */
 
-#ifndef StorageAreaProxy_h
-#define StorageAreaProxy_h
+#ifndef StorageAreaImpl_h
+#define StorageAreaImpl_h
 
 #include "MessageReceiver.h"
@@ -40 +40 @@
 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.
@@ -90 +90 @@
 } // namespace WebKit
 
-#endif // StorageAreaProxy_h
+#endif // StorageAreaImpl_h

trunk/Source/WebKit2/WebProcess/Storage/StorageAreaImpl.messages.in

@@ -21 +21 @@
 # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
-messages -> StorageAreaProxy {
+messages -> StorageAreaImpl {
     DidSetItem(WTF::String key, bool quotaException)
 

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

@@ -27 +27 @@
 #include "StorageNamespaceImpl.h"
 
-#include "StorageAreaProxy.h"
+#include "StorageAreaImpl.h"
 #include "WebPage.h"
 #include <WebCore/SecurityOrigin.h>
@@ -53 +53 @@
 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;

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

@@ -34 +34 @@
 namespace WebKit {
 
-class StorageAreaProxy;
+class StorageAreaImpl;
 class WebPage;
 
@@ -59 +59 @@
     unsigned m_quotaInBytes;
 
-    HashMap<RefPtr<WebCore::SecurityOrigin>, RefPtr<StorageAreaProxy> > m_storageAreaMap;
+    HashMap<RefPtr<WebCore::SecurityOrigin>, RefPtr<StorageAreaImpl> > m_storageAreaMap;
 };