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

Unified Diff: ppapi/proxy/ppb_font_proxy.h

Issue 7629017: Add a unified resource tracker shared between the proxy and the impl. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Assertion fixed Created 9 years, 4 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/ppb_font_proxy.h
diff --git a/ppapi/proxy/ppb_font_proxy.h b/ppapi/proxy/ppb_font_proxy.h
index 8058fdf22e988b01b9407609c9fe8b297c60b0ba..67041c35ab441b20356256bd33eb62bbc42ce484 100644
--- a/ppapi/proxy/ppb_font_proxy.h
+++ b/ppapi/proxy/ppb_font_proxy.h
@@ -6,10 +6,14 @@
#define PPAPI_PROXY_PPB_FONT_PROXY_H_
#include "base/basictypes.h"
+#include "base/callback.h"
+#include "base/memory/ref_counted.h"
+#include "base/scoped_ptr.h"
dmichael (off chromium) 2011/08/17 16:28:07 These 3 look a little out-of-place here. Are these
#include "base/synchronization/waitable_event.h"
#include "ppapi/proxy/interface_proxy.h"
-#include "ppapi/proxy/plugin_resource.h"
+#include "ppapi/shared_impl/function_group_base.h"
#include "ppapi/shared_impl/host_resource.h"
+#include "ppapi/shared_impl/resource.h"
#include "ppapi/shared_impl/webkit_forwarding.h"
#include "ppapi/thunk/ppb_font_api.h"
@@ -42,7 +46,7 @@ class PPB_Font_Proxy : public ppapi::FunctionGroupBase,
DISALLOW_COPY_AND_ASSIGN(PPB_Font_Proxy);
};
-class Font : public PluginResource,
+class Font : public ppapi::Resource,
public ppapi::thunk::PPB_Font_API {
public:
// Note that there isn't a "real" resource in the renderer backing a font,
@@ -53,7 +57,7 @@ class Font : public PluginResource,
Font(const ppapi::HostResource& resource, const PP_FontDescription_Dev& desc);
virtual ~Font();
- // ResourceObjectBase.
+ // Resource.
virtual ppapi::thunk::PPB_Font_API* AsPPB_Font_API() OVERRIDE;
// PPB_Font_API implementation.

Powered by Google App Engine
This is Rietveld 408576698