Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(180)

Unified Diff: ppapi/proxy/truetype_font_resource.h

Issue 337203003: Move PPB_TrueTypeFont_Dev host from renderer to browser. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Add scopers, fix builds. Created 6 years, 6 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: ppapi/proxy/truetype_font_resource.h
diff --git a/ppapi/proxy/truetype_font_resource.h b/ppapi/proxy/truetype_font_resource.h
index 6aac2d569e2ffc85bcd246156c84e5611ae142aa..9217e418cae6034f602966d021c63cf109c9d23d 100644
--- a/ppapi/proxy/truetype_font_resource.h
+++ b/ppapi/proxy/truetype_font_resource.h
@@ -5,11 +5,13 @@
#ifndef PPAPI_PROXY_TRUETYPE_FONT_RESOURCE_H_
#define PPAPI_PROXY_TRUETYPE_FONT_RESOURCE_H_
+#include <queue>
#include <string>
#include "ppapi/proxy/connection.h"
#include "ppapi/proxy/plugin_resource.h"
#include "ppapi/proxy/ppapi_proxy_export.h"
+#include "ppapi/proxy/serialized_structs.h"
#include "ppapi/shared_impl/var.h"
#include "ppapi/thunk/ppb_truetype_font_api.h"
@@ -30,7 +32,7 @@ class PPAPI_PROXY_EXPORT TrueTypeFontResource
const PP_TrueTypeFontDesc_Dev& desc);
virtual ~TrueTypeFontResource();
- // Resource overrides.
+ // Resource implementation.
virtual thunk::PPB_TrueTypeFont_API* AsPPB_TrueTypeFont_API() OVERRIDE;
// PPB_TrueTypeFont_API implementation.
@@ -47,12 +49,41 @@ class PPAPI_PROXY_EXPORT TrueTypeFontResource
const PP_ArrayOutput& output,
scoped_refptr<TrackedCallback> callback) OVERRIDE;
+ // PluginResource implementation.
+ virtual void OnReplyReceived(const ResourceMessageReplyParams& params,
+ const IPC::Message& msg) OVERRIDE;
+
private:
- void OnPluginMsgDescribeComplete(
- scoped_refptr<TrackedCallback> callback,
- PP_TrueTypeFontDesc_Dev* pp_desc,
+ // If the call to PepperTrueTypeFont::Create hasn't completed, we queue up
+ // messages to replay later.
+ struct FontOp {
+ enum Type { DESCRIBE, GET_TABLE_TAGS, GET_TABLE };
+
+ FontOp(PP_TrueTypeFontDesc_Dev* desc,
+ scoped_refptr<TrackedCallback> callback);
+ FontOp(const PP_ArrayOutput& output,
+ scoped_refptr<TrackedCallback> callback);
+ FontOp(uint32_t table,
+ int32_t offset,
+ int32_t max_data_length,
+ const PP_ArrayOutput& output,
+ scoped_refptr<TrackedCallback> callback);
+ ~FontOp();
+
+ Type type;
+ scoped_refptr<TrackedCallback> callback;
+
+ PP_TrueTypeFontDesc_Dev* desc;
+ PP_ArrayOutput output;
+ uint32_t table;
+ int32_t offset;
+ int32_t max_data_length;
+ };
+
+ void OnPluginMsgCreateComplete(
const ResourceMessageReplyParams& params,
- const ppapi::proxy::SerializedTrueTypeFontDesc& desc);
+ const ppapi::proxy::SerializedTrueTypeFontDesc& desc,
+ int32_t result);
void OnPluginMsgGetTableTagsComplete(
scoped_refptr<TrackedCallback> callback,
PP_ArrayOutput array_output,
@@ -64,6 +95,15 @@ class PPAPI_PROXY_EXPORT TrueTypeFontResource
const ResourceMessageReplyParams& params,
const std::string& data);
+ void RunFontOp(const FontOp& op);
+
+ int32_t create_result_;
+ // Valid only when create_result_ == PP_OK.
+ ppapi::proxy::SerializedTrueTypeFontDesc desc_;
+
+ // Queue font operations until creation has completed.
+ std::queue<FontOp> pending_font_ops_;
+
DISALLOW_COPY_AND_ASSIGN(TrueTypeFontResource);
};

Powered by Google App Engine
This is Rietveld 408576698