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

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

Issue 60083011: Remove InbandTextTrackPrivate/InbandTextTrackPrivateClient (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: rebase on top of https://codereview.chromium.org/61763010/ Created 7 years, 1 month 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
« no previous file with comments | « Source/web/InbandTextTrackPrivateImpl.cpp ('k') | 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 16 matching lines...) Expand all
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 WebMediaPlayerClientImpl_h 31 #ifndef WebMediaPlayerClientImpl_h
32 #define WebMediaPlayerClientImpl_h 32 #define WebMediaPlayerClientImpl_h
33 33
34 #include "WebAudioSourceProviderClient.h" 34 #include "WebAudioSourceProviderClient.h"
35 #include "WebMediaPlayerClient.h" 35 #include "WebMediaPlayerClient.h"
36 #include "platform/audio/AudioSourceProvider.h" 36 #include "platform/audio/AudioSourceProvider.h"
37 #include "platform/graphics/media/InbandTextTrackPrivate.h"
38 #include "platform/graphics/media/MediaPlayer.h" 37 #include "platform/graphics/media/MediaPlayer.h"
39 #if OS(ANDROID) 38 #if OS(ANDROID)
40 #include "third_party/skia/include/core/SkBitmap.h" 39 #include "third_party/skia/include/core/SkBitmap.h"
41 #include "third_party/skia/include/core/SkRefCnt.h" 40 #include "third_party/skia/include/core/SkRefCnt.h"
42 #include "third_party/skia/include/gpu/GrTexture.h" 41 #include "third_party/skia/include/gpu/GrTexture.h"
43 #endif 42 #endif
44 #include "weborigin/KURL.h" 43 #include "weborigin/KURL.h"
45 #include "wtf/OwnPtr.h" 44 #include "wtf/OwnPtr.h"
46 #include "wtf/PassOwnPtr.h" 45 #include "wtf/PassOwnPtr.h"
47 #include "wtf/ThreadingPrimitives.h" 46 #include "wtf/ThreadingPrimitives.h"
(...skipping 177 matching lines...) Expand 10 before | Expand all | Expand 10 after
225 224
226 AudioSourceProviderImpl m_audioSourceProvider; 225 AudioSourceProviderImpl m_audioSourceProvider;
227 #endif 226 #endif
228 227
229 RefPtr<WebCore::HTMLMediaSource> m_mediaSource; 228 RefPtr<WebCore::HTMLMediaSource> m_mediaSource;
230 }; 229 };
231 230
232 } // namespace blink 231 } // namespace blink
233 232
234 #endif 233 #endif
OLDNEW
« no previous file with comments | « Source/web/InbandTextTrackPrivateImpl.cpp ('k') | Source/web/WebMediaPlayerClientImpl.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698