media/base/android/media_codec_player.h - Issue 1998723002: Move code in ui/gl/* from gfx:: to gl::

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

Unified Diff: media/base/android/media_codec_player.h

Issue 1998723002: Move code in ui/gl/* from gfx:: to gl:: (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Rebase Created 4 years, 7 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:

Index: media/base/android/media_codec_player.h

diff --git a/media/base/android/media_codec_player.h b/media/base/android/media_codec_player.h

index 94d1c7f4548cd9b1dc338f8092f9a842cd9a3259..ef98691a45f933c00856bcb6bbc261504765038d 100644

--- a/media/base/android/media_codec_player.h

+++ b/media/base/android/media_codec_player.h

@@ -201,7 +201,7 @@ class MEDIA_EXPORT MediaCodecPlayer : public MediaPlayerAndroid,

// MediaPlayerAndroid implementation.

void DeleteOnCorrectThread() override;

- void SetVideoSurface(gfx::ScopedJavaSurface surface) override;

+ void SetVideoSurface(gl::ScopedJavaSurface surface) override;

void Start() override;

void Pause(bool is_media_related_action) override;

void SeekTo(base::TimeDelta timestamp) override;

@@ -382,7 +382,7 @@ class MEDIA_EXPORT MediaCodecPlayer : public MediaPlayerAndroid,

TimeDeltaInterpolator interpolator_;

// Pending data to be picked up by the upcoming state.

- gfx::ScopedJavaSurface pending_surface_;

+ gl::ScopedJavaSurface pending_surface_;

bool pending_start_;

base::TimeDelta pending_seek_;