| Index: content/renderer/dom_storage/dom_storage_dispatcher.cc
|
| diff --git a/content/renderer/dom_storage/dom_storage_dispatcher.cc b/content/renderer/dom_storage/dom_storage_dispatcher.cc
|
| index a4d877f715f77c2bad71b6a320bee75db307bd22..29dbb043e0659b84ef704102f48993f0c42d6b24 100644
|
| --- a/content/renderer/dom_storage/dom_storage_dispatcher.cc
|
| +++ b/content/renderer/dom_storage/dom_storage_dispatcher.cc
|
| @@ -99,11 +99,11 @@ class DomStorageDispatcher::ProxyImpl : public DOMStorageProxy {
|
| explicit ProxyImpl(RenderThreadImpl* sender);
|
|
|
| // Methods for use by DomStorageDispatcher directly.
|
| - DOMStorageCachedArea* OpenCachedArea(
|
| - int64 namespace_id, const GURL& origin);
|
| + DOMStorageCachedArea* OpenCachedArea(int64_t namespace_id,
|
| + const GURL& origin);
|
| void CloseCachedArea(DOMStorageCachedArea* area);
|
| - DOMStorageCachedArea* LookupCachedArea(
|
| - int64 namespace_id, const GURL& origin);
|
| + DOMStorageCachedArea* LookupCachedArea(int64_t namespace_id,
|
| + const GURL& origin);
|
| void CompleteOnePendingCallback(bool success);
|
| void Shutdown();
|
|
|
| @@ -155,7 +155,7 @@ class DomStorageDispatcher::ProxyImpl : public DOMStorageProxy {
|
| return callback;
|
| }
|
|
|
| - std::string GetCachedAreaKey(int64 namespace_id, const GURL& origin) {
|
| + std::string GetCachedAreaKey(int64_t namespace_id, const GURL& origin) {
|
| return base::Int64ToString(namespace_id) + origin.spec();
|
| }
|
|
|
| @@ -179,7 +179,8 @@ DomStorageDispatcher::ProxyImpl::ProxyImpl(RenderThreadImpl* sender)
|
| }
|
|
|
| DOMStorageCachedArea* DomStorageDispatcher::ProxyImpl::OpenCachedArea(
|
| - int64 namespace_id, const GURL& origin) {
|
| + int64_t namespace_id,
|
| + const GURL& origin) {
|
| std::string key = GetCachedAreaKey(namespace_id, origin);
|
| if (CachedAreaHolder* holder = GetAreaHolder(key)) {
|
| ++(holder->open_count_);
|
| @@ -204,7 +205,8 @@ void DomStorageDispatcher::ProxyImpl::CloseCachedArea(
|
| }
|
|
|
| DOMStorageCachedArea* DomStorageDispatcher::ProxyImpl::LookupCachedArea(
|
| - int64 namespace_id, const GURL& origin) {
|
| + int64_t namespace_id,
|
| + const GURL& origin) {
|
| std::string key = GetCachedAreaKey(namespace_id, origin);
|
| CachedAreaHolder* holder = GetAreaHolder(key);
|
| if (!holder)
|
| @@ -268,7 +270,9 @@ DomStorageDispatcher::~DomStorageDispatcher() {
|
| }
|
|
|
| scoped_refptr<DOMStorageCachedArea> DomStorageDispatcher::OpenCachedArea(
|
| - int connection_id, int64 namespace_id, const GURL& origin) {
|
| + int connection_id,
|
| + int64_t namespace_id,
|
| + const GURL& origin) {
|
| RenderThreadImpl::current()->Send(
|
| new DOMStorageHostMsg_OpenStorageArea(
|
| connection_id, namespace_id, origin));
|
|
|