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

Side by Side Diff: content/renderer/media/android/webmediaplayer_android.cc

Issue 1739743003: Blink Compositor Animation: Erase old animation system. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fix compilation. Created 4 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
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/android/webmediaplayer_android.h" 5 #include "content/renderer/media/android/webmediaplayer_android.h"
6 6
7 #include <stddef.h> 7 #include <stddef.h>
8 8
9 #include <limits> 9 #include <limits>
10 10
(...skipping 938 matching lines...) Expand 10 before | Expand all | Expand 10 after
949 // size is set. 949 // size is set.
950 if (!is_remote_ && cached_stream_texture_size_ != natural_size_) { 950 if (!is_remote_ && cached_stream_texture_size_ != natural_size_) {
951 stream_texture_factory_->SetStreamTextureSize( 951 stream_texture_factory_->SetStreamTextureSize(
952 stream_id_, gfx::Size(natural_size_.width, natural_size_.height)); 952 stream_id_, gfx::Size(natural_size_.width, natural_size_.height));
953 cached_stream_texture_size_ = natural_size_; 953 cached_stream_texture_size_ = natural_size_;
954 } 954 }
955 955
956 // Lazily allocate compositing layer. 956 // Lazily allocate compositing layer.
957 if (!video_weblayer_) { 957 if (!video_weblayer_) {
958 video_weblayer_.reset(new cc_blink::WebLayerImpl( 958 video_weblayer_.reset(new cc_blink::WebLayerImpl(
959 cc::VideoLayer::Create(cc_blink::WebLayerImpl::LayerSettings(), this, 959 cc::VideoLayer::Create(cc::LayerSettings(), this,
960 media::VIDEO_ROTATION_0))); 960 media::VIDEO_ROTATION_0)));
961 client_->setWebLayer(video_weblayer_.get()); 961 client_->setWebLayer(video_weblayer_.get());
962 } 962 }
963 } 963 }
964 964
965 void WebMediaPlayerAndroid::OnTimeUpdate(base::TimeDelta current_timestamp, 965 void WebMediaPlayerAndroid::OnTimeUpdate(base::TimeDelta current_timestamp,
966 base::TimeTicks current_time_ticks) { 966 base::TimeTicks current_time_ticks) {
967 DCHECK(main_thread_checker_.CalledOnValidThread()); 967 DCHECK(main_thread_checker_.CalledOnValidThread());
968 968
969 if (seeking()) 969 if (seeking())
(...skipping 686 matching lines...) Expand 10 before | Expand all | Expand 10 after
1656 result = PREDICTION_RESULT_PATH_BASED_WAS_BETTER; 1656 result = PREDICTION_RESULT_PATH_BASED_WAS_BETTER;
1657 } else if (is_hls_url == is_hls) { 1657 } else if (is_hls_url == is_hls) {
1658 result = PREDICTION_RESULT_URL_BASED_WAS_BETTER; 1658 result = PREDICTION_RESULT_URL_BASED_WAS_BETTER;
1659 } 1659 }
1660 UMA_HISTOGRAM_ENUMERATION( 1660 UMA_HISTOGRAM_ENUMERATION(
1661 "Media.Android.IsHttpLiveStreamingMediaPredictionResult", 1661 "Media.Android.IsHttpLiveStreamingMediaPredictionResult",
1662 result, PREDICTION_RESULT_MAX); 1662 result, PREDICTION_RESULT_MAX);
1663 } 1663 }
1664 1664
1665 } // namespace content 1665 } // namespace content
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698