OLD | NEW |
1 // Copyright 2013 The Chromium Authors. All rights reserved. | 1 // Copyright 2013 The Chromium Authors. All rights reserved. |
2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
4 | 4 |
5 #ifndef CONTENT_RENDERER_MEDIA_ANDROID_WEBMEDIAPLAYER_ANDROID_H_ | 5 #ifndef CONTENT_RENDERER_MEDIA_ANDROID_WEBMEDIAPLAYER_ANDROID_H_ |
6 #define CONTENT_RENDERER_MEDIA_ANDROID_WEBMEDIAPLAYER_ANDROID_H_ | 6 #define CONTENT_RENDERER_MEDIA_ANDROID_WEBMEDIAPLAYER_ANDROID_H_ |
7 | 7 |
8 #include <jni.h> | 8 #include <jni.h> |
9 #include <string> | 9 #include <string> |
10 #include <vector> | 10 #include <vector> |
(...skipping 441 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
452 gfx::RectF last_computed_rect_; | 452 gfx::RectF last_computed_rect_; |
453 | 453 |
454 // Whether to use the video overlay for all embedded video. | 454 // Whether to use the video overlay for all embedded video. |
455 // True only for testing. | 455 // True only for testing. |
456 bool force_use_overlay_embedded_video_; | 456 bool force_use_overlay_embedded_video_; |
457 #endif // defined(VIDEO_HOLE) | 457 #endif // defined(VIDEO_HOLE) |
458 | 458 |
459 scoped_ptr<MediaSourceDelegate, | 459 scoped_ptr<MediaSourceDelegate, |
460 MediaSourceDelegate::Destroyer> media_source_delegate_; | 460 MediaSourceDelegate::Destroyer> media_source_delegate_; |
461 | 461 |
462 // Internal pending playback state. | |
463 // Store a playback request that cannot be started immediately. | |
464 bool pending_playback_; | |
465 | |
466 MediaPlayerHostMsg_Initialize_Type player_type_; | 462 MediaPlayerHostMsg_Initialize_Type player_type_; |
467 | 463 |
468 // Whether the browser is currently connected to a remote media player. | 464 // Whether the browser is currently connected to a remote media player. |
469 bool is_remote_; | 465 bool is_remote_; |
470 | 466 |
471 scoped_refptr<media::MediaLog> media_log_; | 467 scoped_refptr<media::MediaLog> media_log_; |
472 | 468 |
473 scoped_ptr<MediaInfoLoader> info_loader_; | 469 scoped_ptr<MediaInfoLoader> info_loader_; |
474 | 470 |
475 // The currently selected key system. Empty string means that no key system | 471 // The currently selected key system. Empty string means that no key system |
(...skipping 34 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
510 | 506 |
511 // NOTE: Weak pointers must be invalidated before all other member variables. | 507 // NOTE: Weak pointers must be invalidated before all other member variables. |
512 base::WeakPtrFactory<WebMediaPlayerAndroid> weak_factory_; | 508 base::WeakPtrFactory<WebMediaPlayerAndroid> weak_factory_; |
513 | 509 |
514 DISALLOW_COPY_AND_ASSIGN(WebMediaPlayerAndroid); | 510 DISALLOW_COPY_AND_ASSIGN(WebMediaPlayerAndroid); |
515 }; | 511 }; |
516 | 512 |
517 } // namespace content | 513 } // namespace content |
518 | 514 |
519 #endif // CONTENT_RENDERER_MEDIA_ANDROID_WEBMEDIAPLAYER_ANDROID_H_ | 515 #endif // CONTENT_RENDERER_MEDIA_ANDROID_WEBMEDIAPLAYER_ANDROID_H_ |
OLD | NEW |