| 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 444 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 455 gfx::RectF last_computed_rect_; | 455 gfx::RectF last_computed_rect_; |
| 456 | 456 |
| 457 // Whether to use the video overlay for all embedded video. | 457 // Whether to use the video overlay for all embedded video. |
| 458 // True only for testing. | 458 // True only for testing. |
| 459 bool force_use_overlay_embedded_video_; | 459 bool force_use_overlay_embedded_video_; |
| 460 #endif // defined(VIDEO_HOLE) | 460 #endif // defined(VIDEO_HOLE) |
| 461 | 461 |
| 462 scoped_ptr<MediaSourceDelegate, | 462 scoped_ptr<MediaSourceDelegate, |
| 463 MediaSourceDelegate::Destroyer> media_source_delegate_; | 463 MediaSourceDelegate::Destroyer> media_source_delegate_; |
| 464 | 464 |
| 465 // Internal pending playback state. | |
| 466 // Store a playback request that cannot be started immediately. | |
| 467 bool pending_playback_; | |
| 468 | |
| 469 MediaPlayerHostMsg_Initialize_Type player_type_; | 465 MediaPlayerHostMsg_Initialize_Type player_type_; |
| 470 | 466 |
| 471 // Whether the browser is currently connected to a remote media player. | 467 // Whether the browser is currently connected to a remote media player. |
| 472 bool is_remote_; | 468 bool is_remote_; |
| 473 | 469 |
| 474 scoped_refptr<media::MediaLog> media_log_; | 470 scoped_refptr<media::MediaLog> media_log_; |
| 475 | 471 |
| 476 scoped_ptr<MediaInfoLoader> info_loader_; | 472 scoped_ptr<MediaInfoLoader> info_loader_; |
| 477 | 473 |
| 478 // The currently selected key system. Empty string means that no key system | 474 // 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... |
| 513 | 509 |
| 514 // NOTE: Weak pointers must be invalidated before all other member variables. | 510 // NOTE: Weak pointers must be invalidated before all other member variables. |
| 515 base::WeakPtrFactory<WebMediaPlayerAndroid> weak_factory_; | 511 base::WeakPtrFactory<WebMediaPlayerAndroid> weak_factory_; |
| 516 | 512 |
| 517 DISALLOW_COPY_AND_ASSIGN(WebMediaPlayerAndroid); | 513 DISALLOW_COPY_AND_ASSIGN(WebMediaPlayerAndroid); |
| 518 }; | 514 }; |
| 519 | 515 |
| 520 } // namespace content | 516 } // namespace content |
| 521 | 517 |
| 522 #endif // CONTENT_RENDERER_MEDIA_ANDROID_WEBMEDIAPLAYER_ANDROID_H_ | 518 #endif // CONTENT_RENDERER_MEDIA_ANDROID_WEBMEDIAPLAYER_ANDROID_H_ |
| OLD | NEW |