| 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 481 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 492 base::AutoLock auto_lock(current_frame_lock_); | 492 base::AutoLock auto_lock(current_frame_lock_); |
| 493 DCHECK(!current_frame_used_); | 493 DCHECK(!current_frame_used_); |
| 494 current_frame_ = frame; | 494 current_frame_ = frame; |
| 495 } | 495 } |
| 496 SetReadyState(WebMediaPlayer::ReadyStateHaveMetadata); | 496 SetReadyState(WebMediaPlayer::ReadyStateHaveMetadata); |
| 497 SetReadyState(WebMediaPlayer::ReadyStateHaveEnoughData); | 497 SetReadyState(WebMediaPlayer::ReadyStateHaveEnoughData); |
| 498 GetClient()->sizeChanged(); | 498 GetClient()->sizeChanged(); |
| 499 | 499 |
| 500 if (video_frame_provider_.get()) { | 500 if (video_frame_provider_.get()) { |
| 501 video_weblayer_.reset(new cc_blink::WebLayerImpl( | 501 video_weblayer_.reset(new cc_blink::WebLayerImpl( |
| 502 cc::VideoLayer::Create(this, media::VIDEO_ROTATION_0))); | 502 cc::VideoLayer::Create(cc_blink::WebLayerImpl::LayerSettings(), this, |
| 503 media::VIDEO_ROTATION_0))); |
| 503 video_weblayer_->setOpaque(true); | 504 video_weblayer_->setOpaque(true); |
| 504 GetClient()->setWebLayer(video_weblayer_.get()); | 505 GetClient()->setWebLayer(video_weblayer_.get()); |
| 505 } | 506 } |
| 506 } | 507 } |
| 507 | 508 |
| 508 // Do not update |current_frame_| when paused. | 509 // Do not update |current_frame_| when paused. |
| 509 if (paused_) | 510 if (paused_) |
| 510 return; | 511 return; |
| 511 | 512 |
| 512 bool size_changed = !current_frame_.get() || | 513 bool size_changed = !current_frame_.get() || |
| (...skipping 41 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 554 GetClient()->readyStateChanged(); | 555 GetClient()->readyStateChanged(); |
| 555 } | 556 } |
| 556 | 557 |
| 557 blink::WebMediaPlayerClient* WebMediaPlayerMS::GetClient() { | 558 blink::WebMediaPlayerClient* WebMediaPlayerMS::GetClient() { |
| 558 DCHECK(thread_checker_.CalledOnValidThread()); | 559 DCHECK(thread_checker_.CalledOnValidThread()); |
| 559 DCHECK(client_); | 560 DCHECK(client_); |
| 560 return client_; | 561 return client_; |
| 561 } | 562 } |
| 562 | 563 |
| 563 } // namespace content | 564 } // namespace content |
| OLD | NEW |