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

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

Issue 1230533002: Fix virtual/override/final usage in Source/web/. (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Created 5 years, 5 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 | Annotate | Revision Log
« no previous file with comments | « Source/web/WebLocalFrameImpl.cpp ('k') | Source/web/WebPagePopupImpl.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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 37 matching lines...) Expand 10 before | Expand all | Expand 10 after
48 class WebAudioSourceProvider; 48 class WebAudioSourceProvider;
49 class WebMediaPlayer; 49 class WebMediaPlayer;
50 50
51 // This class serves as a bridge between MediaPlayer and 51 // This class serves as a bridge between MediaPlayer and
52 // WebMediaPlayer. 52 // WebMediaPlayer.
53 class WebMediaPlayerClientImpl final : public MediaPlayer, public WebMediaPlayer Client { 53 class WebMediaPlayerClientImpl final : public MediaPlayer, public WebMediaPlayer Client {
54 54
55 public: 55 public:
56 static PassOwnPtr<MediaPlayer> create(MediaPlayerClient*); 56 static PassOwnPtr<MediaPlayer> create(MediaPlayerClient*);
57 57
58 virtual ~WebMediaPlayerClientImpl(); 58 ~WebMediaPlayerClientImpl() override;
59 59
60 // WebMediaPlayerClient methods: 60 // WebMediaPlayerClient methods:
61 virtual void networkStateChanged() override; 61 void networkStateChanged() override;
62 virtual void readyStateChanged() override; 62 void readyStateChanged() override;
63 virtual void timeChanged() override; 63 void timeChanged() override;
64 virtual void repaint() override; 64 void repaint() override;
65 virtual void durationChanged() override; 65 void durationChanged() override;
66 virtual void sizeChanged() override; 66 void sizeChanged() override;
67 virtual void playbackStateChanged() override; 67 void playbackStateChanged() override;
68 68
69 // WebEncryptedMediaPlayerClient methods: 69 // WebEncryptedMediaPlayerClient methods:
70 virtual void keyAdded(const WebString& keySystem, const WebString& sessionId ) override; 70 void keyAdded(const WebString& keySystem, const WebString& sessionId) overri de;
71 virtual void keyError(const WebString& keySystem, const WebString& sessionId , MediaKeyErrorCode, unsigned short systemCode) override; 71 void keyError(const WebString& keySystem, const WebString& sessionId, MediaK eyErrorCode, 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 void keyMessage(const WebString& keySystem, const WebString& sessionId, cons t unsigned char* message, unsigned messageLength, const WebURL& defaultURL) over ride;
73 virtual void encrypted(WebEncryptedMediaInitDataType, const unsigned char* i nitData, unsigned initDataLength) override; 73 void encrypted(WebEncryptedMediaInitDataType, const unsigned char* initData, unsigned initDataLength) override;
74 virtual void didBlockPlaybackWaitingForKey() override; 74 void didBlockPlaybackWaitingForKey() override;
75 virtual void didResumePlaybackBlockedForKey() override; 75 void didResumePlaybackBlockedForKey() override;
76 76
77 virtual void setWebLayer(WebLayer*) override; 77 void setWebLayer(WebLayer*) override;
78 virtual WebMediaPlayer::TrackId addAudioTrack(const WebString& id, AudioTrac kKind, const WebString& label, const WebString& language, bool enabled) override ; 78 WebMediaPlayer::TrackId addAudioTrack(const WebString& id, AudioTrackKind, c onst WebString& label, const WebString& language, bool enabled) override;
79 virtual void removeAudioTrack(WebMediaPlayer::TrackId) override; 79 void removeAudioTrack(WebMediaPlayer::TrackId) override;
80 virtual WebMediaPlayer::TrackId addVideoTrack(const WebString& id, VideoTrac kKind, const WebString& label, const WebString& language, bool selected) overrid e; 80 WebMediaPlayer::TrackId addVideoTrack(const WebString& id, VideoTrackKind, c onst WebString& label, const WebString& language, bool selected) override;
81 virtual void removeVideoTrack(WebMediaPlayer::TrackId) override; 81 void removeVideoTrack(WebMediaPlayer::TrackId) override;
82 virtual void addTextTrack(WebInbandTextTrack*) override; 82 void addTextTrack(WebInbandTextTrack*) override;
83 virtual void removeTextTrack(WebInbandTextTrack*) override; 83 void removeTextTrack(WebInbandTextTrack*) override;
84 virtual void mediaSourceOpened(WebMediaSource*) override; 84 void mediaSourceOpened(WebMediaSource*) override;
85 virtual void requestSeek(double) override; 85 void requestSeek(double) override;
86 virtual void remoteRouteAvailabilityChanged(bool) override; 86 void remoteRouteAvailabilityChanged(bool) override;
87 virtual void connectedToRemoteDevice() override; 87 void connectedToRemoteDevice() override;
88 virtual void disconnectedFromRemoteDevice() override; 88 void disconnectedFromRemoteDevice() override;
89 89
90 // MediaPlayer methods: 90 // MediaPlayer methods:
91 virtual WebMediaPlayer* webMediaPlayer() const override; 91 WebMediaPlayer* webMediaPlayer() const override;
92 virtual void load(WebMediaPlayer::LoadType, const WTF::String& url, WebMedia Player::CORSMode) override; 92 void load(WebMediaPlayer::LoadType, const WTF::String& url, WebMediaPlayer:: CORSMode) override;
93 virtual void setPreload(MediaPlayer::Preload) override; 93 void setPreload(MediaPlayer::Preload) override;
94 94
95 #if ENABLE(WEB_AUDIO) 95 #if ENABLE(WEB_AUDIO)
96 virtual AudioSourceProvider* audioSourceProvider() override; 96 AudioSourceProvider* audioSourceProvider() override;
97 #endif 97 #endif
98 98
99 private: 99 private:
100 explicit WebMediaPlayerClientImpl(MediaPlayerClient*); 100 explicit WebMediaPlayerClientImpl(MediaPlayerClient*);
101 101
102 HTMLMediaElement& mediaElement() const; 102 HTMLMediaElement& mediaElement() const;
103 103
104 MediaPlayerClient* m_client; 104 MediaPlayerClient* m_client;
105 OwnPtr<WebMediaPlayer> m_webMediaPlayer; 105 OwnPtr<WebMediaPlayer> m_webMediaPlayer;
106 106
107 #if ENABLE(WEB_AUDIO) 107 #if ENABLE(WEB_AUDIO)
108 // AudioClientImpl wraps an AudioSourceProviderClient. 108 // AudioClientImpl wraps an AudioSourceProviderClient.
109 // When the audio format is known, Chromium calls setFormat() which then dis patches into WebCore. 109 // When the audio format is known, Chromium calls setFormat() which then dis patches into WebCore.
110 110
111 class AudioClientImpl final : public GarbageCollectedFinalized<AudioClientIm pl>, public WebAudioSourceProviderClient { 111 class AudioClientImpl final : public GarbageCollectedFinalized<AudioClientIm pl>, public WebAudioSourceProviderClient {
112 public: 112 public:
113 explicit AudioClientImpl(AudioSourceProviderClient* client) 113 explicit AudioClientImpl(AudioSourceProviderClient* client)
114 : m_client(client) 114 : m_client(client)
115 { 115 {
116 } 116 }
117 117
118 virtual ~AudioClientImpl() { } 118 ~AudioClientImpl() override { }
119 119
120 // WebAudioSourceProviderClient 120 // WebAudioSourceProviderClient
121 virtual void setFormat(size_t numberOfChannels, float sampleRate) overri de; 121 void setFormat(size_t numberOfChannels, float sampleRate) override;
122 122
123 DECLARE_TRACE(); 123 DECLARE_TRACE();
124 124
125 private: 125 private:
126 Member<AudioSourceProviderClient> m_client; 126 Member<AudioSourceProviderClient> m_client;
127 }; 127 };
128 128
129 // AudioSourceProviderImpl wraps a WebAudioSourceProvider. 129 // AudioSourceProviderImpl wraps a WebAudioSourceProvider.
130 // provideInput() calls into Chromium to get a rendered audio stream. 130 // provideInput() calls into Chromium to get a rendered audio stream.
131 131
132 class AudioSourceProviderImpl final : public AudioSourceProvider { 132 class AudioSourceProviderImpl final : public AudioSourceProvider {
133 public: 133 public:
134 AudioSourceProviderImpl() 134 AudioSourceProviderImpl()
135 : m_webAudioSourceProvider(0) 135 : m_webAudioSourceProvider(0)
136 { 136 {
137 } 137 }
138 138
139 virtual ~AudioSourceProviderImpl() { } 139 ~AudioSourceProviderImpl() override { }
140 140
141 // Wraps the given WebAudioSourceProvider. 141 // Wraps the given WebAudioSourceProvider.
142 void wrap(WebAudioSourceProvider*); 142 void wrap(WebAudioSourceProvider*);
143 143
144 // AudioSourceProvider 144 // AudioSourceProvider
145 virtual void setClient(AudioSourceProviderClient*) override; 145 void setClient(AudioSourceProviderClient*) override;
146 virtual void provideInput(AudioBus*, size_t framesToProcess) override; 146 void provideInput(AudioBus*, size_t framesToProcess) override;
147 147
148 private: 148 private:
149 WebAudioSourceProvider* m_webAudioSourceProvider; 149 WebAudioSourceProvider* m_webAudioSourceProvider;
150 Persistent<AudioClientImpl> m_client; 150 Persistent<AudioClientImpl> m_client;
151 Mutex provideInputLock; 151 Mutex provideInputLock;
152 }; 152 };
153 153
154 AudioSourceProviderImpl m_audioSourceProvider; 154 AudioSourceProviderImpl m_audioSourceProvider;
155 #endif 155 #endif
156 }; 156 };
157 157
158 } // namespace blink 158 } // namespace blink
159 159
160 #endif 160 #endif
OLDNEW
« no previous file with comments | « Source/web/WebLocalFrameImpl.cpp ('k') | Source/web/WebPagePopupImpl.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698