| Index: webkit/media/android/webmediaplayer_android.h
|
| diff --git a/webkit/media/android/webmediaplayer_android.h b/webkit/media/android/webmediaplayer_android.h
|
| index ce4f95e21085cbec9a100291c5c4f7dceaf67304..f06f1a12ac37cb9206a0dc7e644d00a33e59b1f8 100644
|
| --- a/webkit/media/android/webmediaplayer_android.h
|
| +++ b/webkit/media/android/webmediaplayer_android.h
|
| @@ -19,6 +19,7 @@
|
| #include "third_party/WebKit/Source/Platform/chromium/public/WebURL.h"
|
| #include "third_party/WebKit/Source/WebKit/chromium/public/WebMediaPlayer.h"
|
| #include "ui/gfx/rect_f.h"
|
| +#include "webkit/media/android/media_info_loader_android.h"
|
| #include "webkit/media/android/media_source_delegate.h"
|
| #include "webkit/media/android/stream_texture_factory_android.h"
|
|
|
| @@ -226,6 +227,7 @@ class WebMediaPlayerAndroid
|
|
|
| private:
|
| void ReallocateVideoFrame();
|
| + void DidLoadMediaInfo(MediaInfoLoaderAndroid::Status status);
|
|
|
| WebKit::WebFrame* const frame_;
|
|
|
| @@ -323,6 +325,11 @@ class WebMediaPlayerAndroid
|
|
|
| media::MediaLog* media_log_;
|
|
|
| + scoped_ptr<MediaInfoLoaderAndroid> info_loader_;
|
| +
|
| + // The media source that is pending for |info_loader_| to complete.
|
| + scoped_ptr<WebKit::WebMediaSource> pending_media_source_;
|
| +
|
| DISALLOW_COPY_AND_ASSIGN(WebMediaPlayerAndroid);
|
| };
|
|
|
|
|