Resource width 64->32 change.

webkit/glue/plugins/pepper_var.cc

 // Copyright (c) 2010 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "webkit/glue/plugins/pepper_var.h"
 
 #include <limits>
 
 #include "base/logging.h"
 #include "base/scoped_ptr.h"
@@ skipping 696 matching lines @@
     return StringVar::StringToPPVar(module, string_value);
 
   return PP_MakeInt32(int_value);
 }
 
 // static
 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.";
   }
 }
 
 // static
 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.";
   }
 }
 
 // static
 const PPB_Var_Deprecated* Var::GetDeprecatedInterface() {
   return &var_deprecated_interface;
 }
 
 const PPB_Var* Var::GetInterface() {
@@ skipping 31 matching lines @@
 
   // The caller takes ownership now.
   ret.value.as_id = str->GetReference();
   return ret;
 }
 
 // static
 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 -------------------------------------------------------------
 
 ObjectVar::ObjectVar(PluginModule* module, NPObject* np_object)
     : Var(module),
       np_object_(np_object) {
   WebBindings::retainObject(np_object_);
   module->AddNPObjectVar(this);
 }
@@ skipping 20 matching lines @@
   PP_Var result;
   result.type = PP_VARTYPE_OBJECT;
   result.value.as_id = object_var->GetReference();
   return result;
 }
 
 // static
 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 --------------------------------------------------------------------
 
 TryCatch::TryCatch(PluginModule* module, PP_Var* exception)
     : module_(module),
       has_exception_(exception && exception->type != PP_VARTYPE_UNDEFINED),
       exception_(exception) {
   WebBindings::pushExceptionHandler(&TryCatch::Catch, this);
 }
@@ skipping 25 matching lines @@
       *exception_ = PP_MakeInt32(1);
   }
 }
 
 // static
 void TryCatch::Catch(void* self, const char* message) {
   static_cast<TryCatch*>(self)->SetException(message);
 }
 
 }  // namespace pepper