Source/web/WebMediaPlayerClientImpl.h - Issue 655603003: Reland: Remove "needkey" event and add its replacement, "encrypted".

Side by Side Diff: Source/web/WebMediaPlayerClientImpl.h

Issue 655603003: Reland: Remove "needkey" event and add its replacement, "encrypted". (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master

Patch Set: Created 6 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

« no previous file with comments | « Source/modules/modules.gypi ('k') | Source/web/WebMediaPlayerClientImpl.cpp » ('j') | no next file with comments »

OLD	NEW
1 /*	1 /*

2 * Copyright (C) 2009 Google Inc. All rights reserved.	2 * Copyright (C) 2009 Google Inc. All rights reserved.

3 *	3 *

4 * Redistribution and use in source and binary forms, with or without	4 * Redistribution and use in source and binary forms, with or without

5 * modification, are permitted provided that the following conditions are	5 * modification, are permitted provided that the following conditions are

6 * met:	6 * met:

7 *	7 *

8 * * Redistributions of source code must retain the above copyright	8 * * Redistributions of source code must retain the above copyright

9 * notice, this list of conditions and the following disclaimer.	9 * notice, this list of conditions and the following disclaimer.

10 * * Redistributions in binary form must reproduce the above	10 * * Redistributions in binary form must reproduce the above

(...skipping 52 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
63 virtual void timeChanged() override;	63 virtual void timeChanged() override;

64 virtual void repaint() override;	64 virtual void repaint() override;

65 virtual void durationChanged() override;	65 virtual void durationChanged() override;

66 virtual void sizeChanged() override;	66 virtual void sizeChanged() override;

67 virtual void playbackStateChanged() override;	67 virtual void playbackStateChanged() override;

68	68

69 // WebEncryptedMediaPlayerClient methods:	69 // WebEncryptedMediaPlayerClient methods:

70 virtual void keyAdded(const WebString& keySystem, const WebString& sessionId ) override;	70 virtual void keyAdded(const WebString& keySystem, const WebString& sessionId ) override;

71 virtual void keyError(const WebString& keySystem, const WebString& sessionId , MediaKeyErrorCode, unsigned short systemCode) override;	71 virtual void keyError(const WebString& keySystem, const WebString& sessionId , MediaKeyErrorCode, unsigned short systemCode) override;

72 virtual void keyMessage(const WebString& keySystem, const WebString& session Id, const unsigned char* message, unsigned messageLength, const WebURL& defaultU RL) override;	72 virtual void keyMessage(const WebString& keySystem, const WebString& session Id, const unsigned char* message, unsigned messageLength, const WebURL& defaultU RL) override;

	73 // FIXME: Remove keyNeeded() once rename to encrypted() is complete.

73 virtual void keyNeeded(const WebString& contentType, const unsigned char* in itData, unsigned initDataLength) override;	74 virtual void keyNeeded(const WebString& contentType, const unsigned char* in itData, unsigned initDataLength) override;

	75 virtual void encrypted(const WebString& initDataType, const unsigned char* i nitData, unsigned initDataLength) override;

74	76

75 virtual void setWebLayer(WebLayer*) override;	77 virtual void setWebLayer(WebLayer*) override;

76 virtual WebMediaPlayer::TrackId addAudioTrack(const WebString& id, AudioTrac kKind, const WebString& label, const WebString& language, bool enabled) override ;	78 virtual WebMediaPlayer::TrackId addAudioTrack(const WebString& id, AudioTrac kKind, const WebString& label, const WebString& language, bool enabled) override ;

77 virtual void removeAudioTrack(WebMediaPlayer::TrackId) override;	79 virtual void removeAudioTrack(WebMediaPlayer::TrackId) override;

78 virtual WebMediaPlayer::TrackId addVideoTrack(const WebString& id, VideoTrac kKind, const WebString& label, const WebString& language, bool selected) overrid e;	80 virtual WebMediaPlayer::TrackId addVideoTrack(const WebString& id, VideoTrac kKind, const WebString& label, const WebString& language, bool selected) overrid e;

79 virtual void removeVideoTrack(WebMediaPlayer::TrackId) override;	81 virtual void removeVideoTrack(WebMediaPlayer::TrackId) override;

80 virtual void addTextTrack(WebInbandTextTrack*) override;	82 virtual void addTextTrack(WebInbandTextTrack*) override;

81 virtual void removeTextTrack(WebInbandTextTrack*) override;	83 virtual void removeTextTrack(WebInbandTextTrack*) override;

82 virtual void mediaSourceOpened(WebMediaSource*) override;	84 virtual void mediaSourceOpened(WebMediaSource*) override;

83 virtual void requestFullscreen() override;	85 virtual void requestFullscreen() override;

(...skipping 66 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
150 Mutex provideInputLock;	152 Mutex provideInputLock;

151 };	153 };

152	154

153 AudioSourceProviderImpl m_audioSourceProvider;	155 AudioSourceProviderImpl m_audioSourceProvider;

154 #endif	156 #endif

155 };	157 };

156	158

157 } // namespace blink	159 } // namespace blink

158	160

159 #endif	161 #endif

OLD	NEW