webkit/media/android/webmediaplayer_android.h - Issue 11961018: Update some #includes in webkit/media/android for headers that were moved from WebKit/chromium/publ…

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_android.h

Issue 11961018: Update some #includes in webkit/media/android for headers that were moved from WebKit/chromium/publ… (Closed) Base URL: http://src.chromium.org/svn/trunk/src/

Patch Set: 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

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

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_ANDROID_H_	5 #ifndef WEBKIT_MEDIA_ANDROID_WEBMEDIAPLAYER_ANDROID_H_

6 #define WEBKIT_MEDIA_ANDROID_WEBMEDIAPLAYER_ANDROID_H_	6 #define WEBKIT_MEDIA_ANDROID_WEBMEDIAPLAYER_ANDROID_H_

7	7

8 #include <jni.h>	8 #include <jni.h>

9	9

10 #include "base/basictypes.h"	10 #include "base/basictypes.h"

11 #include "base/message_loop.h"	11 #include "base/message_loop.h"

12 #include "base/memory/scoped_ptr.h"	12 #include "base/memory/scoped_ptr.h"

13 #include "base/time.h"	13 #include "base/time.h"

	14 #include "third_party/WebKit/Source/Platform/chromium/public/WebSize.h"

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

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

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

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

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

18	18

19 namespace webkit_media {	19 namespace webkit_media {

20	20

21 class StreamTextureFactory;	21 class StreamTextureFactory;

22 class StreamTextureProxy;	22 class StreamTextureProxy;

23 class WebMediaPlayerManagerAndroid;	23 class WebMediaPlayerManagerAndroid;

24	24

25 // An abstract class that serves as the common base class for implementing	25 // An abstract class that serves as the common base class for implementing

26 // WebKit::WebMediaPlayer on Android.	26 // WebKit::WebMediaPlayer on Android.

27 class WebMediaPlayerAndroid	27 class WebMediaPlayerAndroid

(...skipping 206 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
234 // Object for calling back the compositor thread to repaint the video when a	234 // Object for calling back the compositor thread to repaint the video when a

235 // frame available. It should be initialized on the compositor thread.	235 // frame available. It should be initialized on the compositor thread.

236 scoped_ptr<StreamTextureProxy> stream_texture_proxy_;	236 scoped_ptr<StreamTextureProxy> stream_texture_proxy_;

237	237

238 DISALLOW_COPY_AND_ASSIGN(WebMediaPlayerAndroid);	238 DISALLOW_COPY_AND_ASSIGN(WebMediaPlayerAndroid);

239 };	239 };

240	240

241 } // namespace webkit_media	241 } // namespace webkit_media

242	242

243 #endif // WEBKIT_MEDIA_ANDROID_WEBMEDIAPLAYER_ANDROID_H_	243 #endif // WEBKIT_MEDIA_ANDROID_WEBMEDIAPLAYER_ANDROID_H_

OLD	NEW