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

Unified Diff: cc/layers/video_layer_impl.cc

Issue 1411663002: cc: Split Proxy to eliminate unnecessary dependencies on the impl side (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Update perf tests. Created 5 years, 2 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « cc/layers/video_frame_provider_client_impl_unittest.cc ('k') | cc/layers/video_layer_impl_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: cc/layers/video_layer_impl.cc
diff --git a/cc/layers/video_layer_impl.cc b/cc/layers/video_layer_impl.cc
index d6aa570d11332c77e2669da82b02bfa6e9b099c3..63d8a187bc69260d8cca98abe186afd3b8ac7e5b 100644
--- a/cc/layers/video_layer_impl.cc
+++ b/cc/layers/video_layer_impl.cc
@@ -15,7 +15,7 @@
#include "cc/resources/single_release_callback_impl.h"
#include "cc/trees/layer_tree_impl.h"
#include "cc/trees/occlusion.h"
-#include "cc/trees/proxy.h"
+#include "cc/trees/task_runner_provider.h"
#include "media/base/video_frame.h"
#if defined(VIDEO_HOLE)
@@ -30,8 +30,8 @@ scoped_ptr<VideoLayerImpl> VideoLayerImpl::Create(
int id,
VideoFrameProvider* provider,
media::VideoRotation video_rotation) {
- DCHECK(tree_impl->proxy()->IsMainThreadBlocked());
- DCHECK(tree_impl->proxy()->IsImplThread());
+ DCHECK(tree_impl->task_runner_provider()->IsMainThreadBlocked());
+ DCHECK(tree_impl->task_runner_provider()->IsImplThread());
scoped_refptr<VideoFrameProviderClientImpl> provider_client_impl =
VideoFrameProviderClientImpl::Create(
@@ -59,8 +59,8 @@ VideoLayerImpl::~VideoLayerImpl() {
// on the VideoFrameProviderClientImpl, but we stop when the first
// LayerImpl (the one on the pending tree) is destroyed since we know
// the main thread is blocked for this commit.
- DCHECK(layer_tree_impl()->proxy()->IsImplThread());
- DCHECK(layer_tree_impl()->proxy()->IsMainThreadBlocked());
+ DCHECK(layer_tree_impl()->task_runner_provider()->IsImplThread());
+ DCHECK(layer_tree_impl()->task_runner_provider()->IsMainThreadBlocked());
provider_client_impl_->Stop();
}
}
@@ -369,8 +369,10 @@ void VideoLayerImpl::DidDraw(ResourceProvider* resource_provider) {
if (frame_resource_type_ ==
VideoFrameExternalResources::SOFTWARE_RESOURCE) {
for (size_t i = 0; i < software_resources_.size(); ++i) {
- software_release_callback_.Run(
- 0, false, layer_tree_impl()->BlockingMainThreadTaskRunner());
+ software_release_callback_.Run(0, false,
+ layer_tree_impl()
+ ->task_runner_provider()
+ ->blocking_main_thread_task_runner());
}
software_resources_.clear();
« no previous file with comments | « cc/layers/video_frame_provider_client_impl_unittest.cc ('k') | cc/layers/video_layer_impl_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698