diff options
| author | bbudge@chromium.org <bbudge@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-04-02 16:52:27 +0000 |
|---|---|---|
| committer | bbudge@chromium.org <bbudge@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-04-02 16:52:27 +0000 |
| commit | f8b1cb6bfa3690a6f5d11d6695e8f733878bb5ff (patch) | |
| tree | 0a5996b4b4d1364de96793b33f5fa0f32a1d8384 /ppapi/thunk | |
| parent | e7f30cbfc10d6fbf4b30393d4435eaee6c1535d3 (diff) | |
| download | chromium_src-f8b1cb6bfa3690a6f5d11d6695e8f733878bb5ff.zip chromium_src-f8b1cb6bfa3690a6f5d11d6695e8f733878bb5ff.tar.gz chromium_src-f8b1cb6bfa3690a6f5d11d6695e8f733878bb5ff.tar.bz2 | |
Add Pepper TrueType Font resource implementations for Win, Mac, and Linux.
Recreate https://codereview.chromium.org/12764016/
TBR=brettw@chromium.org
BUG=79375
TEST=browser_tests --gtest_filter="OutOfProcessPPAPITest.TrueTypeFont"
Review URL: https://chromiumcodereview.appspot.com/12472031
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@191839 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ppapi/thunk')
| -rw-r--r-- | ppapi/thunk/enter.cc | 4 | ||||
| -rw-r--r-- | ppapi/thunk/ppb_truetype_font_thunk.cc | 3 |
2 files changed, 5 insertions, 2 deletions
diff --git a/ppapi/thunk/enter.cc b/ppapi/thunk/enter.cc index 0248eba..965e0f1 100644 --- a/ppapi/thunk/enter.cc +++ b/ppapi/thunk/enter.cc @@ -63,7 +63,9 @@ EnterBase::EnterBase(PP_Instance instance, SingletonResourceID resource_id, const PP_CompletionCallback& callback) : resource_(GetSingletonResource(instance, resource_id)), retval_(PP_OK) { - DCHECK(resource_); + DCHECK(resource_ || !instance); + if (!resource_) + retval_ = PP_ERROR_BADARGUMENT; callback_ = new TrackedCallback(resource_, callback); } diff --git a/ppapi/thunk/ppb_truetype_font_thunk.cc b/ppapi/thunk/ppb_truetype_font_thunk.cc index b941c84..4b47afb 100644 --- a/ppapi/thunk/ppb_truetype_font_thunk.cc +++ b/ppapi/thunk/ppb_truetype_font_thunk.cc @@ -24,7 +24,8 @@ int32_t GetFontFamilies(PP_Instance instance, EnterInstanceAPI<PPB_TrueTypeFont_Singleton_API> enter(instance, callback); if (enter.failed()) return PP_ERROR_FAILED; - return enter.functions()->GetFontFamilies(instance, output, enter.callback()); + return enter.SetResult( + enter.functions()->GetFontFamilies(instance, output, enter.callback())); } PP_Resource Create(PP_Instance instance, |