cc: Split Proxy to eliminate unnecessary dependencies on the impl side

cc/layers/video_layer_impl.cc

 // Copyright 2011 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "cc/layers/video_layer_impl.h"
 
 #include "base/bind.h"
 #include "base/logging.h"
 #include "cc/layers/video_frame_provider_client_impl.h"
 #include "cc/quads/io_surface_draw_quad.h"
 #include "cc/quads/stream_video_draw_quad.h"
 #include "cc/quads/texture_draw_quad.h"
 #include "cc/quads/yuv_video_draw_quad.h"
 #include "cc/resources/resource_provider.h"
 #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)
 #include "cc/quads/solid_color_draw_quad.h"
 #endif  // defined(VIDEO_HOLE)
 
 namespace cc {
 
 // static
 scoped_ptr<VideoLayerImpl> VideoLayerImpl::Create(
     LayerTreeImpl* tree_impl,
     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(
           provider, tree_impl->GetVideoFrameControllerClient());
 
   return make_scoped_ptr(
       new VideoLayerImpl(tree_impl, id, provider_client_impl, video_rotation));
 }
 
 VideoLayerImpl::VideoLayerImpl(
     LayerTreeImpl* tree_impl,
     int id,
     const scoped_refptr<VideoFrameProviderClientImpl>& provider_client_impl,
     media::VideoRotation video_rotation)
     : LayerImpl(tree_impl, id),
       provider_client_impl_(provider_client_impl),
       frame_(nullptr),
       video_rotation_(video_rotation) {
 }
 
 VideoLayerImpl::~VideoLayerImpl() {
   if (!provider_client_impl_->Stopped()) {
     // In impl side painting, we may have a pending and active layer
     // associated with the video provider at the same time. Both have a ref
     // 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();
   }
 }
 
 scoped_ptr<LayerImpl> VideoLayerImpl::CreateLayerImpl(
     LayerTreeImpl* tree_impl) {
   return make_scoped_ptr(new VideoLayerImpl(
       tree_impl, id(), provider_client_impl_, video_rotation_));
 }
 
@@ skipping 288 matching lines @@
 }
 
 void VideoLayerImpl::DidDraw(ResourceProvider* resource_provider) {
   LayerImpl::DidDraw(resource_provider);
 
   DCHECK(frame_.get());
 
   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();
     software_release_callback_.Reset();
   } else {
     for (size_t i = 0; i < frame_resources_.size(); ++i)
       resource_provider->DeleteResource(frame_resources_[i].id);
     frame_resources_.clear();
   }
 
@@ skipping 17 matching lines @@
 void VideoLayerImpl::SetNeedsRedraw() {
   SetUpdateRect(gfx::UnionRects(update_rect(), gfx::Rect(bounds())));
   layer_tree_impl()->SetNeedsRedraw();
 }
 
 const char* VideoLayerImpl::LayerTypeAsString() const {
   return "cc::VideoLayerImpl";
 }
 
 }  // namespace cc