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

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

Issue 204463008: Remove all calls to WebMediaPlayerClient::needsWebLayerForVideo() as compositing is always enabled. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: rebase Created 6 years, 9 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 | Annotate | Revision Log
« no previous file with comments | « content/renderer/media/webmediaplayer_impl.cc ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 395 matching lines...) Expand 10 before | Expand all | Expand 10 after
406 received_first_frame_ = true; 406 received_first_frame_ = true;
407 { 407 {
408 base::AutoLock auto_lock(current_frame_lock_); 408 base::AutoLock auto_lock(current_frame_lock_);
409 DCHECK(!current_frame_used_); 409 DCHECK(!current_frame_used_);
410 current_frame_ = frame; 410 current_frame_ = frame;
411 } 411 }
412 SetReadyState(WebMediaPlayer::ReadyStateHaveMetadata); 412 SetReadyState(WebMediaPlayer::ReadyStateHaveMetadata);
413 SetReadyState(WebMediaPlayer::ReadyStateHaveEnoughData); 413 SetReadyState(WebMediaPlayer::ReadyStateHaveEnoughData);
414 GetClient()->sizeChanged(); 414 GetClient()->sizeChanged();
415 415
416 if (video_frame_provider_.get() && GetClient()->needsWebLayerForVideo()) { 416 if (video_frame_provider_) {
417 video_weblayer_.reset( 417 video_weblayer_.reset(
418 new webkit::WebLayerImpl(cc::VideoLayer::Create(this))); 418 new webkit::WebLayerImpl(cc::VideoLayer::Create(this)));
419 GetClient()->setWebLayer(video_weblayer_.get()); 419 GetClient()->setWebLayer(video_weblayer_.get());
420 } 420 }
421 } 421 }
422 422
423 // Do not update |current_frame_| when paused. 423 // Do not update |current_frame_| when paused.
424 if (paused_) 424 if (paused_)
425 return; 425 return;
426 426
(...skipping 46 matching lines...) Expand 10 before | Expand all | Expand 10 after
473 GetClient()->readyStateChanged(); 473 GetClient()->readyStateChanged();
474 } 474 }
475 475
476 blink::WebMediaPlayerClient* WebMediaPlayerMS::GetClient() { 476 blink::WebMediaPlayerClient* WebMediaPlayerMS::GetClient() {
477 DCHECK(thread_checker_.CalledOnValidThread()); 477 DCHECK(thread_checker_.CalledOnValidThread());
478 DCHECK(client_); 478 DCHECK(client_);
479 return client_; 479 return client_;
480 } 480 }
481 481
482 } // namespace content 482 } // namespace content
OLDNEW
« no previous file with comments | « content/renderer/media/webmediaplayer_impl.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698