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

Side by Side Diff: Source/WebKit/chromium/src/MediaSourcePrivateImpl.cpp

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 #include "config.h" 31 #include "config.h"
32 #include "MediaSourcePrivateImpl.h" 32 #include "MediaSourcePrivateImpl.h"
33 33
34 #if ENABLE(MEDIA_SOURCE)
35
36 #include "SourceBufferPrivateImpl.h" 34 #include "SourceBufferPrivateImpl.h"
37 #include "WebMediaSourceClient.h" 35 #include "WebMediaSourceClient.h"
38 #include "WebSourceBuffer.h" 36 #include "WebSourceBuffer.h"
39 #include <wtf/PassOwnPtr.h> 37 #include <wtf/PassOwnPtr.h>
40 #include <wtf/text/WTFString.h> 38 #include <wtf/text/WTFString.h>
41 39
42 namespace WebKit { 40 namespace WebKit {
43 41
44 MediaSourcePrivateImpl::MediaSourcePrivateImpl(PassOwnPtr<WebKit::WebMediaSource Client> client) 42 MediaSourcePrivateImpl::MediaSourcePrivateImpl(PassOwnPtr<WebKit::WebMediaSource Client> client)
45 : m_client(client) 43 : m_client(client)
(...skipping 30 matching lines...) Expand all
76 m_client->setDuration(duration); 74 m_client->setDuration(duration);
77 } 75 }
78 76
79 void MediaSourcePrivateImpl::endOfStream(WebCore::MediaSourcePrivate::EndOfStrea mStatus status) 77 void MediaSourcePrivateImpl::endOfStream(WebCore::MediaSourcePrivate::EndOfStrea mStatus status)
80 { 78 {
81 if (m_client) 79 if (m_client)
82 m_client->endOfStream(static_cast<WebMediaSourceClient::EndOfStreamStatu s>(status)); 80 m_client->endOfStream(static_cast<WebMediaSourceClient::EndOfStreamStatu s>(status));
83 } 81 }
84 82
85 } 83 }
86
87 #endif
OLDNEW
« no previous file with comments | « Source/WebKit/chromium/src/MediaSourcePrivateImpl.h ('k') | Source/WebKit/chromium/src/SourceBufferPrivateImpl.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698