content/renderer/media/android/webmediaplayer_android.h - Issue 1083683003: Speculative revert by sheriff

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: content/renderer/media/android/webmediaplayer_android.h

Issue 1083683003: Speculative revert by sheriff (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Removed an unrelated commit that had accidentally slipped in. Created 5 years, 8 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: content/renderer/media/android/webmediaplayer_android.h

diff --git a/content/renderer/media/android/webmediaplayer_android.h b/content/renderer/media/android/webmediaplayer_android.h

index 5d5f6539fb03516a2f9f463771e33070b325e3ba..c1e301011da7c6b01a08f0ed1d6b65cf6c633ebc 100644

--- a/content/renderer/media/android/webmediaplayer_android.h

+++ b/content/renderer/media/android/webmediaplayer_android.h

@@ -185,10 +185,8 @@ class WebMediaPlayerAndroid : public blink::WebMediaPlayer,

// compositor thread.

void SetVideoFrameProviderClient(

cc::VideoFrameProvider::Client* client) override;

- bool UpdateCurrentFrame(base::TimeTicks deadline_min,

- base::TimeTicks deadline_max) override;

scoped_refptr<media::VideoFrame> GetCurrentFrame() override;

- void PutCurrentFrame() override;

+ void PutCurrentFrame(const scoped_refptr<media::VideoFrame>& frame) override;

// Media player callback handlers.

void OnMediaMetadataChanged(const base::TimeDelta& duration, int width,