| Index: content/renderer/media/webcontentdecryptionmodulesession_impl.h
|
| diff --git a/content/renderer/media/webcontentdecryptionmodulesession_impl.h b/content/renderer/media/webcontentdecryptionmodulesession_impl.h
|
| index 68527d00cd91a0a5b5f4451ff29003b5f484eec9..6ff091c876ad7e00c2c0c52a0131cbd0189b4efb 100644
|
| --- a/content/renderer/media/webcontentdecryptionmodulesession_impl.h
|
| +++ b/content/renderer/media/webcontentdecryptionmodulesession_impl.h
|
| @@ -23,9 +23,10 @@ namespace content {
|
| class WebContentDecryptionModuleSessionImpl
|
| : public blink::WebContentDecryptionModuleSession {
|
| public:
|
| - typedef base::Callback<void(uint32 reference_id)> SessionClosedCB;
|
| + typedef base::Callback<void(uint32 session_id)> SessionClosedCB;
|
|
|
| WebContentDecryptionModuleSessionImpl(
|
| + uint32 session_id,
|
| media::MediaKeys* media_keys,
|
| Client* client,
|
| const SessionClosedCB& session_closed_cb);
|
| @@ -39,12 +40,8 @@ class WebContentDecryptionModuleSessionImpl
|
| virtual void update(const uint8* response, size_t response_length) OVERRIDE;
|
| virtual void close() OVERRIDE;
|
|
|
| - const std::string& session_id() const { return session_id_; }
|
| -
|
| - uint32 reference_id() const { return reference_id_; }
|
| -
|
| // Callbacks.
|
| - void OnSessionCreated(const std::string& session_id);
|
| + void OnSessionCreated(const std::string& web_session_id);
|
| void OnSessionMessage(const std::vector<uint8>& message,
|
| const std::string& destination_url);
|
| void OnSessionReady();
|
| @@ -58,16 +55,13 @@ class WebContentDecryptionModuleSessionImpl
|
|
|
| SessionClosedCB session_closed_cb_;
|
|
|
| - // Session ID is the user visible ID for this session generated by the CDM.
|
| + // Web session ID is the app visible ID for this session generated by the CDM.
|
| // This value is not set until the CDM calls OnSessionCreated().
|
| - std::string session_id_;
|
| + blink::WebString web_session_id_;
|
|
|
| - // Reference ID is used to uniquely track this object so that CDM callbacks
|
| + // Session ID is used to uniquely track this object so that CDM callbacks
|
| // can get routed to the correct object.
|
| - const uint32 reference_id_;
|
| -
|
| - // Reference ID should be unique per renderer process for debugging purposes.
|
| - static uint32 next_reference_id_;
|
| + const uint32 session_id_;
|
|
|
| DISALLOW_COPY_AND_ASSIGN(WebContentDecryptionModuleSessionImpl);
|
| };
|
|
|