[PPAPI] Moving pp::VarResource_Dev API into pp::Var (now stable).

ppapi/shared_impl/ppb_var_shared.cc

 // Copyright (c) 2012 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 "ppapi/shared_impl/ppb_var_shared.h"
 
 #include <limits>
 
 #include "ppapi/c/ppb_var.h"
 #include "ppapi/c/ppb_var_array_buffer.h"
 #include "ppapi/c/pp_var.h"
 #include "ppapi/shared_impl/ppapi_globals.h"
 #include "ppapi/shared_impl/proxy_lock.h"
+#include "ppapi/shared_impl/resource_tracker.h"
+#include "ppapi/shared_impl/resource_var.h"
 #include "ppapi/shared_impl/var.h"
 #include "ppapi/shared_impl/var_tracker.h"
 
 using ppapi::PpapiGlobals;
 using ppapi::StringVar;
 
 namespace ppapi {
 namespace {
 
 
@@ skipping 22 matching lines @@
   ProxyAutoLock lock;
   StringVar* str = StringVar::FromPPVar(var);
   if (str) {
     *len = static_cast<uint32_t>(str->value().size());
     return str->value().c_str();
   }
   *len = 0;
   return NULL;
 }
 
+PP_Resource VarToResource(struct PP_Var var) {
+  ProxyAutoLock lock;
+  ResourceVar* resource = ResourceVar::FromPPVar(var);
+  if (!resource)
+    return 0;
+  PP_Resource pp_resource = resource->GetPPResource();
+  PpapiGlobals::Get()->GetResourceTracker()->AddRefResource(pp_resource);
+  return pp_resource;
+}
+
+struct PP_Var VarFromResource(PP_Resource resource) {

[yzshen1, 2014/02/06 18:02:58]

struct is not necessary

[Matt Giuca, 2014/02/07 03:11:22]

Done.

+  ProxyAutoLock lock;
+  return PpapiGlobals::Get()->GetVarTracker()->MakeResourcePPVar(resource);
+}
+
 const PPB_Var var_interface = {
   &AddRefVar,
   &ReleaseVar,
   &VarFromUtf8,
+  &VarToUtf8,
+  &VarToResource,
+  &VarFromResource
+};
+
+const PPB_Var_1_1 var_interface1_1 = {
+  &AddRefVar,
+  &ReleaseVar,
+  &VarFromUtf8,
   &VarToUtf8
 };
 
 const PPB_Var_1_0 var_interface1_0 = {
   &AddRefVar,
   &ReleaseVar,
   &VarFromUtf8_1_0,
   &VarToUtf8
 };
 
@@ skipping 33 matching lines @@
 const PPB_VarArrayBuffer_1_0 var_arraybuffer_interface = {
   &CreateArrayBufferVar,
   &ByteLength,
   &Map,
   &Unmap
 };
 
 }  // namespace
 
 // static
+const PPB_Var_1_2* PPB_Var_Shared::GetVarInterface1_2() {
+  return &var_interface;
+}
+
+// static
 const PPB_Var_1_1* PPB_Var_Shared::GetVarInterface1_1() {
-  return &var_interface;
+  return &var_interface1_1;
 }
 
 // static
 const PPB_Var_1_0* PPB_Var_Shared::GetVarInterface1_0() {
   return &var_interface1_0;
 }
 
 // static
 const PPB_VarArrayBuffer_1_0* PPB_Var_Shared::GetVarArrayBufferInterface1_0() {
   return &var_arraybuffer_interface;
 }
 
 }  // namespace ppapi