Chromium Code Reviews| Index: content/browser/renderer_host/pepper/pepper_truetype_font_host.h |
| diff --git a/content/renderer/pepper/pepper_truetype_font_host.h b/content/browser/renderer_host/pepper/pepper_truetype_font_host.h |
| similarity index 53% |
| rename from content/renderer/pepper/pepper_truetype_font_host.h |
| rename to content/browser/renderer_host/pepper/pepper_truetype_font_host.h |
| index 27ff397222b56935a5a66b9f6c91790dcad353b3..571e8306f2391f0b5b5fbf2eca6219344a01986a 100644 |
| --- a/content/renderer/pepper/pepper_truetype_font_host.h |
| +++ b/content/browser/renderer_host/pepper/pepper_truetype_font_host.h |
| @@ -2,23 +2,27 @@ |
| // Use of this source code is governed by a BSD-style license that can be |
| // found in the LICENSE file. |
| -#ifndef CONTENT_RENDERER_PEPPER_PEPPER_TRUETYPE_FONT_HOST_H_ |
| -#define CONTENT_RENDERER_PEPPER_PEPPER_TRUETYPE_FONT_HOST_H_ |
| +#ifndef CONTENT_BROWSER_RENDERER_HOST_PEPPER_PEPPER_TRUETYPE_FONT_HOST_H_ |
| +#define CONTENT_BROWSER_RENDERER_HOST_PEPPER_PEPPER_TRUETYPE_FONT_HOST_H_ |
| + |
| +#include <string> |
| +#include <vector> |
| #include "base/compiler_specific.h" |
| #include "base/memory/scoped_ptr.h" |
| #include "base/memory/weak_ptr.h" |
| +#include "content/browser/renderer_host/pepper/pepper_truetype_font.h" |
| #include "content/common/content_export.h" |
| -#include "content/renderer/pepper/pepper_truetype_font.h" |
| +#include "ppapi/host/host_message_context.h" |
| #include "ppapi/host/resource_host.h" |
| namespace content { |
| -class RendererPpapiHost; |
| +class BrowserPpapiHost; |
| class CONTENT_EXPORT PepperTrueTypeFontHost : public ppapi::host::ResourceHost { |
| public: |
| - PepperTrueTypeFontHost(RendererPpapiHost* host, |
| + PepperTrueTypeFontHost(BrowserPpapiHost* host, |
| PP_Instance instance, |
| PP_Resource resource, |
| const ppapi::proxy::SerializedTrueTypeFontDesc& desc); |
| @@ -37,8 +41,19 @@ class CONTENT_EXPORT PepperTrueTypeFontHost : public ppapi::host::ResourceHost { |
| int32_t offset, |
| int32_t max_data_length); |
| - RendererPpapiHost* renderer_ppapi_host_; |
| - scoped_ptr<PepperTrueTypeFont> font_; |
| + void OnDescribeComplete(ppapi::proxy::SerializedTrueTypeFontDesc* desc, |
| + ppapi::host::ReplyMessageContext reply_context, |
| + int32_t result); |
| + void OnGetTableTagsComplete(std::vector<uint32_t>* tags, |
| + ppapi::host::ReplyMessageContext reply_context, |
| + int32_t result); |
| + void OnGetTableComplete(std::string* data, |
| + ppapi::host::ReplyMessageContext reply_context, |
| + int32_t result); |
| + |
| + BrowserPpapiHost* browser_ppapi_host_; |
|
teravest
2014/06/20 15:22:45
I don't see this member used anywhere. I think you
bbudge
2014/06/21 14:12:50
Done.
|
| + // This is created on the main thread and used on a blocking pool thread. |
| + scoped_refptr<PepperTrueTypeFont> font_; |
| base::WeakPtrFactory<PepperTrueTypeFontHost> weak_factory_; |
| @@ -47,4 +62,4 @@ class CONTENT_EXPORT PepperTrueTypeFontHost : public ppapi::host::ResourceHost { |
| } // namespace content |
| -#endif // CONTENT_RENDERER_PEPPER_PEPPER_TRUETYPE_FONT_HOST_H_ |
| +#endif // CONTENT_BROWSER_RENDERER_HOST_PEPPER_PEPPER_TRUETYPE_FONT_HOST_H_ |