diff options
author | jln@chromium.org <jln@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-02-14 02:06:52 +0000 |
---|---|---|
committer | jln@chromium.org <jln@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-02-14 02:06:52 +0000 |
commit | 20553490d852f32afb52e56dd68a8b9ca8ab2d6f (patch) | |
tree | 1c9736fc04975b81fd538cdde3dee942bc9f4fd5 /content/browser/renderer_host/pepper | |
parent | 684003e2fb896d674c4202edeae9219b7ea167be (diff) | |
download | chromium_src-20553490d852f32afb52e56dd68a8b9ca8ab2d6f.zip chromium_src-20553490d852f32afb52e56dd68a8b9ca8ab2d6f.tar.gz chromium_src-20553490d852f32afb52e56dd68a8b9ca8ab2d6f.tar.bz2 |
Do a giant svn propset svn:eol-style LF on .cc and .h files that
lack this property.
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@182368 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'content/browser/renderer_host/pepper')
-rw-r--r-- | content/browser/renderer_host/pepper/pepper_browser_font_singleton_host.cc | 216 | ||||
-rw-r--r-- | content/browser/renderer_host/pepper/pepper_browser_font_singleton_host.h | 56 |
2 files changed, 136 insertions, 136 deletions
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 7950725..02ae2a8 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 @@ -1,108 +1,108 @@ -// Copyright (c) 2012 The Chromium Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-#include "content/browser/renderer_host/pepper/pepper_browser_font_singleton_host.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"
-
-namespace content {
-
-namespace {
-
-// Handles the font list request on the blocking pool.
-class FontMessageFilter : public ppapi::host::ResourceMessageFilter {
- public:
- FontMessageFilter();
-
- // ppapi::host::ResourceMessageFilter implementation.
- virtual scoped_refptr<base::TaskRunner> OverrideTaskRunnerForMessage(
- const IPC::Message& msg) OVERRIDE;
- virtual int32_t OnResourceMessageReceived(
- const IPC::Message& msg,
- ppapi::host::HostMessageContext* context) OVERRIDE;
-
- private:
- virtual ~FontMessageFilter();
-
- // Message handler.
- int32_t OnHostMsgGetFontFamilies(ppapi::host::HostMessageContext* context);
-
- DISALLOW_COPY_AND_ASSIGN(FontMessageFilter);
-};
-
-FontMessageFilter::FontMessageFilter() {
-}
-
-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
- // so we can always just return it).
- return scoped_refptr<base::TaskRunner>(BrowserThread::GetBlockingPool());
-}
-
-int32_t FontMessageFilter::OnResourceMessageReceived(
- const IPC::Message& msg,
- ppapi::host::HostMessageContext* context) {
- IPC_BEGIN_MESSAGE_MAP(FontMessageFilter, msg)
- PPAPI_DISPATCH_HOST_RESOURCE_CALL_0(
- PpapiHostMsg_BrowserFontSingleton_GetFontFamilies,
- OnHostMsgGetFontFamilies)
- IPC_END_MESSAGE_MAP()
- return PP_ERROR_FAILED;
-}
-
-int32_t FontMessageFilter::OnHostMsgGetFontFamilies(
- ppapi::host::HostMessageContext* context) {
- // OK to use "slow blocking" version since we're on the blocking pool.
- scoped_ptr<base::ListValue> list(GetFontList_SlowBlocking());
-
- std::string output;
- for (size_t i = 0; i < list->GetSize(); i++) {
- base::ListValue* cur_font;
- if (!list->GetList(i, &cur_font))
- continue;
-
- // Each entry is actually a list of (font name, localized name).
- // We only care about the regular name.
- std::string font_name;
- if (!cur_font->GetString(0, &font_name))
- continue;
-
- // Font names are separated with nulls. We also want an explicit null at
- // the end of the string (Pepper strings aren't null terminated so since
- // we specify there will be a null, it should actually be in the string).
- output.append(font_name);
- output.push_back(0);
- }
-
- context->reply_msg =
- PpapiPluginMsg_BrowserFontSingleton_GetFontFamiliesReply(output);
- return PP_OK;
-}
-
-} // namespace
-
-PepperBrowserFontSingletonHost::PepperBrowserFontSingletonHost(
- BrowserPpapiHost* host,
- PP_Instance instance,
- PP_Resource resource)
- : ResourceHost(host->GetPpapiHost(), instance, resource) {
- AddFilter(scoped_refptr<ppapi::host::ResourceMessageFilter>(
- new FontMessageFilter()));
-}
-
-PepperBrowserFontSingletonHost::~PepperBrowserFontSingletonHost() {
-}
-
-} // namespace content
+// Copyright (c) 2012 The Chromium Authors. All rights reserved. +// Use of this source code is governed by a BSD-style license that can be +// found in the LICENSE file. + +#include "content/browser/renderer_host/pepper/pepper_browser_font_singleton_host.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" + +namespace content { + +namespace { + +// Handles the font list request on the blocking pool. +class FontMessageFilter : public ppapi::host::ResourceMessageFilter { + public: + FontMessageFilter(); + + // ppapi::host::ResourceMessageFilter implementation. + virtual scoped_refptr<base::TaskRunner> OverrideTaskRunnerForMessage( + const IPC::Message& msg) OVERRIDE; + virtual int32_t OnResourceMessageReceived( + const IPC::Message& msg, + ppapi::host::HostMessageContext* context) OVERRIDE; + + private: + virtual ~FontMessageFilter(); + + // Message handler. + int32_t OnHostMsgGetFontFamilies(ppapi::host::HostMessageContext* context); + + DISALLOW_COPY_AND_ASSIGN(FontMessageFilter); +}; + +FontMessageFilter::FontMessageFilter() { +} + +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 + // so we can always just return it). + return scoped_refptr<base::TaskRunner>(BrowserThread::GetBlockingPool()); +} + +int32_t FontMessageFilter::OnResourceMessageReceived( + const IPC::Message& msg, + ppapi::host::HostMessageContext* context) { + IPC_BEGIN_MESSAGE_MAP(FontMessageFilter, msg) + PPAPI_DISPATCH_HOST_RESOURCE_CALL_0( + PpapiHostMsg_BrowserFontSingleton_GetFontFamilies, + OnHostMsgGetFontFamilies) + IPC_END_MESSAGE_MAP() + return PP_ERROR_FAILED; +} + +int32_t FontMessageFilter::OnHostMsgGetFontFamilies( + ppapi::host::HostMessageContext* context) { + // OK to use "slow blocking" version since we're on the blocking pool. + scoped_ptr<base::ListValue> list(GetFontList_SlowBlocking()); + + std::string output; + for (size_t i = 0; i < list->GetSize(); i++) { + base::ListValue* cur_font; + if (!list->GetList(i, &cur_font)) + continue; + + // Each entry is actually a list of (font name, localized name). + // We only care about the regular name. + std::string font_name; + if (!cur_font->GetString(0, &font_name)) + continue; + + // Font names are separated with nulls. We also want an explicit null at + // the end of the string (Pepper strings aren't null terminated so since + // we specify there will be a null, it should actually be in the string). + output.append(font_name); + output.push_back(0); + } + + context->reply_msg = + PpapiPluginMsg_BrowserFontSingleton_GetFontFamiliesReply(output); + return PP_OK; +} + +} // namespace + +PepperBrowserFontSingletonHost::PepperBrowserFontSingletonHost( + BrowserPpapiHost* host, + PP_Instance instance, + PP_Resource resource) + : ResourceHost(host->GetPpapiHost(), instance, resource) { + AddFilter(scoped_refptr<ppapi::host::ResourceMessageFilter>( + new FontMessageFilter())); +} + +PepperBrowserFontSingletonHost::~PepperBrowserFontSingletonHost() { +} + +} // namespace content diff --git a/content/browser/renderer_host/pepper/pepper_browser_font_singleton_host.h b/content/browser/renderer_host/pepper/pepper_browser_font_singleton_host.h index ad562c1..c002e63 100644 --- a/content/browser/renderer_host/pepper/pepper_browser_font_singleton_host.h +++ b/content/browser/renderer_host/pepper/pepper_browser_font_singleton_host.h @@ -1,28 +1,28 @@ -// Copyright (c) 2012 The Chromium Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-#ifndef CONTENT_BROWSER_RENDERER_HOST_PEPPER_PEPPER_BROWSER_FONT_SINGLETON_HOST_H_
-#define CONTENT_BROWSER_RENDERER_HOST_PEPPER_PEPPER_BROWSER_FONT_SINGLETON_HOST_H_
-
-#include "base/basictypes.h"
-#include "ppapi/host/resource_host.h"
-
-namespace content {
-
-class BrowserPpapiHost;
-
-class PepperBrowserFontSingletonHost : public ppapi::host::ResourceHost {
- public:
- PepperBrowserFontSingletonHost(BrowserPpapiHost* host,
- PP_Instance instance,
- PP_Resource resource);
- virtual ~PepperBrowserFontSingletonHost();
-
- private:
- DISALLOW_COPY_AND_ASSIGN(PepperBrowserFontSingletonHost);
-};
-
-} // namespace content
-
-#endif // CONTENT_BROWSER_RENDERER_HOST_PEPPER_PEPPER_BROWSER_FONT_SINGLETON_HOST_H_
+// Copyright (c) 2012 The Chromium Authors. All rights reserved. +// Use of this source code is governed by a BSD-style license that can be +// found in the LICENSE file. + +#ifndef CONTENT_BROWSER_RENDERER_HOST_PEPPER_PEPPER_BROWSER_FONT_SINGLETON_HOST_H_ +#define CONTENT_BROWSER_RENDERER_HOST_PEPPER_PEPPER_BROWSER_FONT_SINGLETON_HOST_H_ + +#include "base/basictypes.h" +#include "ppapi/host/resource_host.h" + +namespace content { + +class BrowserPpapiHost; + +class PepperBrowserFontSingletonHost : public ppapi::host::ResourceHost { + public: + PepperBrowserFontSingletonHost(BrowserPpapiHost* host, + PP_Instance instance, + PP_Resource resource); + virtual ~PepperBrowserFontSingletonHost(); + + private: + DISALLOW_COPY_AND_ASSIGN(PepperBrowserFontSingletonHost); +}; + +} // namespace content + +#endif // CONTENT_BROWSER_RENDERER_HOST_PEPPER_PEPPER_BROWSER_FONT_SINGLETON_HOST_H_ |