Convert resources to take an instance key instead of an Instance*.

ppapi/cpp/dev/font_dev.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 "ppapi/cpp/dev/font_dev.h"
 
 #include <algorithm>
 
 #include "ppapi/cpp/image_data.h"
-#include "ppapi/cpp/instance.h"
+#include "ppapi/cpp/instance_handle.h"
 #include "ppapi/cpp/point.h"
 #include "ppapi/cpp/rect.h"
 #include "ppapi/cpp/module_impl.h"
 
 namespace pp {
 
 namespace {
 
 template <> const char* interface_name<PPB_Font_Dev>() {
   return PPB_FONT_DEV_INTERFACE;
@@ skipping 74 matching lines @@
 }
 
 // Font ------------------------------------------------------------------------
 
 Font_Dev::Font_Dev() : Resource() {
 }
 
 Font_Dev::Font_Dev(PP_Resource resource) : Resource(resource) {
 }
 
-Font_Dev::Font_Dev(Instance* instance, const FontDescription_Dev& description) {
+Font_Dev::Font_Dev(const InstanceHandle& instance,
+                   const FontDescription_Dev& description) {
   if (!has_interface<PPB_Font_Dev>())
     return;
   PassRefFromConstructor(get_interface<PPB_Font_Dev>()->Create(
-      instance->pp_instance(), &description.pp_font_description()));
+      instance.pp_instance(), &description.pp_font_description()));
 }
 
 Font_Dev::Font_Dev(const Font_Dev& other) : Resource(other) {
 }
 
 Font_Dev& Font_Dev::operator=(const Font_Dev& other) {
   Resource::operator=(other);
   return *this;
 }
 
 // static
-Var Font_Dev::GetFontFamilies(Instance* instance) {
+Var Font_Dev::GetFontFamilies(const InstanceHandle& instance) {
   if (!has_interface<PPB_Font_Dev>())
     return Var();
-  return Var(Var::PassRef(),
-             get_interface<PPB_Font_Dev>()->GetFontFamilies(
-                 instance->pp_instance()));
+  return Var(PASS_REF, get_interface<PPB_Font_Dev>()->GetFontFamilies(
+                 instance.pp_instance()));
 }
 
 bool Font_Dev::Describe(FontDescription_Dev* description,
                         PP_FontMetrics_Dev* metrics) const {
   if (!has_interface<PPB_Font_Dev>())
     return false;
 
   // Be careful with ownership of the |face| string. It will come back with
   // a ref of 1, which we want to assign to the |face_| member of the C++ class.
   if (!get_interface<PPB_Font_Dev>()->Describe(
       pp_resource(), &description->pp_font_description_, metrics))
     return false;
-  description->face_ = Var(Var::PassRef(),
+  description->face_ = Var(PASS_REF,
                            description->pp_font_description_.face);
 
   return true;
 }
 
 bool Font_Dev::DrawTextAt(ImageData* dest,
                           const TextRun_Dev& text,
                           const Point& position,
                           uint32_t color,
                           const Rect& clip,
@@ skipping 41 matching lines @@
                               bool image_data_is_opaque) const {
   return DrawTextAt(dest, TextRun_Dev(text), position, color,
                     Rect(dest->size()), image_data_is_opaque);
 }
 
 int32_t Font_Dev::MeasureSimpleText(const std::string& text) const {
   return MeasureText(TextRun_Dev(text));
 }
 
 }  // namespace pp