Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(373)

Side by Side Diff: content/renderer/media/webmediaplayer_ms.cc

Issue 1122393003: CC: Plumb LayerSettings parameter for cc::Layer construction. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Rebase Created 5 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
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 486 matching lines...) Expand 10 before | Expand all | Expand 10 after
497 base::AutoLock auto_lock(current_frame_lock_); 497 base::AutoLock auto_lock(current_frame_lock_);
498 DCHECK(!current_frame_used_); 498 DCHECK(!current_frame_used_);
499 current_frame_ = frame; 499 current_frame_ = frame;
500 } 500 }
501 SetReadyState(WebMediaPlayer::ReadyStateHaveMetadata); 501 SetReadyState(WebMediaPlayer::ReadyStateHaveMetadata);
502 SetReadyState(WebMediaPlayer::ReadyStateHaveEnoughData); 502 SetReadyState(WebMediaPlayer::ReadyStateHaveEnoughData);
503 GetClient()->sizeChanged(); 503 GetClient()->sizeChanged();
504 504
505 if (video_frame_provider_.get()) { 505 if (video_frame_provider_.get()) {
506 video_weblayer_.reset(new cc_blink::WebLayerImpl( 506 video_weblayer_.reset(new cc_blink::WebLayerImpl(
507 cc::VideoLayer::Create(this, media::VIDEO_ROTATION_0))); 507 cc::VideoLayer::Create(cc_blink::WebLayerImpl::LayerSettings(), this,
508 media::VIDEO_ROTATION_0)));
508 video_weblayer_->setOpaque(true); 509 video_weblayer_->setOpaque(true);
509 GetClient()->setWebLayer(video_weblayer_.get()); 510 GetClient()->setWebLayer(video_weblayer_.get());
510 } 511 }
511 } 512 }
512 513
513 // Do not update |current_frame_| when paused. 514 // Do not update |current_frame_| when paused.
514 if (paused_) 515 if (paused_)
515 return; 516 return;
516 517
517 bool size_changed = !current_frame_.get() || 518 bool size_changed = !current_frame_.get() ||
(...skipping 41 matching lines...) Expand 10 before | Expand all | Expand 10 after
559 GetClient()->readyStateChanged(); 560 GetClient()->readyStateChanged();
560 } 561 }
561 562
562 blink::WebMediaPlayerClient* WebMediaPlayerMS::GetClient() { 563 blink::WebMediaPlayerClient* WebMediaPlayerMS::GetClient() {
563 DCHECK(thread_checker_.CalledOnValidThread()); 564 DCHECK(thread_checker_.CalledOnValidThread());
564 DCHECK(client_); 565 DCHECK(client_);
565 return client_; 566 return client_;
566 } 567 }
567 568
568 } // namespace content 569 } // namespace content
OLDNEW
« no previous file with comments | « content/renderer/media/android/webmediaplayer_android.cc ('k') | content/renderer/npapi/webplugin_impl.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698