webkit/media/android/webmediaplayer_android.h - Issue 15937016: Update refernces to Blink's Platform API (webkit)

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 15937016: Update refernces to Blink's Platform API (webkit) (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Created 7 years, 6 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 | « webkit/media/android/media_source_delegate.cc ('k') | webkit/media/android/webmediaplayer_android.cc » ('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/memory/ref_counted.h"	11 #include "base/memory/ref_counted.h"

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

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

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

15 #include "media/base/demuxer_stream.h"	15 #include "media/base/demuxer_stream.h"

16 #include "cc/layers/video_frame_provider.h"	16 #include "cc/layers/video_frame_provider.h"

17 #include "third_party/WebKit/Source/Platform/chromium/public/WebGraphicsContext3 D.h"	17 #include "third_party/WebKit/public/platform/WebGraphicsContext3D.h"

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

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

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

21 #include "ui/gfx/rect_f.h"	21 #include "ui/gfx/rect_f.h"

22 #include "webkit/media/android/media_source_delegate.h"	22 #include "webkit/media/android/media_source_delegate.h"

23 #include "webkit/media/android/stream_texture_factory_android.h"	23 #include "webkit/media/android/stream_texture_factory_android.h"

24	24

25 namespace media {	25 namespace media {

26 class MediaLog;	26 class MediaLog;

27 }	27 }

28	28

29 namespace WebKit {	29 namespace WebKit {

(...skipping 292 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
322 double current_time_;	322 double current_time_;

323	323

324 media::MediaLog* media_log_;	324 media::MediaLog* media_log_;

325	325

326 DISALLOW_COPY_AND_ASSIGN(WebMediaPlayerAndroid);	326 DISALLOW_COPY_AND_ASSIGN(WebMediaPlayerAndroid);

327 };	327 };

328	328

329 } // namespace webkit_media	329 } // namespace webkit_media

330	330

331 #endif // WEBKIT_MEDIA_ANDROID_WEBMEDIAPLAYER_ANDROID_H_	331 #endif // WEBKIT_MEDIA_ANDROID_WEBMEDIAPLAYER_ANDROID_H_

OLD	NEW