| 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 <stdint.h> | 8 #include <stdint.h> |
| 9 | 9 |
| 10 #include <string> | 10 #include <string> |
| (...skipping 326 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 337 // Callback responsible for determining if loading of media should be deferred | 337 // Callback responsible for determining if loading of media should be deferred |
| 338 // for external reasons; called during load(). | 338 // for external reasons; called during load(). |
| 339 media::WebMediaPlayerParams::DeferLoadCB defer_load_cb_; | 339 media::WebMediaPlayerParams::DeferLoadCB defer_load_cb_; |
| 340 | 340 |
| 341 // Save the list of buffered time ranges. | 341 // Save the list of buffered time ranges. |
| 342 blink::WebTimeRanges buffered_; | 342 blink::WebTimeRanges buffered_; |
| 343 | 343 |
| 344 // Size of the video. | 344 // Size of the video. |
| 345 blink::WebSize natural_size_; | 345 blink::WebSize natural_size_; |
| 346 | 346 |
| 347 // Size that has been sent to StreamTexture. | 347 // Size that has been sent to gpu::StreamTexture. |
| 348 blink::WebSize cached_stream_texture_size_; | 348 blink::WebSize cached_stream_texture_size_; |
| 349 | 349 |
| 350 // The video frame object used for rendering by the compositor. | 350 // The video frame object used for rendering by the compositor. |
| 351 scoped_refptr<media::VideoFrame> current_frame_; | 351 scoped_refptr<media::VideoFrame> current_frame_; |
| 352 base::Lock current_frame_lock_; | 352 base::Lock current_frame_lock_; |
| 353 | 353 |
| 354 base::ThreadChecker main_thread_checker_; | 354 base::ThreadChecker main_thread_checker_; |
| 355 | 355 |
| 356 // Message loop for media thread. | 356 // Message loop for media thread. |
| 357 const scoped_refptr<base::SingleThreadTaskRunner> media_task_runner_; | 357 const scoped_refptr<base::SingleThreadTaskRunner> media_task_runner_; |
| (...skipping 161 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 519 | 519 |
| 520 // NOTE: Weak pointers must be invalidated before all other member variables. | 520 // NOTE: Weak pointers must be invalidated before all other member variables. |
| 521 base::WeakPtrFactory<WebMediaPlayerAndroid> weak_factory_; | 521 base::WeakPtrFactory<WebMediaPlayerAndroid> weak_factory_; |
| 522 | 522 |
| 523 DISALLOW_COPY_AND_ASSIGN(WebMediaPlayerAndroid); | 523 DISALLOW_COPY_AND_ASSIGN(WebMediaPlayerAndroid); |
| 524 }; | 524 }; |
| 525 | 525 |
| 526 } // namespace content | 526 } // namespace content |
| 527 | 527 |
| 528 #endif // CONTENT_RENDERER_MEDIA_ANDROID_WEBMEDIAPLAYER_ANDROID_H_ | 528 #endif // CONTENT_RENDERER_MEDIA_ANDROID_WEBMEDIAPLAYER_ANDROID_H_ |
| OLD | NEW |