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

Unified Diff: ppapi/shared_impl/private/ppb_font_shared.h

Issue 9391013: Make a global enum to differentiate impl & proxy. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 8 years, 10 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/shared_impl/private/ppb_font_shared.h
diff --git a/ppapi/shared_impl/private/ppb_font_shared.h b/ppapi/shared_impl/private/ppb_font_shared.h
index ec34215de8a4200c21488d3365dacb92016923c4..8e5bebb4785809873bf17b6d25c7a3d9d6157b59 100644
--- a/ppapi/shared_impl/private/ppb_font_shared.h
+++ b/ppapi/shared_impl/private/ppb_font_shared.h
@@ -33,12 +33,10 @@ class PPAPI_SHARED_EXPORT PPB_Font_Shared
virtual ~PPB_Font_Shared();
- static PP_Resource CreateAsImpl(PP_Instance instance,
- const PP_FontDescription_Dev& description,
- const ::ppapi::Preferences& prefs);
- static PP_Resource CreateAsProxy(PP_Instance instance,
- const PP_FontDescription_Dev& description,
- const ::ppapi::Preferences& prefs);
+ static PP_Resource Create(ResourceObjectType type,
+ PP_Instance instance,
+ const PP_FontDescription_Dev& description,
+ const ::ppapi::Preferences& prefs);
// Resource.
virtual ::ppapi::thunk::PPB_Font_API* AsPPB_Font_API() OVERRIDE;
@@ -59,23 +57,11 @@ class PPAPI_SHARED_EXPORT PPB_Font_Shared
uint32_t char_offset) OVERRIDE;
private:
- struct InitAsImpl {};
- struct InitAsProxy {};
-
- // The dummy arguments control which version of Resource's constructor is
- // called for this base class.
- PPB_Font_Shared(const InitAsImpl&,
- PP_Instance instance,
- const PP_FontDescription_Dev& desc,
- const ::ppapi::Preferences& prefs);
- PPB_Font_Shared(const InitAsProxy&,
+ PPB_Font_Shared(ResourceObjectType type,
PP_Instance instance,
const PP_FontDescription_Dev& desc,
const ::ppapi::Preferences& prefs);
- void Initialize(const PP_FontDescription_Dev& desc,
- const ::ppapi::Preferences& prefs);
-
scoped_ptr< ::ppapi::WebKitForwarding::Font> font_impl_;
DISALLOW_COPY_AND_ASSIGN(PPB_Font_Shared);

Powered by Google App Engine
This is Rietveld 408576698