| Index: content/child/resource_dispatcher.h
|
| diff --git a/content/child/resource_dispatcher.h b/content/child/resource_dispatcher.h
|
| index 5aabbd4e91880d1c35a25252f5b8c093fe1c2522..c82f7c810b42790eb85a69f16ff426aa8dee0bca 100644
|
| --- a/content/child/resource_dispatcher.h
|
| +++ b/content/child/resource_dispatcher.h
|
| @@ -8,12 +8,14 @@
|
| #define CONTENT_CHILD_RESOURCE_DISPATCHER_H_
|
|
|
| #include <deque>
|
| +#include <set>
|
| #include <string>
|
|
|
| #include "base/containers/hash_tables.h"
|
| #include "base/memory/linked_ptr.h"
|
| #include "base/memory/shared_memory.h"
|
| #include "base/memory/weak_ptr.h"
|
| +#include "base/synchronization/lock.h"
|
| #include "base/time/time.h"
|
| #include "content/common/content_export.h"
|
| #include "ipc/ipc_listener.h"
|
| @@ -67,6 +69,8 @@ class CONTENT_EXPORT ResourceDispatcher : public IPC::Listener {
|
| // Cancels a request in the pending_requests_ list.
|
| void CancelPendingRequest(int request_id);
|
|
|
| + bool IsPendingRequestFontType(const IPC::Message& message);
|
| +
|
| IPC::Sender* message_sender() const {
|
| return message_sender_;
|
| }
|
| @@ -205,6 +209,7 @@ class CONTENT_EXPORT ResourceDispatcher : public IPC::Listener {
|
|
|
| // All pending requests issued to the host
|
| PendingRequestList pending_requests_;
|
| + std::set<int> font_requests_;
|
|
|
| base::WeakPtrFactory<ResourceDispatcher> weak_factory_;
|
|
|
| @@ -212,6 +217,7 @@ class CONTENT_EXPORT ResourceDispatcher : public IPC::Listener {
|
|
|
| // IO thread timestamp for ongoing IPC message.
|
| base::TimeTicks io_timestamp_;
|
| + base::Lock font_lock_;
|
|
|
| DISALLOW_COPY_AND_ASSIGN(ResourceDispatcher);
|
| };
|
|
|