Index: media/blink/webmediaplayer_impl.h |
diff --git a/media/blink/webmediaplayer_impl.h b/media/blink/webmediaplayer_impl.h |
index bec5747e5eb849e91e1b381386c9324493b04671..377d1e9340cb2ba079910936a75e2b18efdd43cf 100644 |
--- a/media/blink/webmediaplayer_impl.h |
+++ b/media/blink/webmediaplayer_impl.h |
@@ -22,15 +22,16 @@ |
#include "media/blink/buffered_data_source.h" |
#include "media/blink/buffered_data_source_host_impl.h" |
#include "media/blink/video_frame_compositor.h" |
+#include "media/blink/webmediaplayer_params.h" |
#include "media/filters/skcanvas_video_renderer.h" |
#include "third_party/WebKit/public/platform/WebAudioSourceProvider.h" |
#include "third_party/WebKit/public/platform/WebContentDecryptionModuleResult.h" |
-#include "third_party/WebKit/public/platform/WebGraphicsContext3D.h" |
#include "third_party/WebKit/public/platform/WebMediaPlayer.h" |
#include "third_party/WebKit/public/platform/WebMediaPlayerClient.h" |
#include "url/gurl.h" |
namespace blink { |
+class WebGraphicsContext3D; |
class WebLocalFrame; |
} |
@@ -52,7 +53,6 @@ class MediaLog; |
class VideoFrameCompositor; |
class WebAudioSourceProviderImpl; |
class WebMediaPlayerDelegate; |
-class WebMediaPlayerParams; |
class WebTextTrackImpl; |
// The canonical implementation of blink::WebMediaPlayer that's backed by |
@@ -271,7 +271,8 @@ class MEDIA_EXPORT WebMediaPlayerImpl |
base::WeakPtr<WebMediaPlayerDelegate> delegate_; |
- base::Callback<void(const base::Closure&)> defer_load_cb_; |
+ WebMediaPlayerParams::DeferLoadCB defer_load_cb_; |
+ Context3DProviderCB shared_main_thread_context_3d_provider_cb_; |
scherkus (not reviewing)
2014/10/30 20:40:11
ditto for naming: drop the the "shared_main_thread
dshwang
2014/10/31 09:29:16
Done.
|
// Factories for supporting video accelerators. May be null. |
scoped_refptr<GpuVideoAcceleratorFactories> gpu_factories_; |