Skip to content

GitLab

T
tangled
Commit 34cbfce4 authored by nhiroki's avatar nhiroki Committed by Commit bot
Browse files
Options

CacheStorage: Merge CacheStorageListener into CacheStorageDispatcherHost (1) 

CacheStorageListener and CacheStorageDispatcher are now in a 1:1 relationship
and the indirection is no longer necessary. As a first step of merge, this CL
moves message handlers for CacheStorage API from the listener to the dispatcher.

BUG=474233
TEST=content_unittests --gtest_filter=CacheStorage*

Review URL: https://codereview.chromium.org/1101733005

Cr-Commit-Position: refs/heads/master@{#327199}
parent bba416f4
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 280 additions and 236 deletions
content/browser/cache_storage/cache_storage_dispatcher_host.h
View file @ 34cbfce4
...@@ -5,6 +5,7 @@ ...@@ -5,6 +5,7 @@
#ifndef CONTENT_BROWSER_CACHE_STORAGE_CACHE_STORAGE_DISPATCHER_HOST_H_ #ifndef CONTENT_BROWSER_CACHE_STORAGE_CACHE_STORAGE_DISPATCHER_HOST_H_
#define CONTENT_BROWSER_CACHE_STORAGE_CACHE_STORAGE_DISPATCHER_HOST_H_ #define CONTENT_BROWSER_CACHE_STORAGE_CACHE_STORAGE_DISPATCHER_HOST_H_
#include "content/browser/cache_storage/cache_storage.h"
#include "content/public/browser/browser_message_filter.h" #include "content/public/browser/browser_message_filter.h"
namespace content { namespace content {
...@@ -40,7 +41,52 @@ class CONTENT_EXPORT CacheStorageDispatcherHost : public BrowserMessageFilter { ...@@ -40,7 +41,52 @@ class CONTENT_EXPORT CacheStorageDispatcherHost : public BrowserMessageFilter {
// Called by Init() on IO thread. // Called by Init() on IO thread.
void CreateCacheListener(CacheStorageContextImpl* context); void CreateCacheListener(CacheStorageContextImpl* context);
// The message receiver functions for the CacheStorage API:
void OnCacheStorageHas(int thread_id,
int request_id,
const GURL& origin,
const base::string16& cache_name);
void OnCacheStorageOpen(int thread_id,
int request_id,
const GURL& origin,
const base::string16& cache_name);
void OnCacheStorageDelete(int thread_id,
int request_id,
const GURL& origin,
const base::string16& cache_name);
void OnCacheStorageKeys(int thread_id, int request_id, const GURL& origin);
void OnCacheStorageMatch(int thread_id,
int request_id,
const GURL& origin,
const ServiceWorkerFetchRequest& request,
const CacheStorageCacheQueryParams& match_params);
// CacheStorageManager callbacks
void OnCacheStorageHasCallback(int thread_id,
int request_id,
bool has_cache,
CacheStorage::CacheStorageError error);
void OnCacheStorageOpenCallback(int thread_id,
int request_id,
const scoped_refptr<CacheStorageCache>& cache,
CacheStorage::CacheStorageError error);
void OnCacheStorageDeleteCallback(int thread_id,
int request_id,
bool deleted,
CacheStorage::CacheStorageError error);
void OnCacheStorageKeysCallback(int thread_id,
int request_id,
const std::vector<std::string>& strings,
CacheStorage::CacheStorageError error);
void OnCacheStorageMatchCallback(
int thread_id,
int request_id,
CacheStorageCache::ErrorType error,
scoped_ptr<ServiceWorkerResponse> response,
scoped_ptr<storage::BlobDataHandle> blob_data_handle);
scoped_ptr<CacheStorageListener> cache_listener_; scoped_ptr<CacheStorageListener> cache_listener_;
scoped_refptr<CacheStorageContextImpl> context_;
DISALLOW_COPY_AND_ASSIGN(CacheStorageDispatcherHost); DISALLOW_COPY_AND_ASSIGN(CacheStorageDispatcherHost);
}; };
......
content/browser/cache_storage/cache_storage_listener.cc
View file @ 34cbfce4
...@@ -21,33 +21,9 @@ using blink::WebServiceWorkerCacheError; ...@@ -21,33 +21,9 @@ using blink::WebServiceWorkerCacheError;
namespace { namespace {
WebServiceWorkerCacheError ToWebServiceWorkerCacheError( // TODO(nhiroki): The same function exists in cache_storage_dispatcher_host.cc.
CacheStorage::CacheStorageError err) { // This should be removed when this listenr class is merged into the dispatcher.
switch (err) { // (http://crbug.com/474233)
case CacheStorage::CACHE_STORAGE_ERROR_NO_ERROR:
NOTREACHED();
return blink::WebServiceWorkerCacheErrorNotImplemented;
case CacheStorage::CACHE_STORAGE_ERROR_NOT_IMPLEMENTED:
return blink::WebServiceWorkerCacheErrorNotImplemented;
case CacheStorage::CACHE_STORAGE_ERROR_NOT_FOUND:
return blink::WebServiceWorkerCacheErrorNotFound;
case CacheStorage::CACHE_STORAGE_ERROR_EXISTS:
return blink::WebServiceWorkerCacheErrorExists;
case CacheStorage::CACHE_STORAGE_ERROR_STORAGE:
// TODO(jkarlin): Change this to CACHE_STORAGE_ERROR_STORAGE once that's
// added.
return blink::WebServiceWorkerCacheErrorNotFound;
case CacheStorage::CACHE_STORAGE_ERROR_CLOSING:
// TODO(jkarlin): Update this to CACHE_STORAGE_ERROR_CLOSING once that's
// added.
return blink::WebServiceWorkerCacheErrorNotFound;
}
NOTREACHED();
return blink::WebServiceWorkerCacheErrorNotImplemented;
}
// TODO(jkarlin): CacheStorageCache and CacheStorage should share
// an error enum type.
WebServiceWorkerCacheError CacheErrorToWebServiceWorkerCacheError( WebServiceWorkerCacheError CacheErrorToWebServiceWorkerCacheError(
CacheStorageCache::ErrorType err) { CacheStorageCache::ErrorType err) {
switch (err) { switch (err) {
...@@ -81,16 +57,6 @@ CacheStorageListener::~CacheStorageListener() { ...@@ -81,16 +57,6 @@ CacheStorageListener::~CacheStorageListener() {
bool CacheStorageListener::OnMessageReceived(const IPC::Message& message) { bool CacheStorageListener::OnMessageReceived(const IPC::Message& message) {
bool handled = true; bool handled = true;
IPC_BEGIN_MESSAGE_MAP(CacheStorageListener, message) IPC_BEGIN_MESSAGE_MAP(CacheStorageListener, message)
IPC_MESSAGE_HANDLER(CacheStorageHostMsg_CacheStorageHas,
OnCacheStorageHas)
IPC_MESSAGE_HANDLER(CacheStorageHostMsg_CacheStorageOpen,
OnCacheStorageOpen)
IPC_MESSAGE_HANDLER(CacheStorageHostMsg_CacheStorageDelete,
OnCacheStorageDelete)
IPC_MESSAGE_HANDLER(CacheStorageHostMsg_CacheStorageKeys,
OnCacheStorageKeys)
IPC_MESSAGE_HANDLER(CacheStorageHostMsg_CacheStorageMatch,
OnCacheStorageMatch)
IPC_MESSAGE_HANDLER(CacheStorageHostMsg_CacheMatch, OnCacheMatch) IPC_MESSAGE_HANDLER(CacheStorageHostMsg_CacheMatch, OnCacheMatch)
IPC_MESSAGE_HANDLER(CacheStorageHostMsg_CacheMatchAll, OnCacheMatchAll) IPC_MESSAGE_HANDLER(CacheStorageHostMsg_CacheMatchAll, OnCacheMatchAll)
IPC_MESSAGE_HANDLER(CacheStorageHostMsg_CacheKeys, OnCacheKeys) IPC_MESSAGE_HANDLER(CacheStorageHostMsg_CacheKeys, OnCacheKeys)
...@@ -104,76 +70,6 @@ bool CacheStorageListener::OnMessageReceived(const IPC::Message& message) { ...@@ -104,76 +70,6 @@ bool CacheStorageListener::OnMessageReceived(const IPC::Message& message) {
return handled; return handled;
} }
void CacheStorageListener::OnCacheStorageHas(int thread_id,
int request_id,
const GURL& origin,
const base::string16& cache_name) {
TRACE_EVENT0("CacheStorage", "CacheStorageListener::OnCacheStorageHas");
context_->cache_manager()->HasCache(
origin, base::UTF16ToUTF8(cache_name),
base::Bind(&CacheStorageListener::OnCacheStorageHasCallback,
weak_factory_.GetWeakPtr(), thread_id, request_id));
}
void CacheStorageListener::OnCacheStorageOpen(
int thread_id,
int request_id,
const GURL& origin,
const base::string16& cache_name) {
TRACE_EVENT0("CacheStorage", "CacheStorageListener::OnCacheStorageOpen");
context_->cache_manager()->OpenCache(
origin, base::UTF16ToUTF8(cache_name),
base::Bind(&CacheStorageListener::OnCacheStorageOpenCallback,
weak_factory_.GetWeakPtr(), thread_id, request_id));
}
void CacheStorageListener::OnCacheStorageDelete(
int thread_id,
int request_id,
const GURL& origin,
const base::string16& cache_name) {
TRACE_EVENT0("CacheStorage", "CacheStorageListener::OnCacheStorageDelete");
context_->cache_manager()->DeleteCache(
origin, base::UTF16ToUTF8(cache_name),
base::Bind(&CacheStorageListener::OnCacheStorageDeleteCallback,
weak_factory_.GetWeakPtr(), thread_id, request_id));
}
void CacheStorageListener::OnCacheStorageKeys(int thread_id,
int request_id,
const GURL& origin) {
TRACE_EVENT0("CacheStorage", "CacheStorageListener::OnCacheStorageKeys");
context_->cache_manager()->EnumerateCaches(
origin, base::Bind(&CacheStorageListener::OnCacheStorageKeysCallback,
weak_factory_.GetWeakPtr(), thread_id, request_id));
}
void CacheStorageListener::OnCacheStorageMatch(
int thread_id,
int request_id,
const GURL& origin,
const ServiceWorkerFetchRequest& request,
const CacheStorageCacheQueryParams& match_params) {
TRACE_EVENT0("CacheStorage", "CacheStorageListener::OnCacheStorageMatch");
scoped_ptr<ServiceWorkerFetchRequest> scoped_request(
new ServiceWorkerFetchRequest(request.url, request.method,
request.headers, request.referrer,
request.is_reload));
if (match_params.cache_name.empty()) {
context_->cache_manager()->MatchAllCaches(
origin, scoped_request.Pass(),
base::Bind(&CacheStorageListener::OnCacheStorageMatchCallback,
weak_factory_.GetWeakPtr(), thread_id, request_id));
return;
}
context_->cache_manager()->MatchCache(
origin, base::UTF16ToUTF8(match_params.cache_name), scoped_request.Pass(),
base::Bind(&CacheStorageListener::OnCacheStorageMatchCallback,
weak_factory_.GetWeakPtr(), thread_id, request_id));
}
void CacheStorageListener::OnCacheMatch( void CacheStorageListener::OnCacheMatch(
int thread_id, int thread_id,
int request_id, int request_id,
...@@ -297,90 +193,6 @@ void CacheStorageListener::Send(IPC::Message* message) { ...@@ -297,90 +193,6 @@ void CacheStorageListener::Send(IPC::Message* message) {
dispatcher_->Send(message); dispatcher_->Send(message);
} }
void CacheStorageListener::OnCacheStorageHasCallback(
int thread_id,
int request_id,
bool has_cache,
CacheStorage::CacheStorageError error) {
if (error != CacheStorage::CACHE_STORAGE_ERROR_NO_ERROR) {
Send(new CacheStorageMsg_CacheStorageHasError(
thread_id, request_id, ToWebServiceWorkerCacheError(error)));
return;
}
if (!has_cache) {
Send(new CacheStorageMsg_CacheStorageHasError(
thread_id, request_id, blink::WebServiceWorkerCacheErrorNotFound));
return;
}
Send(new CacheStorageMsg_CacheStorageHasSuccess(thread_id, request_id));
}
void CacheStorageListener::OnCacheStorageOpenCallback(
int thread_id,
int request_id,
const scoped_refptr<CacheStorageCache>& cache,
CacheStorage::CacheStorageError error) {
if (error != CacheStorage::CACHE_STORAGE_ERROR_NO_ERROR) {
Send(new CacheStorageMsg_CacheStorageOpenError(
thread_id, request_id, ToWebServiceWorkerCacheError(error)));
return;
}
CacheID cache_id = StoreCacheReference(cache);
Send(new CacheStorageMsg_CacheStorageOpenSuccess(thread_id, request_id,
cache_id));
}
void CacheStorageListener::OnCacheStorageDeleteCallback(
int thread_id,
int request_id,
bool deleted,
CacheStorage::CacheStorageError error) {
if (!deleted || error != CacheStorage::CACHE_STORAGE_ERROR_NO_ERROR) {
Send(new CacheStorageMsg_CacheStorageDeleteError(
thread_id, request_id, ToWebServiceWorkerCacheError(error)));
return;
}
Send(new CacheStorageMsg_CacheStorageDeleteSuccess(thread_id, request_id));
}
void CacheStorageListener::OnCacheStorageKeysCallback(
int thread_id,
int request_id,
const std::vector<std::string>& strings,
CacheStorage::CacheStorageError error) {
if (error != CacheStorage::CACHE_STORAGE_ERROR_NO_ERROR) {
Send(new CacheStorageMsg_CacheStorageKeysError(
thread_id, request_id, ToWebServiceWorkerCacheError(error)));
return;
}
std::vector<base::string16> string16s;
for (size_t i = 0, max = strings.size(); i < max; ++i) {
string16s.push_back(base::UTF8ToUTF16(strings[i]));
}
Send(new CacheStorageMsg_CacheStorageKeysSuccess(thread_id, request_id,
string16s));
}
void CacheStorageListener::OnCacheStorageMatchCallback(
int thread_id,
int request_id,
CacheStorageCache::ErrorType error,
scoped_ptr<ServiceWorkerResponse> response,
scoped_ptr<storage::BlobDataHandle> blob_data_handle) {
if (error != CacheStorageCache::ERROR_TYPE_OK) {
Send(new CacheStorageMsg_CacheStorageMatchError(
thread_id, request_id, CacheErrorToWebServiceWorkerCacheError(error)));
return;
}
if (blob_data_handle)
StoreBlobDataHandle(blob_data_handle.Pass());
Send(new CacheStorageMsg_CacheStorageMatchSuccess(thread_id, request_id,
*response));
}
void CacheStorageListener::OnCacheMatchCallback( void CacheStorageListener::OnCacheMatchCallback(
int thread_id, int thread_id,
int request_id, int request_id,
......
content/browser/cache_storage/cache_storage_listener.h
View file @ 34cbfce4
...@@ -32,26 +32,6 @@ class CacheStorageListener { ...@@ -32,26 +32,6 @@ class CacheStorageListener {
bool OnMessageReceived(const IPC::Message& message); bool OnMessageReceived(const IPC::Message& message);
private: private:
// The message receiver functions for the CacheStorage API:
void OnCacheStorageHas(int thread_id,
int request_id,
const GURL& origin,
const base::string16& cache_name);
void OnCacheStorageOpen(int thread_id,
int request_id,
const GURL& origin,
const base::string16& cache_name);
void OnCacheStorageDelete(int thread_id,
int request_id,
const GURL& origin,
const base::string16& cache_name);
void OnCacheStorageKeys(int thread_id, int request_id, const GURL& origin);
void OnCacheStorageMatch(int thread_id,
int request_id,
const GURL& origin,
const ServiceWorkerFetchRequest& request,
const CacheStorageCacheQueryParams& match_params);
// The message receiver functions for the Cache API: // The message receiver functions for the Cache API:
void OnCacheMatch(int thread_id, void OnCacheMatch(int thread_id,
int request_id, int request_id,
...@@ -76,6 +56,8 @@ class CacheStorageListener { ...@@ -76,6 +56,8 @@ class CacheStorageListener {
void OnBlobDataHandled(const std::string& uuid); void OnBlobDataHandled(const std::string& uuid);
private: private:
friend class CacheStorageDispatcherHost;
typedef int32_t CacheID; // TODO(jkarlin): Bump to 64 bit. typedef int32_t CacheID; // TODO(jkarlin): Bump to 64 bit.
typedef std::map<CacheID, scoped_refptr<CacheStorageCache>> IDToCacheMap; typedef std::map<CacheID, scoped_refptr<CacheStorageCache>> IDToCacheMap;
typedef std::map<std::string, std::list<storage::BlobDataHandle>> typedef std::map<std::string, std::list<storage::BlobDataHandle>>
...@@ -83,30 +65,6 @@ class CacheStorageListener { ...@@ -83,30 +65,6 @@ class CacheStorageListener {
void Send(IPC::Message* message); void Send(IPC::Message* message);
// CacheStorageManager callbacks
void OnCacheStorageHasCallback(int thread_id,
int request_id,
bool has_cache,
CacheStorage::CacheStorageError error);
void OnCacheStorageOpenCallback(int thread_id,
int request_id,
const scoped_refptr<CacheStorageCache>& cache,
CacheStorage::CacheStorageError error);
void OnCacheStorageDeleteCallback(int thread_id,
int request_id,
bool deleted,
CacheStorage::CacheStorageError error);
void OnCacheStorageKeysCallback(int thread_id,
int request_id,
const std::vector<std::string>& strings,
CacheStorage::CacheStorageError error);
void OnCacheStorageMatchCallback(
int thread_id,
int request_id,
CacheStorageCache::ErrorType error,
scoped_ptr<ServiceWorkerResponse> response,
scoped_ptr<storage::BlobDataHandle> blob_data_handle);
// Cache callbacks // Cache callbacks
void OnCacheMatchCallback( void OnCacheMatchCallback(
int thread_id, int thread_id,
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment