Source/web/WebMediaPlayerClientImpl.h - Issue 600143005: Rename onneedkey event to onencrypted.

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

Issue 600143005: Rename onneedkey event to onencrypted. (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

« Source/modules/modules.gypi ('K') | « 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 virtual void keyNeeded(const WebString& contentType, const unsigned char* in itData, unsigned initDataLength) OVERRIDE;	73 virtual void keyNeeded(const WebString& initDataType, const unsigned char* i nitData, unsigned initDataLength) OVERRIDE;

74	74

75 virtual void setWebLayer(WebLayer*) OVERRIDE;	75 virtual void setWebLayer(WebLayer*) OVERRIDE;

76 virtual WebMediaPlayer::TrackId addAudioTrack(const WebString& id, AudioTrac kKind, const WebString& label, const WebString& language, bool enabled) OVERRIDE ;	76 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;	77 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;	78 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;	79 virtual void removeVideoTrack(WebMediaPlayer::TrackId) OVERRIDE;

80 virtual void addTextTrack(WebInbandTextTrack*) OVERRIDE;	80 virtual void addTextTrack(WebInbandTextTrack*) OVERRIDE;

81 virtual void removeTextTrack(WebInbandTextTrack*) OVERRIDE;	81 virtual void removeTextTrack(WebInbandTextTrack*) OVERRIDE;

82 virtual void mediaSourceOpened(WebMediaSource*) OVERRIDE;	82 virtual void mediaSourceOpened(WebMediaSource*) OVERRIDE;

83 virtual void requestFullscreen() OVERRIDE;	83 virtual void requestFullscreen() OVERRIDE;

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

151 };	151 };

152	152

153 AudioSourceProviderImpl m_audioSourceProvider;	153 AudioSourceProviderImpl m_audioSourceProvider;

154 #endif	154 #endif

155 };	155 };

156	156

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

158	158

159 #endif	159 #endif

OLD	NEW