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

Side by Side Diff: Source/WebKit/chromium/src/MediaSourcePrivateImpl.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) 2013 Google Inc. All rights reserved. 2 * Copyright (C) 2013 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 13 matching lines...) Expand all
24 * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, 24 * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
25 * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY 25 * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
26 * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT 26 * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
27 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE 27 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
28 * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 28 * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
29 */ 29 */
30 30
31 #ifndef MediaSourcePrivateImpl_h 31 #ifndef MediaSourcePrivateImpl_h
32 #define MediaSourcePrivateImpl_h 32 #define MediaSourcePrivateImpl_h
33 33
34 #if ENABLE(MEDIA_SOURCE)
35
36 #include "MediaSourcePrivate.h" 34 #include "MediaSourcePrivate.h"
37 #include <wtf/OwnPtr.h> 35 #include <wtf/OwnPtr.h>
38 36
39 namespace WebKit { 37 namespace WebKit {
40 38
41 class WebMediaSourceClient; 39 class WebMediaSourceClient;
42 40
43 class MediaSourcePrivateImpl : public WebCore::MediaSourcePrivate { 41 class MediaSourcePrivateImpl : public WebCore::MediaSourcePrivate {
44 public: 42 public:
45 explicit MediaSourcePrivateImpl(PassOwnPtr<WebMediaSourceClient>); 43 explicit MediaSourcePrivateImpl(PassOwnPtr<WebMediaSourceClient>);
46 virtual ~MediaSourcePrivateImpl() { } 44 virtual ~MediaSourcePrivateImpl() { }
47 45
48 // MediaSourcePrivate methods. 46 // MediaSourcePrivate methods.
49 virtual WebCore::MediaSourcePrivate::AddStatus addSourceBuffer(const String& type, const CodecsArray&, 47 virtual WebCore::MediaSourcePrivate::AddStatus addSourceBuffer(const String& type, const CodecsArray&,
50 OwnPtr<WebCore::SourceBufferPrivate>*); 48 OwnPtr<WebCore::SourceBufferPrivate>*);
51 virtual double duration(); 49 virtual double duration();
52 virtual void setDuration(double); 50 virtual void setDuration(double);
53 virtual void endOfStream(WebCore::MediaSourcePrivate::EndOfStreamStatus); 51 virtual void endOfStream(WebCore::MediaSourcePrivate::EndOfStreamStatus);
54 52
55 private: 53 private:
56 OwnPtr<WebKit::WebMediaSourceClient> m_client; 54 OwnPtr<WebKit::WebMediaSourceClient> m_client;
57 }; 55 };
58 56
59 } 57 }
60 58
61 #endif 59 #endif
62
63 #endif
OLDNEW
« no previous file with comments | « Source/WebKit/chromium/src/AssertMatchingEnums.cpp ('k') | Source/WebKit/chromium/src/MediaSourcePrivateImpl.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698