cc: Move copy requests from layers to the effect tree

cc/layers/layer_impl.cc

 // Copyright 2012 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/layer_impl.h"
 
 #include <stddef.h>
 #include <stdint.h>
 
 #include <algorithm>
@@ skipping 78 matching lines @@
   DCHECK(layer_tree_impl_);
   layer_tree_impl_->RegisterLayer(this);
   layer_tree_impl_->AddToElementMap(this);
 
   SetNeedsPushProperties();
 }
 
 LayerImpl::~LayerImpl() {
   DCHECK_EQ(DRAW_MODE_NONE, current_draw_mode_);
 
-  if (!copy_requests_.empty() && layer_tree_impl_->IsActiveTree())
-    layer_tree_impl()->RemoveLayerWithCopyOutputRequest(this);
   layer_tree_impl_->UnregisterScrollLayer(this);
   layer_tree_impl_->UnregisterLayer(this);
   layer_tree_impl_->RemoveLayerShouldPushProperties(this);
 
   layer_tree_impl_->RemoveFromElementMap(this);
 
   TRACE_EVENT_OBJECT_DELETED_WITH_ID(
       TRACE_DISABLED_BY_DEFAULT("cc.debug"), "cc::LayerImpl", this);
 
   if (mask_layer_)
@@ skipping 89 matching lines @@
 void LayerImpl::SetEffectTreeIndex(int index) {
   effect_tree_index_ = index;
   SetNeedsPushProperties();
 }
 
 void LayerImpl::SetScrollTreeIndex(int index) {
   scroll_tree_index_ = index;
   SetNeedsPushProperties();
 }
 
-void LayerImpl::PassCopyRequests(
-    std::vector<std::unique_ptr<CopyOutputRequest>>* requests) {
-  // In the case that a layer still has a copy request, this means that there's
-  // a commit to the active tree without a draw.  This only happens in some
-  // edge cases during lost context or visibility changes, so don't try to
-  // handle preserving these output requests (and their surface).
-  if (!copy_requests_.empty()) {
-    layer_tree_impl()->RemoveLayerWithCopyOutputRequest(this);
-    // Destroying these will abort them.
-    copy_requests_.clear();
-  }
-
-  if (requests->empty())
-    return;
-
-  bool was_empty = copy_requests_.empty();
-  for (auto& request : *requests)
-    copy_requests_.push_back(std::move(request));
-  requests->clear();
-
-  if (was_empty && layer_tree_impl()->IsActiveTree())
-    layer_tree_impl()->AddLayerWithCopyOutputRequest(this);
-}
-
-void LayerImpl::TakeCopyRequestsAndTransformToTarget(
-    std::vector<std::unique_ptr<CopyOutputRequest>>* requests) {
-  DCHECK(!copy_requests_.empty());
-  DCHECK(layer_tree_impl()->IsActiveTree());
-  DCHECK(has_render_surface());
-  DCHECK_EQ(render_target(), render_surface());
-
-  size_t first_inserted_request = requests->size();
-  for (auto& request : copy_requests_)
-    requests->push_back(std::move(request));
-  copy_requests_.clear();
-
-  for (size_t i = first_inserted_request; i < requests->size(); ++i) {
-    CopyOutputRequest* request = (*requests)[i].get();
-    if (!request->has_area())
-      continue;
-
-    gfx::Rect request_in_layer_space = request->area();
-    request_in_layer_space.Intersect(gfx::Rect(bounds()));
-    request->set_area(MathUtil::MapEnclosingClippedRect(
-        DrawTransform(), request_in_layer_space));
-  }
-
-  layer_tree_impl()->RemoveLayerWithCopyOutputRequest(this);
-  layer_tree_impl()->set_needs_update_draw_properties();
-}
-
 void LayerImpl::ClearRenderSurfaceLayerList() {
   if (render_surface_)
     render_surface_->ClearLayerLists();
 }
 
 void LayerImpl::PopulateSharedQuadState(SharedQuadState* state) const {
   state->SetAll(draw_properties_.target_space_transform, bounds(),
                 draw_properties_.visible_layer_rect, draw_properties_.clip_rect,
                 draw_properties_.is_clipped, draw_properties_.opacity,
                 draw_blend_mode_, sorting_context_id_);
@@ skipping 183 matching lines @@
   layer->set_user_scrollable_vertical(user_scrollable_vertical_);
 
   layer->Set3dSortingContextId(sorting_context_id_);
 
   layer->SetTransformTreeIndex(transform_tree_index_);
   layer->SetClipTreeIndex(clip_tree_index_);
   layer->SetEffectTreeIndex(effect_tree_index_);
   layer->SetScrollTreeIndex(scroll_tree_index_);
   layer->set_offset_to_transform_parent(offset_to_transform_parent_);
 
-  layer->PassCopyRequests(&copy_requests_);
-
   // If the main thread commits multiple times before the impl thread actually
   // draws, then damage tracking will become incorrect if we simply clobber the
   // update_rect here. The LayerImpl's update_rect needs to accumulate (i.e.
   // union) any update changes that have occurred on the main thread.
   update_rect_.Union(layer->update_rect());
   layer->SetUpdateRect(update_rect_);
 
   if (owned_debug_info_)
     layer->SetDebugInfo(std::move(owned_debug_info_));
 
@@ skipping 919 matching lines @@
            .layer_transforms_should_scale_layer_contents) {
     return default_scale;
   }
 
   gfx::Vector2dF transform_scales = MathUtil::ComputeTransform2dScaleComponents(
       ScreenSpaceTransform(), default_scale);
   return std::max(transform_scales.x(), transform_scales.y());
 }
 
 }  // namespace cc