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

Side by Side Diff: media/mojo/clients/mojo_cdm.h

Issue 2551333002: media: Avoid access violation in MojoCdm after connection error (Closed)
Patch Set: comments addressed Created 4 years 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
« no previous file with comments | « media/mojo/BUILD.gn ('k') | media/mojo/clients/mojo_cdm.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 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_MOJO_CLIENTS_MOJO_CDM_H_ 5 #ifndef MEDIA_MOJO_CLIENTS_MOJO_CDM_H_
6 #define MEDIA_MOJO_CLIENTS_MOJO_CDM_H_ 6 #define MEDIA_MOJO_CLIENTS_MOJO_CDM_H_
7 7
8 #include <stdint.h> 8 #include <stdint.h>
9 9
10 #include <memory> 10 #include <memory>
(...skipping 71 matching lines...) Expand 10 before | Expand all | Expand 10 after
82 const SessionKeysChangeCB& session_keys_change_cb, 82 const SessionKeysChangeCB& session_keys_change_cb,
83 const SessionExpirationUpdateCB& session_expiration_update_cb); 83 const SessionExpirationUpdateCB& session_expiration_update_cb);
84 84
85 ~MojoCdm() final; 85 ~MojoCdm() final;
86 86
87 void InitializeCdm(const std::string& key_system, 87 void InitializeCdm(const std::string& key_system,
88 const GURL& security_origin, 88 const GURL& security_origin,
89 const CdmConfig& cdm_config, 89 const CdmConfig& cdm_config,
90 std::unique_ptr<CdmInitializedPromise> promise); 90 std::unique_ptr<CdmInitializedPromise> promise);
91 91
92 void OnConnectionError(); 92 void OnConnectionError(uint32_t custom_reason,
93 const std::string& description);
93 94
94 // mojom::ContentDecryptionModuleClient implementation. 95 // mojom::ContentDecryptionModuleClient implementation.
95 void OnSessionMessage(const std::string& session_id, 96 void OnSessionMessage(const std::string& session_id,
96 MessageType message_type, 97 MessageType message_type,
97 const std::vector<uint8_t>& message) final; 98 const std::vector<uint8_t>& message) final;
98 void OnSessionClosed(const std::string& session_id) final; 99 void OnSessionClosed(const std::string& session_id) final;
99 void OnSessionKeysChange( 100 void OnSessionKeysChange(
100 const std::string& session_id, 101 const std::string& session_id,
101 bool has_additional_usable_key, 102 bool has_additional_usable_key,
102 std::vector<mojom::CdmKeyInformationPtr> keys_info) final; 103 std::vector<mojom::CdmKeyInformationPtr> keys_info) final;
(...skipping 55 matching lines...) Expand 10 before | Expand all | Expand 10 after
158 159
159 // This must be the last member. 160 // This must be the last member.
160 base::WeakPtrFactory<MojoCdm> weak_factory_; 161 base::WeakPtrFactory<MojoCdm> weak_factory_;
161 162
162 DISALLOW_COPY_AND_ASSIGN(MojoCdm); 163 DISALLOW_COPY_AND_ASSIGN(MojoCdm);
163 }; 164 };
164 165
165 } // namespace media 166 } // namespace media
166 167
167 #endif // MEDIA_MOJO_CLIENTS_MOJO_CDM_H_ 168 #endif // MEDIA_MOJO_CLIENTS_MOJO_CDM_H_
OLDNEW
« no previous file with comments | « media/mojo/BUILD.gn ('k') | media/mojo/clients/mojo_cdm.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698