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 #include "content/renderer/media/webmediaplayer_ms.h" | 5 #include "content/renderer/media/webmediaplayer_ms.h" |
6 | 6 |
7 #include <limits> | 7 #include <limits> |
8 | 8 |
9 #include "base/bind.h" | 9 #include "base/bind.h" |
10 #include "base/callback.h" | 10 #include "base/callback.h" |
(...skipping 343 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
354 received_first_frame_ = true; | 354 received_first_frame_ = true; |
355 { | 355 { |
356 base::AutoLock auto_lock(current_frame_lock_); | 356 base::AutoLock auto_lock(current_frame_lock_); |
357 DCHECK(!current_frame_used_); | 357 DCHECK(!current_frame_used_); |
358 current_frame_ = frame; | 358 current_frame_ = frame; |
359 } | 359 } |
360 SetReadyState(WebMediaPlayer::ReadyStateHaveMetadata); | 360 SetReadyState(WebMediaPlayer::ReadyStateHaveMetadata); |
361 SetReadyState(WebMediaPlayer::ReadyStateHaveEnoughData); | 361 SetReadyState(WebMediaPlayer::ReadyStateHaveEnoughData); |
362 GetClient()->sizeChanged(); | 362 GetClient()->sizeChanged(); |
363 | 363 |
364 if (video_frame_provider_.get() && GetClient()->needsWebLayerForVideo()) { | 364 if (video_frame_provider_) { |
365 video_weblayer_.reset( | 365 video_weblayer_.reset( |
366 new webkit::WebLayerImpl(cc::VideoLayer::Create(this))); | 366 new webkit::WebLayerImpl(cc::VideoLayer::Create(this))); |
367 GetClient()->setWebLayer(video_weblayer_.get()); | 367 GetClient()->setWebLayer(video_weblayer_.get()); |
368 } | 368 } |
369 } | 369 } |
370 | 370 |
371 // Do not update |current_frame_| when paused. | 371 // Do not update |current_frame_| when paused. |
372 if (paused_) | 372 if (paused_) |
373 return; | 373 return; |
374 | 374 |
(...skipping 46 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
421 GetClient()->readyStateChanged(); | 421 GetClient()->readyStateChanged(); |
422 } | 422 } |
423 | 423 |
424 blink::WebMediaPlayerClient* WebMediaPlayerMS::GetClient() { | 424 blink::WebMediaPlayerClient* WebMediaPlayerMS::GetClient() { |
425 DCHECK(thread_checker_.CalledOnValidThread()); | 425 DCHECK(thread_checker_.CalledOnValidThread()); |
426 DCHECK(client_); | 426 DCHECK(client_); |
427 return client_; | 427 return client_; |
428 } | 428 } |
429 | 429 |
430 } // namespace content | 430 } // namespace content |
OLD | NEW |