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

Side by Side Diff: webkit/media/android/webmediaplayer_impl_android.h

Issue 11754003: Move VideoFrameProvider to, and remove all usage of WebVideoFrame from cc/ (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: rebase Created 7 years, 11 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
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #ifndef WEBKIT_MEDIA_ANDROID_WEBMEDIAPLAYER_IMPL_ANDROID_H_ 5 #ifndef WEBKIT_MEDIA_ANDROID_WEBMEDIAPLAYER_IMPL_ANDROID_H_
6 #define WEBKIT_MEDIA_ANDROID_WEBMEDIAPLAYER_IMPL_ANDROID_H_ 6 #define WEBKIT_MEDIA_ANDROID_WEBMEDIAPLAYER_IMPL_ANDROID_H_
7 7
8 #include <string> 8 #include <string>
9 9
10 #include <jni.h> 10 #include <jni.h>
11 11
12 #include "base/basictypes.h" 12 #include "base/basictypes.h"
13 #include "base/memory/scoped_ptr.h" 13 #include "base/memory/scoped_ptr.h"
14 #include "third_party/WebKit/Source/WebKit/chromium/public/WebMediaPlayer.h" 14 #include "third_party/WebKit/Source/WebKit/chromium/public/WebMediaPlayer.h"
15 #include "third_party/WebKit/Source/WebKit/chromium/public/WebVideoFrame.h"
16 #include "third_party/WebKit/Source/WebKit/chromium/public/platform/WebSize.h" 15 #include "third_party/WebKit/Source/WebKit/chromium/public/platform/WebSize.h"
17 #include "third_party/WebKit/Source/WebKit/chromium/public/platform/WebURL.h" 16 #include "third_party/WebKit/Source/WebKit/chromium/public/platform/WebURL.h"
18 #include "webkit/media/android/webmediaplayer_android.h" 17 #include "webkit/media/android/webmediaplayer_android.h"
19 18
20 namespace WebKit { 19 namespace WebKit {
21 class WebFrame; 20 class WebFrame;
22 } 21 }
23 22
24 namespace webkit_media { 23 namespace webkit_media {
25 24
(...skipping 55 matching lines...) Expand 10 before | Expand all | Expand 10 after
81 // process, it will regularly update the |current_time_| by calling 80 // process, it will regularly update the |current_time_| by calling
82 // OnTimeUpdate(). 81 // OnTimeUpdate().
83 float current_time_; 82 float current_time_;
84 83
85 DISALLOW_COPY_AND_ASSIGN(WebMediaPlayerImplAndroid); 84 DISALLOW_COPY_AND_ASSIGN(WebMediaPlayerImplAndroid);
86 }; 85 };
87 86
88 } // namespace webkit_media 87 } // namespace webkit_media
89 88
90 #endif // WEBKIT_MEDIA_ANDROID_WEBMEDIAPLAYER_IMPL_ANDROID_H_ 89 #endif // WEBKIT_MEDIA_ANDROID_WEBMEDIAPLAYER_IMPL_ANDROID_H_
OLDNEW
« no previous file with comments | « webkit/media/android/webmediaplayer_android.cc ('k') | webkit/media/android/webmediaplayer_in_process_android.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698