From 09af0f7661d6a5971804c9a8ec47bbd038a5de78 Mon Sep 17 00:00:00 2001
From: "brettw@chromium.org"
 <brettw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>
Date: Mon, 27 Feb 2012 20:23:19 +0000
Subject: Convert resources to take an instance key instead of an Instance*.

Review URL: https://chromiumcodereview.appspot.com/9381010

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@123795 0039d316-1c4b-4281-b951-d872f2087c98
---
 .../ppapi_proxy/browser_ppb_net_address_private_rpc_server.cc       | 2 +-
 .../src/shared/ppapi_proxy/browser_ppb_testing_rpc_server.cc        | 2 +-
 ppapi/native_client/src/trusted/plugin/plugin.cc                    | 6 +++---
 3 files changed, 5 insertions(+), 5 deletions(-)

(limited to 'ppapi/native_client')

diff --git a/ppapi/native_client/src/shared/ppapi_proxy/browser_ppb_net_address_private_rpc_server.cc b/ppapi/native_client/src/shared/ppapi_proxy/browser_ppb_net_address_private_rpc_server.cc
index 3343049..f8ca72b 100644
--- a/ppapi/native_client/src/shared/ppapi_proxy/browser_ppb_net_address_private_rpc_server.cc
+++ b/ppapi/native_client/src/shared/ppapi_proxy/browser_ppb_net_address_private_rpc_server.cc
@@ -107,7 +107,7 @@ void PpbNetAddressPrivateRpcServer::PPB_NetAddress_Private_Describe(
       module,
       reinterpret_cast<PP_NetAddress_Private*>(addr),
       static_cast<PP_Bool>(include_port));
-  pp::Var address(pp::Var::PassRef(), pp_address);
+  pp::Var address(pp::PASS_REF, pp_address);
 
   if (!SerializeTo(&address.pp_var(), description, description_bytes))
     return;
diff --git a/ppapi/native_client/src/shared/ppapi_proxy/browser_ppb_testing_rpc_server.cc b/ppapi/native_client/src/shared/ppapi_proxy/browser_ppb_testing_rpc_server.cc
index 8fb9d6f..8f3ab6e 100644
--- a/ppapi/native_client/src/shared/ppapi_proxy/browser_ppb_testing_rpc_server.cc
+++ b/ppapi/native_client/src/shared/ppapi_proxy/browser_ppb_testing_rpc_server.cc
@@ -132,6 +132,6 @@ void PpbTestingRpcServer::PPB_Testing_GetDocumentURL(
     return;
 
   DebugPrintf("PPB_Testing_Dev::GetDocumentURL: url=%s\n",
-              pp::Var(pp::Var::PassRef(), pp_url).AsString().c_str());
+              pp::Var(pp::PASS_REF, pp_url).AsString().c_str());
   rpc->result = NACL_SRPC_RESULT_OK;
 }
diff --git a/ppapi/native_client/src/trusted/plugin/plugin.cc b/ppapi/native_client/src/trusted/plugin/plugin.cc
index 0034f26..c89daa0 100644
--- a/ppapi/native_client/src/trusted/plugin/plugin.cc
+++ b/ppapi/native_client/src/trusted/plugin/plugin.cc
@@ -340,7 +340,7 @@ class PrintingAdapter : public pp::Printing_Dev {
       PP_Resource image_data = ppp_printing_->PrintPages(plugin_->pp_instance(),
                                                          page_ranges,
                                                          page_range_count);
-      return pp::ImageData(pp::ImageData::PassRef(), image_data);
+      return pp::ImageData(pp::PASS_REF, image_data);
     }
     return pp::Resource();
   }
@@ -383,7 +383,7 @@ class SelectionAdapter : public pp::Selection_Dev {
     if (ppp_selection_ != NULL) {
       PP_Var var = ppp_selection_->GetSelectedText(plugin_->pp_instance(),
                                                    PP_FromBool(html));
-      return pp::Var(pp::Var::PassRef(), var);
+      return pp::Var(pp::PASS_REF, var);
     }
     return pp::Var();
   }
@@ -825,7 +825,7 @@ bool Plugin::Init(uint32_t argc, const char* argn[], const char* argv[]) {
     // manifest.  This takes into account the setting of <base> tags that
     // precede the embed/object.
     CHECK(url_util_ != NULL);
-    pp::Var base_var = url_util_->GetDocumentURL(*this);
+    pp::Var base_var = url_util_->GetDocumentURL(this);
     if (!base_var.is_string()) {
       PLUGIN_PRINTF(("Plugin::Init (unable to find document url)\n"));
       return false;
-- 
cgit v1.1