Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(199)

Side by Side Diff: ppapi/thunk/ppb_flash_drm_thunk.cc

Issue 1412323002: ppapi: Support up to 32 subsamples in PP_EncryptedBlockInfo. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 2 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 // From private/ppb_flash_drm.idl modified Mon Apr 7 08:56:43 2014. 5 // From private/ppb_flash_drm.idl modified Fri Jun 13 10:40:42 2014.
6 6
7 #include "ppapi/c/pp_completion_callback.h" 7 #include "ppapi/c/pp_completion_callback.h"
8 #include "ppapi/c/pp_errors.h" 8 #include "ppapi/c/pp_errors.h"
9 #include "ppapi/c/private/ppb_flash_drm.h" 9 #include "ppapi/c/private/ppb_flash_drm.h"
10 #include "ppapi/shared_impl/tracked_callback.h" 10 #include "ppapi/shared_impl/tracked_callback.h"
11 #include "ppapi/thunk/enter.h" 11 #include "ppapi/thunk/enter.h"
12 #include "ppapi/thunk/ppapi_thunk_export.h" 12 #include "ppapi/thunk/ppapi_thunk_export.h"
13 #include "ppapi/thunk/ppb_flash_drm_api.h" 13 #include "ppapi/thunk/ppb_flash_drm_api.h"
14 14
15 namespace ppapi { 15 namespace ppapi {
(...skipping 42 matching lines...) Expand 10 before | Expand all | Expand 10 after
58 PP_Bool* is_external, 58 PP_Bool* is_external,
59 struct PP_CompletionCallback callback) { 59 struct PP_CompletionCallback callback) {
60 VLOG(4) << "PPB_Flash_DRM::MonitorIsExternal()"; 60 VLOG(4) << "PPB_Flash_DRM::MonitorIsExternal()";
61 EnterResource<PPB_Flash_DRM_API> enter(drm, callback, true); 61 EnterResource<PPB_Flash_DRM_API> enter(drm, callback, true);
62 if (enter.failed()) 62 if (enter.failed())
63 return enter.retval(); 63 return enter.retval();
64 return enter.SetResult( 64 return enter.SetResult(
65 enter.object()->MonitorIsExternal(is_external, enter.callback())); 65 enter.object()->MonitorIsExternal(is_external, enter.callback()));
66 } 66 }
67 67
68 const PPB_Flash_DRM_1_0 g_ppb_flash_drm_thunk_1_0 = {&Create, 68 const PPB_Flash_DRM_1_0 g_ppb_flash_drm_thunk_1_0 = {
69 &GetDeviceID, 69 &Create, &GetDeviceID, &GetHmonitor, &GetVoucherFile};
70 &GetHmonitor,
71 &GetVoucherFile};
72 70
73 const PPB_Flash_DRM_1_1 g_ppb_flash_drm_thunk_1_1 = {&Create, 71 const PPB_Flash_DRM_1_1 g_ppb_flash_drm_thunk_1_1 = {
74 &GetDeviceID, 72 &Create, &GetDeviceID, &GetHmonitor, &GetVoucherFile, &MonitorIsExternal};
75 &GetHmonitor,
76 &GetVoucherFile,
77 &MonitorIsExternal};
78 73
79 } // namespace 74 } // namespace
80 75
81 PPAPI_THUNK_EXPORT const PPB_Flash_DRM_1_0* GetPPB_Flash_DRM_1_0_Thunk() { 76 PPAPI_THUNK_EXPORT const PPB_Flash_DRM_1_0* GetPPB_Flash_DRM_1_0_Thunk() {
82 return &g_ppb_flash_drm_thunk_1_0; 77 return &g_ppb_flash_drm_thunk_1_0;
83 } 78 }
84 79
85 PPAPI_THUNK_EXPORT const PPB_Flash_DRM_1_1* GetPPB_Flash_DRM_1_1_Thunk() { 80 PPAPI_THUNK_EXPORT const PPB_Flash_DRM_1_1* GetPPB_Flash_DRM_1_1_Thunk() {
86 return &g_ppb_flash_drm_thunk_1_1; 81 return &g_ppb_flash_drm_thunk_1_1;
87 } 82 }
88 83
89 } // namespace thunk 84 } // namespace thunk
90 } // namespace ppapi 85 } // namespace ppapi
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698