diff options
| author | brettw@chromium.org <brettw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-02-27 20:23:19 +0000 |
|---|---|---|
| committer | brettw@chromium.org <brettw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-02-27 20:23:19 +0000 |
| commit | 09af0f7661d6a5971804c9a8ec47bbd038a5de78 (patch) | |
| tree | f2c56e46b629df59a3a1781ac54a7d43d170ea31 /ppapi/cpp/trusted | |
| parent | 7e26ac973ede2fd0576d40086a437a3177668ea1 (diff) | |
| download | chromium_src-09af0f7661d6a5971804c9a8ec47bbd038a5de78.zip chromium_src-09af0f7661d6a5971804c9a8ec47bbd038a5de78.tar.gz chromium_src-09af0f7661d6a5971804c9a8ec47bbd038a5de78.tar.bz2 | |
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
Diffstat (limited to 'ppapi/cpp/trusted')
| -rw-r--r-- | ppapi/cpp/trusted/browser_font_trusted.cc | 4 | ||||
| -rw-r--r-- | ppapi/cpp/trusted/file_chooser_trusted.cc | 2 | ||||
| -rw-r--r-- | ppapi/cpp/trusted/file_chooser_trusted.h | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/ppapi/cpp/trusted/browser_font_trusted.cc b/ppapi/cpp/trusted/browser_font_trusted.cc index 8bea86a..b9f2b0d 100644 --- a/ppapi/cpp/trusted/browser_font_trusted.cc +++ b/ppapi/cpp/trusted/browser_font_trusted.cc @@ -158,7 +158,7 @@ BrowserFont_Trusted& BrowserFont_Trusted::operator=( Var BrowserFont_Trusted::GetFontFamilies(Instance* instance) { if (!has_interface<PPB_Font_Dev>()) return Var(); - return Var(Var::PassRef(), + return Var(PASS_REF, get_interface<PPB_Font_Dev>()->GetFontFamilies( instance->pp_instance())); } @@ -179,7 +179,7 @@ bool BrowserFont_Trusted::Describe( BrowserFontMetricsToFontMetrics(metrics))) return false; } - description->face_ = Var(Var::PassRef(), + description->face_ = Var(PASS_REF, description->pp_font_description_.face); return true; } diff --git a/ppapi/cpp/trusted/file_chooser_trusted.cc b/ppapi/cpp/trusted/file_chooser_trusted.cc index aa05798..a5f6879 100644 --- a/ppapi/cpp/trusted/file_chooser_trusted.cc +++ b/ppapi/cpp/trusted/file_chooser_trusted.cc @@ -24,7 +24,7 @@ template <> const char* interface_name<PPB_FileChooserTrusted>() { FileChooser_Trusted::FileChooser_Trusted() : save_as_(false) { } -FileChooser_Trusted::FileChooser_Trusted(const Instance* instance, +FileChooser_Trusted::FileChooser_Trusted(const InstanceHandle& instance, PP_FileChooserMode_Dev mode, const Var& accept_mime_types, bool save_as, diff --git a/ppapi/cpp/trusted/file_chooser_trusted.h b/ppapi/cpp/trusted/file_chooser_trusted.h index d6a2491..d730dbf 100644 --- a/ppapi/cpp/trusted/file_chooser_trusted.h +++ b/ppapi/cpp/trusted/file_chooser_trusted.h @@ -16,7 +16,7 @@ class FileChooser_Trusted : public FileChooser_Dev { /// Creates an is_null() FileChooser_Trusted object. FileChooser_Trusted(); - FileChooser_Trusted(const Instance* instance, + FileChooser_Trusted(const InstanceHandle& instance, PP_FileChooserMode_Dev mode, const Var& accept_mime_types, bool save_as, |