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

Side by Side Diff: media/cdm/ppapi/cdm_adapter.h

Issue 393713003: CdmAdapter: Allow parallel SendPlatformChallenge() calls. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 6 years, 5 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 | Annotate | Revision Log
« no previous file with comments | « no previous file | media/cdm/ppapi/cdm_adapter.cc » ('j') | media/cdm/ppapi/cdm_adapter.cc » ('J')
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright 2013 The Chromium Authors. All rights reserved. 1 // Copyright 2013 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 #ifndef MEDIA_CDM_PPAPI_CDM_ADAPTER_H_ 5 #ifndef MEDIA_CDM_PPAPI_CDM_ADAPTER_H_
6 #define MEDIA_CDM_PPAPI_CDM_ADAPTER_H_ 6 #define MEDIA_CDM_PPAPI_CDM_ADAPTER_H_
7 7
8 #include <string> 8 #include <string>
9 #include <vector> 9 #include <vector>
10 10
(...skipping 240 matching lines...) Expand 10 before | Expand all | Expand 10 after
251 251
252 pp::OutputProtection_Private output_protection_; 252 pp::OutputProtection_Private output_protection_;
253 pp::PlatformVerification platform_verification_; 253 pp::PlatformVerification platform_verification_;
254 254
255 // Since PPAPI doesn't provide handlers for CompletionCallbacks with more than 255 // Since PPAPI doesn't provide handlers for CompletionCallbacks with more than
256 // one output we need to manage our own. These values are only read by 256 // one output we need to manage our own. These values are only read by
257 // SendPlatformChallengeDone(). 257 // SendPlatformChallengeDone().
258 pp::Var signed_data_output_; 258 pp::Var signed_data_output_;
259 pp::Var signed_data_signature_output_; 259 pp::Var signed_data_signature_output_;
260 pp::Var platform_key_certificate_output_; 260 pp::Var platform_key_certificate_output_;
261 bool challenge_in_progress_;
262 261
263 // Same as above, these are only read by QueryOutputProtectionStatusDone(). 262 // Same as above, these are only read by QueryOutputProtectionStatusDone().
264 uint32_t output_link_mask_; 263 uint32_t output_link_mask_;
265 uint32_t output_protection_mask_; 264 uint32_t output_protection_mask_;
266 bool query_output_protection_in_progress_; 265 bool query_output_protection_in_progress_;
267 266
268 // Tracks whether an output protection query and a positive query result (no 267 // Tracks whether an output protection query and a positive query result (no
269 // unprotected external link) have been reported to UMA. 268 // unprotected external link) have been reported to UMA.
270 bool uma_for_output_protection_query_reported_; 269 bool uma_for_output_protection_query_reported_;
271 bool uma_for_output_protection_positive_result_reported_; 270 bool uma_for_output_protection_positive_result_reported_;
(...skipping 11 matching lines...) Expand all
283 uint32_t deferred_audio_decoder_config_id_; 282 uint32_t deferred_audio_decoder_config_id_;
284 bool deferred_initialize_video_decoder_; 283 bool deferred_initialize_video_decoder_;
285 uint32_t deferred_video_decoder_config_id_; 284 uint32_t deferred_video_decoder_config_id_;
286 285
287 DISALLOW_COPY_AND_ASSIGN(CdmAdapter); 286 DISALLOW_COPY_AND_ASSIGN(CdmAdapter);
288 }; 287 };
289 288
290 } // namespace media 289 } // namespace media
291 290
292 #endif // MEDIA_CDM_PPAPI_CDM_ADAPTER_H_ 291 #endif // MEDIA_CDM_PPAPI_CDM_ADAPTER_H_
OLDNEW
« no previous file with comments | « no previous file | media/cdm/ppapi/cdm_adapter.cc » ('j') | media/cdm/ppapi/cdm_adapter.cc » ('J')

Powered by Google App Engine
This is Rietveld 408576698