diff options
| author | avi <avi@chromium.org> | 2015-12-24 18:39:14 -0800 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2015-12-25 02:40:22 +0000 |
| commit | 1023d01cf18184883fad21181873d41b740e4d03 (patch) | |
| tree | 36deaea8cc2c6fd903f8d632fe566ca835e9a9f3 /content/renderer/cache_storage | |
| parent | 0f233432263b842ae54e83ac576c218d2326afbb (diff) | |
| download | chromium_src-1023d01cf18184883fad21181873d41b740e4d03.zip chromium_src-1023d01cf18184883fad21181873d41b740e4d03.tar.gz chromium_src-1023d01cf18184883fad21181873d41b740e4d03.tar.bz2 | |
Switch to standard integer types in content/renderer/.
BUG=138542
TBR=jam@chromium.org
Review URL: https://codereview.chromium.org/1547073003
Cr-Commit-Position: refs/heads/master@{#366847}
Diffstat (limited to 'content/renderer/cache_storage')
4 files changed, 8 insertions, 2 deletions
diff --git a/content/renderer/cache_storage/cache_storage_dispatcher.cc b/content/renderer/cache_storage/cache_storage_dispatcher.cc index 70f0db3..9091468 100644 --- a/content/renderer/cache_storage/cache_storage_dispatcher.cc +++ b/content/renderer/cache_storage/cache_storage_dispatcher.cc @@ -4,6 +4,8 @@ #include "content/renderer/cache_storage/cache_storage_dispatcher.h" +#include <stddef.h> + #include <map> #include <string> #include <utility> diff --git a/content/renderer/cache_storage/cache_storage_dispatcher.h b/content/renderer/cache_storage/cache_storage_dispatcher.h index f08712c..a43757d 100644 --- a/content/renderer/cache_storage/cache_storage_dispatcher.h +++ b/content/renderer/cache_storage/cache_storage_dispatcher.h @@ -5,6 +5,8 @@ #ifndef CONTENT_RENDERER_CACHE_STORAGE_CACHE_STORAGE_DISPATCHER_H_ #define CONTENT_RENDERER_CACHE_STORAGE_CACHE_STORAGE_DISPATCHER_H_ +#include <stdint.h> + #include <vector> #include "base/id_map.h" @@ -162,7 +164,7 @@ class CacheStorageDispatcher : public WorkerThread::Observer { typedef IDMap<blink::WebServiceWorkerCacheStorage::CacheStorageMatchCallbacks, IDMapOwnPointer> StorageMatchCallbacksMap; - typedef base::hash_map<int32, base::TimeTicks> TimeMap; + typedef base::hash_map<int32_t, base::TimeTicks> TimeMap; typedef IDMap<blink::WebServiceWorkerCache::CacheMatchCallbacks, IDMapOwnPointer> MatchCallbacksMap; @@ -173,7 +175,7 @@ class CacheStorageDispatcher : public WorkerThread::Observer { using BatchCallbacksMap = IDMap<blink::WebServiceWorkerCache::CacheBatchCallbacks, IDMapOwnPointer>; - static int32 CurrentWorkerId() { return WorkerThread::GetCurrentId(); } + static int32_t CurrentWorkerId() { return WorkerThread::GetCurrentId(); } void PopulateWebResponseFromResponse( const ServiceWorkerResponse& response, diff --git a/content/renderer/cache_storage/cache_storage_message_filter.h b/content/renderer/cache_storage/cache_storage_message_filter.h index 5d92d69..28d0a41 100644 --- a/content/renderer/cache_storage/cache_storage_message_filter.h +++ b/content/renderer/cache_storage/cache_storage_message_filter.h @@ -5,6 +5,7 @@ #ifndef CONTENT_RENDERER_SERVICE_WORKER_CACHE_STORAGE_MESSAGE_FILTER_H_ #define CONTENT_RENDERER_SERVICE_WORKER_CACHE_STORAGE_MESSAGE_FILTER_H_ +#include "base/macros.h" #include "base/memory/ref_counted.h" #include "content/child/worker_thread_message_filter.h" diff --git a/content/renderer/cache_storage/webserviceworkercachestorage_impl.h b/content/renderer/cache_storage/webserviceworkercachestorage_impl.h index 77f443d..cc6d8e8 100644 --- a/content/renderer/cache_storage/webserviceworkercachestorage_impl.h +++ b/content/renderer/cache_storage/webserviceworkercachestorage_impl.h @@ -5,6 +5,7 @@ #ifndef CONTENT_RENDERER_SERVICE_WORKER_WEB_SERVICE_WORKER_CACHE_STORAGE_IMPL_H_ #define CONTENT_RENDERER_SERVICE_WORKER_WEB_SERVICE_WORKER_CACHE_STORAGE_IMPL_H_ +#include "base/macros.h" #include "content/child/thread_safe_sender.h" #include "third_party/WebKit/public/platform/WebString.h" #include "third_party/WebKit/public/platform/modules/serviceworker/WebServiceWorkerCache.h" |