diff options
| author | neb@chromium.org <neb@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-12-15 20:52:45 +0000 |
|---|---|---|
| committer | neb@chromium.org <neb@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-12-15 20:52:45 +0000 |
| commit | 22611c632574687325aa2ebeea896594fb83fbc3 (patch) | |
| tree | 96371512316efd1b73a8ed3b0291fbc314f1ea6e /webkit/glue/plugins | |
| parent | ed875647795b7886bb90d2e289492df1c7da1cec (diff) | |
| download | chromium_src-22611c632574687325aa2ebeea896594fb83fbc3.zip chromium_src-22611c632574687325aa2ebeea896594fb83fbc3.tar.gz chromium_src-22611c632574687325aa2ebeea896594fb83fbc3.tar.bz2 | |
Resource width 64->32 change.
Mostly done by bbudge.
BUG=none
TEST=ppapi_include_tests.py
Review URL: http://codereview.chromium.org/5837001
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@69309 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit/glue/plugins')
| -rw-r--r-- | webkit/glue/plugins/pepper_var.cc | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/webkit/glue/plugins/pepper_var.cc b/webkit/glue/plugins/pepper_var.cc index 24fa2c3..c9c354c 100644 --- a/webkit/glue/plugins/pepper_var.cc +++ b/webkit/glue/plugins/pepper_var.cc @@ -714,7 +714,8 @@ void Var::PluginAddRefPPVar(PP_Var var) { if (var.type == PP_VARTYPE_STRING || var.type == PP_VARTYPE_OBJECT) { // TODO(brettw) consider checking that the ID is actually a var ID rather // than some random other resource ID. - if (!ResourceTracker::Get()->AddRefResource(var.value.as_id)) + PP_Resource resource = static_cast<PP_Resource>(var.value.as_id); + if (!ResourceTracker::Get()->AddRefResource(resource)) DLOG(WARNING) << "AddRefVar()ing a nonexistant string/object var."; } } @@ -724,7 +725,8 @@ void Var::PluginReleasePPVar(PP_Var var) { if (var.type == PP_VARTYPE_STRING || var.type == PP_VARTYPE_OBJECT) { // TODO(brettw) consider checking that the ID is actually a var ID rather // than some random other resource ID. - if (!ResourceTracker::Get()->UnrefResource(var.value.as_id)) + PP_Resource resource = static_cast<PP_Resource>(var.value.as_id); + if (!ResourceTracker::Get()->UnrefResource(resource)) DLOG(WARNING) << "ReleaseVar()ing a nonexistant string/object var."; } } @@ -776,7 +778,8 @@ PP_Var StringVar::StringToPPVar(PluginModule* module, scoped_refptr<StringVar> StringVar::FromPPVar(PP_Var var) { if (var.type != PP_VARTYPE_STRING) return scoped_refptr<StringVar>(NULL); - return Resource::GetAs<StringVar>(var.value.as_id); + PP_Resource resource = static_cast<PP_Resource>(var.value.as_id); + return Resource::GetAs<StringVar>(resource); } // ObjectVar ------------------------------------------------------------- @@ -817,7 +820,8 @@ PP_Var ObjectVar::NPObjectToPPVar(PluginModule* module, NPObject* object) { scoped_refptr<ObjectVar> ObjectVar::FromPPVar(PP_Var var) { if (var.type != PP_VARTYPE_OBJECT) return scoped_refptr<ObjectVar>(NULL); - return Resource::GetAs<ObjectVar>(var.value.as_id); + PP_Resource resource = static_cast<PP_Resource>(var.value.as_id); + return Resource::GetAs<ObjectVar>(resource); } // TryCatch -------------------------------------------------------------------- |