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

Side by Side Diff: Source/WebKit/chromium/src/WebMediaPlayerClientImpl.h

Issue 13674022: Remove MEDIA_SOURCE feature define. (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@blink-master
Patch Set: Rebase Created 7 years, 8 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
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 69 matching lines...) Expand 10 before | Expand all | Expand 10 after
80 virtual void keyError(const WebString& keySystem, const WebString& sessionId , MediaKeyErrorCode, unsigned short systemCode); 80 virtual void keyError(const WebString& keySystem, const WebString& sessionId , MediaKeyErrorCode, unsigned short systemCode);
81 virtual void keyMessage(const WebString& keySystem, const WebString& session Id, const unsigned char* message, unsigned messageLength, const WebURL& defaultU RL); 81 virtual void keyMessage(const WebString& keySystem, const WebString& session Id, const unsigned char* message, unsigned messageLength, const WebURL& defaultU RL);
82 virtual void keyNeeded(const WebString& keySystem, const WebString& sessionI d, const unsigned char* initData, unsigned initDataLength); 82 virtual void keyNeeded(const WebString& keySystem, const WebString& sessionI d, const unsigned char* initData, unsigned initDataLength);
83 virtual WebPlugin* createHelperPlugin(const WebString& pluginType, WebFrame* ); 83 virtual WebPlugin* createHelperPlugin(const WebString& pluginType, WebFrame* );
84 virtual void closeHelperPlugin(); 84 virtual void closeHelperPlugin();
85 virtual bool needsWebLayerForVideo() const; 85 virtual bool needsWebLayerForVideo() const;
86 virtual void setWebLayer(WebLayer*); 86 virtual void setWebLayer(WebLayer*);
87 87
88 // MediaPlayerPrivateInterface methods: 88 // MediaPlayerPrivateInterface methods:
89 virtual void load(const WTF::String& url); 89 virtual void load(const WTF::String& url);
90 #if ENABLE(MEDIA_SOURCE)
91 virtual void load(const WTF::String& url, PassRefPtr<WebCore::MediaSource>); 90 virtual void load(const WTF::String& url, PassRefPtr<WebCore::MediaSource>);
92 #endif 91
93 virtual void cancelLoad(); 92 virtual void cancelLoad();
94 #if USE(ACCELERATED_COMPOSITING) 93 #if USE(ACCELERATED_COMPOSITING)
95 virtual WebKit::WebLayer* platformLayer() const; 94 virtual WebKit::WebLayer* platformLayer() const;
96 #endif 95 #endif
97 virtual WebCore::PlatformMedia platformMedia() const; 96 virtual WebCore::PlatformMedia platformMedia() const;
98 virtual void play(); 97 virtual void play();
99 virtual void pause(); 98 virtual void pause();
100 virtual void prepareToPlay(); 99 virtual void prepareToPlay();
101 virtual bool supportsFullscreen() const; 100 virtual bool supportsFullscreen() const;
102 virtual bool supportsSave() const; 101 virtual bool supportsSave() const;
(...skipping 119 matching lines...) Expand 10 before | Expand all | Expand 10 after
222 virtual void provideInput(WebCore::AudioBus*, size_t framesToProcess); 221 virtual void provideInput(WebCore::AudioBus*, size_t framesToProcess);
223 222
224 private: 223 private:
225 WebAudioSourceProvider* m_webAudioSourceProvider; 224 WebAudioSourceProvider* m_webAudioSourceProvider;
226 OwnPtr<AudioClientImpl> m_client; 225 OwnPtr<AudioClientImpl> m_client;
227 }; 226 };
228 227
229 AudioSourceProviderImpl m_audioSourceProvider; 228 AudioSourceProviderImpl m_audioSourceProvider;
230 #endif 229 #endif
231 230
232 #if ENABLE(MEDIA_SOURCE)
233 RefPtr<WebCore::MediaSource> m_mediaSource; 231 RefPtr<WebCore::MediaSource> m_mediaSource;
234 #endif
235 }; 232 };
236 233
237 } // namespace WebKit 234 } // namespace WebKit
238 235
239 #endif 236 #endif
240 237
241 #endif 238 #endif
OLDNEW
« no previous file with comments | « Source/WebKit/chromium/src/SourceBufferPrivateImpl.cpp ('k') | Source/WebKit/chromium/src/WebMediaPlayerClientImpl.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698