webkit/media/android/webmediaplayer_in_process_android.h - Issue 11754003: Move VideoFrameProvider to, and remove all usage of WebVideoFrame from cc/

Side by Side Diff

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Side by Side Diff: webkit/media/android/webmediaplayer_in_process_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

OLD	NEW
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_IN_PROCESS_ANDROID_H_	5 #ifndef WEBKIT_MEDIA_ANDROID_WEBMEDIAPLAYER_IN_PROCESS_ANDROID_H_

6 #define WEBKIT_MEDIA_ANDROID_WEBMEDIAPLAYER_IN_PROCESS_ANDROID_H_	6 #define WEBKIT_MEDIA_ANDROID_WEBMEDIAPLAYER_IN_PROCESS_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 "media/base/android/cookie_getter.h"	14 #include "media/base/android/cookie_getter.h"

15 #include "third_party/WebKit/Source/WebKit/chromium/public/WebMediaPlayer.h"	15 #include "third_party/WebKit/Source/WebKit/chromium/public/WebMediaPlayer.h"

16 #include "third_party/WebKit/Source/WebKit/chromium/public/WebVideoFrame.h"

17 #include "third_party/WebKit/Source/WebKit/chromium/public/platform/WebSize.h"	16 #include "third_party/WebKit/Source/WebKit/chromium/public/platform/WebSize.h"

18 #include "third_party/WebKit/Source/WebKit/chromium/public/platform/WebURL.h"	17 #include "third_party/WebKit/Source/WebKit/chromium/public/platform/WebURL.h"

19 #include "webkit/media/android/webmediaplayer_android.h"	18 #include "webkit/media/android/webmediaplayer_android.h"

20	19

21 namespace WebKit {	20 namespace WebKit {

22 class WebCookieJar;	21 class WebCookieJar;

23 class WebFrame;	22 class WebFrame;

24 }	23 }

25	24

26 namespace media {	25 namespace media {

(...skipping 82 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
109	108

110 // Whether we should disable history logging.	109 // Whether we should disable history logging.

111 bool disable_history_logging_;	110 bool disable_history_logging_;

112	111

113 DISALLOW_COPY_AND_ASSIGN(WebMediaPlayerInProcessAndroid);	112 DISALLOW_COPY_AND_ASSIGN(WebMediaPlayerInProcessAndroid);

114 };	113 };

115	114

116 } // namespace webkit_media	115 } // namespace webkit_media

117	116

118 #endif // WEBKIT_MEDIA_ANDROID_WEBMEDIAPLAYER_IN_PROCESS_ANDROID_H_	117 #endif // WEBKIT_MEDIA_ANDROID_WEBMEDIAPLAYER_IN_PROCESS_ANDROID_H_

OLD	NEW

« no previous file with comments | « webkit/media/android/webmediaplayer_impl_android.h ('k') | webkit/media/webmediaplayer_impl.cc » ('j') | no next file with comments »