| Index: content/browser/renderer_host/pepper/pepper_browser_font_singleton_host.cc
|
| diff --git a/content/browser/renderer_host/pepper/pepper_browser_font_singleton_host.cc b/content/browser/renderer_host/pepper/pepper_browser_font_singleton_host.cc
|
| index 4cbaa799ebabb1d856f3017ba8e1aaf728752379..ae32b88e7c498acafdfe3398a256a3296529b7d8 100644
|
| --- a/content/browser/renderer_host/pepper/pepper_browser_font_singleton_host.cc
|
| +++ b/content/browser/renderer_host/pepper/pepper_browser_font_singleton_host.cc
|
| @@ -8,11 +8,9 @@
|
| #include <stdint.h>
|
|
|
| #include "base/macros.h"
|
| -#include "base/threading/sequenced_worker_pool.h"
|
| #include "base/values.h"
|
| #include "content/common/font_list.h"
|
| #include "content/public/browser/browser_ppapi_host.h"
|
| -#include "content/public/browser/browser_thread.h"
|
| #include "ppapi/host/dispatch_host_message.h"
|
| #include "ppapi/host/resource_message_filter.h"
|
| #include "ppapi/proxy/ppapi_messages.h"
|
| @@ -48,12 +46,10 @@ FontMessageFilter::~FontMessageFilter() {}
|
|
|
| scoped_refptr<base::TaskRunner> FontMessageFilter::OverrideTaskRunnerForMessage(
|
| const IPC::Message& msg) {
|
| - // Use the blocking pool to get the font list (currently the only message)
|
| - // Since getting the font list is non-threadsafe on Linux (for versions of
|
| - // Pango predating 2013), use a sequenced task runner.
|
| - base::SequencedWorkerPool* pool = BrowserThread::GetBlockingPool();
|
| - return pool->GetSequencedTaskRunner(
|
| - pool->GetNamedSequenceToken(kFontListSequenceToken));
|
| + // Use the font list SequencedTaskRunner to get the font list (currently the
|
| + // only message) since getting the font list is non-threadsafe on Linux (for
|
| + // versions of Pango predating 2013).
|
| + return GetFontListTaskRunner();
|
| }
|
|
|
| int32_t FontMessageFilter::OnResourceMessageReceived(
|
|
|