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

Unified Diff: content/common/media/cdm_host_files.h

Issue 2802853002: Revert of media: Simplify CdmHostFile(s) (Closed)
Patch Set: Created 3 years, 8 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « content/common/media/cdm_host_file.cc ('k') | content/common/media/cdm_host_files.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/common/media/cdm_host_files.h
diff --git a/content/common/media/cdm_host_files.h b/content/common/media/cdm_host_files.h
index 75430d556c9a3454328765b714696368d2801423..5ec1dafcc83ad8118b4bcf254468b10ee4c6ccdc 100644
--- a/content/common/media/cdm_host_files.h
+++ b/content/common/media/cdm_host_files.h
@@ -72,23 +72,27 @@
private:
#if defined(POSIX_WITH_ZYGOTE)
// Opens all common files and CDM specific files for all registered CDMs.
- void OpenFilesForAllRegisteredCdms();
+ bool OpenFilesForAllRegisteredCdms();
#endif
// Opens all common files and CDM specific files for the CDM adapter
// registered at |cdm_adapter_path|.
- void OpenFiles(const base::FilePath& cdm_adapter_path);
+ bool OpenFiles(const base::FilePath& cdm_adapter_path);
- // Opens common CDM host files shared by all CDMs.
- void OpenCommonFiles();
+ // Opens common CDM host files shared by all CDMs. Upon failure, close all
+ // files opened.
+ bool OpenCommonFiles();
// Opens CDM specific files for the CDM adapter registered at
- // |cdm_adapter_path|.
- void OpenCdmFiles(const base::FilePath& cdm_adapter_path);
+ // |cdm_adapter_path|. Returns whether all CDM specific files are opened.
+ // Upon failure, close all files opened.
+ bool OpenCdmFiles(const base::FilePath& cdm_adapter_path);
// Fills |cdm_host_files| with common and CDM specific files for
// |cdm_adapter_path|. The ownership of those files are also transferred.
- void TakePlatformFiles(const base::FilePath& cdm_adapter_path,
+ // Returns true upon success where the remaining files will be closed.
+ // Returns false upon any failure and all files will be closed.
+ bool TakePlatformFiles(const base::FilePath& cdm_adapter_path,
std::vector<cdm::HostFile>* cdm_host_files);
void CloseAllFiles();
« no previous file with comments | « content/common/media/cdm_host_file.cc ('k') | content/common/media/cdm_host_files.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698