Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1488)

Unified Diff: media/blink/webmediaplayer_params.h

Issue 445013002: media: Optimize HW Video to 2D Canvas copy. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Rebase to ToT. Address nits Created 6 years, 2 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 side-by-side diff with in-line comments
Download patch
Index: media/blink/webmediaplayer_params.h
diff --git a/media/blink/webmediaplayer_params.h b/media/blink/webmediaplayer_params.h
index c765548d4b009b10b8ea77c98f4ea512be62ef54..682c1467124b62fe2d708bad800458194e9a071b 100644
--- a/media/blink/webmediaplayer_params.h
+++ b/media/blink/webmediaplayer_params.h
@@ -7,6 +7,7 @@
#include "base/callback.h"
#include "base/memory/ref_counted.h"
+#include "cc/output/context_provider.h"
#include "media/base/media_export.h"
#include "media/blink/encrypted_media_player_support.h"
@@ -33,6 +34,7 @@ class MEDIA_EXPORT WebMediaPlayerParams {
typedef base::Callback<scoped_ptr<EncryptedMediaPlayerSupport>(
blink::WebMediaPlayerClient*)> EncryptedMediaPlayerSupportCreateCB;
typedef base::Callback<void(const base::Closure&)> DeferLoadCB;
+ typedef base::Callback<cc::ContextProvider*()> ContextProviderCB;
// |defer_load_cb|, |audio_renderer_sink|, and |compositor_task_runner| may be
// null.
@@ -46,13 +48,12 @@ class MEDIA_EXPORT WebMediaPlayerParams {
const scoped_refptr<base::SingleThreadTaskRunner>& compositor_task_runner,
const EncryptedMediaPlayerSupportCreateCB&
encrypted_media_player_support_cb,
+ const ContextProviderCB& shared_main_thread_context_provider_cb,
blink::WebContentDecryptionModule* initial_cdm);
~WebMediaPlayerParams();
- base::Callback<void(const base::Closure&)> defer_load_cb() const {
- return defer_load_cb_;
- }
+ DeferLoadCB defer_load_cb() const { return defer_load_cb_; }
const scoped_refptr<AudioRendererSink>& audio_renderer_sink() const {
return audio_renderer_sink_;
@@ -84,8 +85,12 @@ class MEDIA_EXPORT WebMediaPlayerParams {
scoped_ptr<EncryptedMediaPlayerSupport>
CreateEncryptedMediaPlayerSupport(blink::WebMediaPlayerClient* client) const;
+ ContextProviderCB shared_main_thread_context_provider_cb() const {
+ return shared_main_thread_context_provider_cb_;
+ }
+
private:
- base::Callback<void(const base::Closure&)> defer_load_cb_;
+ DeferLoadCB defer_load_cb_;
scoped_refptr<AudioRendererSink> audio_renderer_sink_;
const AudioHardwareConfig& audio_hardware_config_;
scoped_refptr<MediaLog> media_log_;
@@ -93,6 +98,7 @@ class MEDIA_EXPORT WebMediaPlayerParams {
scoped_refptr<base::SingleThreadTaskRunner> media_task_runner_;
scoped_refptr<base::SingleThreadTaskRunner> compositor_task_runner_;
EncryptedMediaPlayerSupportCreateCB encrypted_media_player_support_cb_;
+ ContextProviderCB shared_main_thread_context_provider_cb_;
blink::WebContentDecryptionModule* initial_cdm_;
DISALLOW_IMPLICIT_CONSTRUCTORS(WebMediaPlayerParams);

Powered by Google App Engine
This is Rietveld 408576698