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

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

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.cc
diff --git a/ppapi/shared_impl/private/ppb_font_shared.cc b/ppapi/shared_impl/private/ppb_font_shared.cc
index 3b4f04b98103ff84f859890c2919e1a29c56e0f1..391808862fe7581ff9b1d48f6e2cc2bdbe06657f 100644
--- a/ppapi/shared_impl/private/ppb_font_shared.cc
+++ b/ppapi/shared_impl/private/ppb_font_shared.cc
@@ -302,41 +302,24 @@ bool PPB_Font_Shared::IsPPFontDescriptionValid(
}
// static
-PP_Resource PPB_Font_Shared::CreateAsImpl(
- PP_Instance instance,
- const PP_FontDescription_Dev& description,
- const ::ppapi::Preferences& prefs) {
+PP_Resource PPB_Font_Shared::Create(ResourceObjectType type,
+ PP_Instance instance,
+ const PP_FontDescription_Dev& description,
+ const ::ppapi::Preferences& prefs) {
if (!::ppapi::PPB_Font_Shared::IsPPFontDescriptionValid(description))
return 0;
- return (new PPB_Font_Shared(InitAsImpl(), instance, description,
+ return (new PPB_Font_Shared(type, instance, description,
prefs))->GetReference();
}
-// static
-PP_Resource PPB_Font_Shared::CreateAsProxy(
- PP_Instance instance,
- const PP_FontDescription_Dev& description,
- const ::ppapi::Preferences& prefs) {
- if (!::ppapi::PPB_Font_Shared::IsPPFontDescriptionValid(description))
- return 0;
- return (new PPB_Font_Shared(InitAsProxy(), instance, description,
- prefs))->GetReference();
-}
-
-PPB_Font_Shared::PPB_Font_Shared(const InitAsImpl&,
- PP_Instance pp_instance,
- const PP_FontDescription_Dev& desc,
- const ::ppapi::Preferences& prefs)
- : Resource(pp_instance) {
- Initialize(desc, prefs);
-}
-
-PPB_Font_Shared::PPB_Font_Shared(const InitAsProxy&,
- PP_Instance pp_instance,
+PPB_Font_Shared::PPB_Font_Shared(ResourceObjectType type,
+ PP_Instance instance,
const PP_FontDescription_Dev& desc,
const ::ppapi::Preferences& prefs)
- : Resource(HostResource::MakeInstanceOnly(pp_instance)) {
- Initialize(desc, prefs);
+ : Resource(type, instance) {
+ StringVar* face_name = StringVar::FromPPVar(desc.face);
+ font_impl_.reset(new FontImpl(
+ desc, face_name ? face_name->value() : std::string(), prefs));
}
PPB_Font_Shared::~PPB_Font_Shared() {
@@ -425,13 +408,5 @@ int32_t PPB_Font_Shared::PixelOffsetForCharacter(const PP_TextRun_Dev* text,
return result;
}
-void PPB_Font_Shared::Initialize(const PP_FontDescription_Dev& desc,
- const ::ppapi::Preferences& prefs) {
- StringVar* face_name = StringVar::FromPPVar(desc.face);
-
- font_impl_.reset(new FontImpl(
- desc, face_name ? face_name->value() : std::string(), prefs));
-}
-
} // namespace ppapi

Powered by Google App Engine
This is Rietveld 408576698