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

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

Issue 455453002: Remove WebMediaPlayerClient::preload() and volume() (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Created 6 years, 4 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 | « no previous file | Source/web/WebMediaPlayerClientImpl.cpp » ('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 49 matching lines...) Expand 10 before | Expand all | Expand 10 after
60 60
61 virtual ~WebMediaPlayerClientImpl(); 61 virtual ~WebMediaPlayerClientImpl();
62 62
63 // WebMediaPlayerClient methods: 63 // WebMediaPlayerClient methods:
64 virtual void networkStateChanged() OVERRIDE; 64 virtual void networkStateChanged() OVERRIDE;
65 virtual void readyStateChanged() OVERRIDE; 65 virtual void readyStateChanged() OVERRIDE;
66 virtual void timeChanged() OVERRIDE; 66 virtual void timeChanged() OVERRIDE;
67 virtual void repaint() OVERRIDE; 67 virtual void repaint() OVERRIDE;
68 virtual void durationChanged() OVERRIDE; 68 virtual void durationChanged() OVERRIDE;
69 virtual void sizeChanged() OVERRIDE; 69 virtual void sizeChanged() OVERRIDE;
70 virtual double volume() const OVERRIDE;
71 virtual void playbackStateChanged() OVERRIDE; 70 virtual void playbackStateChanged() OVERRIDE;
72 virtual WebMediaPlayer::Preload preload() const OVERRIDE;
73 71
74 // WebEncryptedMediaPlayerClient methods: 72 // WebEncryptedMediaPlayerClient methods:
75 virtual void keyAdded(const WebString& keySystem, const WebString& sessionId ) OVERRIDE; 73 virtual void keyAdded(const WebString& keySystem, const WebString& sessionId ) OVERRIDE;
76 virtual void keyError(const WebString& keySystem, const WebString& sessionId , MediaKeyErrorCode, unsigned short systemCode) OVERRIDE; 74 virtual void keyError(const WebString& keySystem, const WebString& sessionId , MediaKeyErrorCode, unsigned short systemCode) OVERRIDE;
77 virtual void keyMessage(const WebString& keySystem, const WebString& session Id, const unsigned char* message, unsigned messageLength, const WebURL& defaultU RL) OVERRIDE; 75 virtual void keyMessage(const WebString& keySystem, const WebString& session Id, const unsigned char* message, unsigned messageLength, const WebURL& defaultU RL) OVERRIDE;
78 virtual void keyNeeded(const WebString& contentType, const unsigned char* in itData, unsigned initDataLength) OVERRIDE; 76 virtual void keyNeeded(const WebString& contentType, const unsigned char* in itData, unsigned initDataLength) OVERRIDE;
79 77
80 virtual void setWebLayer(WebLayer*) OVERRIDE; 78 virtual void setWebLayer(WebLayer*) OVERRIDE;
81 virtual WebMediaPlayer::TrackId addAudioTrack(const WebString& id, AudioTrac kKind, const WebString& label, const WebString& language, bool enabled) OVERRIDE ; 79 virtual WebMediaPlayer::TrackId addAudioTrack(const WebString& id, AudioTrac kKind, const WebString& label, const WebString& language, bool enabled) OVERRIDE ;
82 virtual void removeAudioTrack(WebMediaPlayer::TrackId) OVERRIDE; 80 virtual void removeAudioTrack(WebMediaPlayer::TrackId) OVERRIDE;
(...skipping 14 matching lines...) Expand all
97 virtual blink::AudioSourceProvider* audioSourceProvider() OVERRIDE; 95 virtual blink::AudioSourceProvider* audioSourceProvider() OVERRIDE;
98 #endif 96 #endif
99 97
100 private: 98 private:
101 explicit WebMediaPlayerClientImpl(blink::MediaPlayerClient*); 99 explicit WebMediaPlayerClientImpl(blink::MediaPlayerClient*);
102 100
103 blink::HTMLMediaElement& mediaElement() const; 101 blink::HTMLMediaElement& mediaElement() const;
104 102
105 blink::MediaPlayerClient* m_client; 103 blink::MediaPlayerClient* m_client;
106 OwnPtr<WebMediaPlayer> m_webMediaPlayer; 104 OwnPtr<WebMediaPlayer> m_webMediaPlayer;
107 blink::MediaPlayer::Preload m_preload;
108 105
109 #if ENABLE(WEB_AUDIO) 106 #if ENABLE(WEB_AUDIO)
110 // AudioClientImpl wraps an AudioSourceProviderClient. 107 // AudioClientImpl wraps an AudioSourceProviderClient.
111 // When the audio format is known, Chromium calls setFormat() which then dis patches into WebCore. 108 // When the audio format is known, Chromium calls setFormat() which then dis patches into WebCore.
112 109
113 class AudioClientImpl FINAL : public NoBaseWillBeGarbageCollectedFinalized<A udioClientImpl>, public blink::WebAudioSourceProviderClient { 110 class AudioClientImpl FINAL : public NoBaseWillBeGarbageCollectedFinalized<A udioClientImpl>, public blink::WebAudioSourceProviderClient {
114 public: 111 public:
115 explicit AudioClientImpl(blink::AudioSourceProviderClient* client) 112 explicit AudioClientImpl(blink::AudioSourceProviderClient* client)
116 : m_client(client) 113 : m_client(client)
117 { 114 {
(...skipping 35 matching lines...) Expand 10 before | Expand all | Expand 10 after
153 Mutex provideInputLock; 150 Mutex provideInputLock;
154 }; 151 };
155 152
156 AudioSourceProviderImpl m_audioSourceProvider; 153 AudioSourceProviderImpl m_audioSourceProvider;
157 #endif 154 #endif
158 }; 155 };
159 156
160 } // namespace blink 157 } // namespace blink
161 158
162 #endif 159 #endif
OLDNEW
« no previous file with comments | « no previous file | Source/web/WebMediaPlayerClientImpl.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698