| Index: cc/trees/layer_tree_host_impl.cc
|
| diff --git a/cc/trees/layer_tree_host_impl.cc b/cc/trees/layer_tree_host_impl.cc
|
| index c602b9bfa89c963069ab94d4c3dcaaa3c4a9420b..65188204fca9d29a4039ff7b71dff773e7d47331 100644
|
| --- a/cc/trees/layer_tree_host_impl.cc
|
| +++ b/cc/trees/layer_tree_host_impl.cc
|
| @@ -329,15 +329,6 @@ void LayerTreeHostImpl::BeginMainFrameAborted(
|
| void LayerTreeHostImpl::BeginCommit() {
|
| TRACE_EVENT0("cc", "LayerTreeHostImpl::BeginCommit");
|
|
|
| - // Ensure all textures are returned so partial texture updates can happen
|
| - // during the commit.
|
| - // TODO(ericrk): We should not need to ForceReclaimResources when using
|
| - // Impl-side-painting as it doesn't upload during commits. However,
|
| - // Display::Draw currently relies on resource being reclaimed to block drawing
|
| - // between BeginCommit / Swap. See crbug.com/489515.
|
| - if (compositor_frame_sink_)
|
| - compositor_frame_sink_->ForceReclaimResources();
|
| -
|
| if (!CommitToActiveTree())
|
| CreatePendingTree();
|
| }
|
| @@ -781,12 +772,10 @@ DrawResult LayerTreeHostImpl::CalculateRenderPasses(FrameData* frame) {
|
| !root_surface->layer_list().empty();
|
| bool hud_wants_to_draw_ = active_tree_->hud_layer() &&
|
| active_tree_->hud_layer()->IsAnimatingHUDContents();
|
| - bool resources_must_be_resent =
|
| - compositor_frame_sink_->capabilities().can_force_reclaim_resources;
|
| if (root_surface_has_contributing_layers &&
|
| root_surface_has_no_visible_damage &&
|
| !active_tree_->property_trees()->effect_tree.HasCopyRequests() &&
|
| - !resources_must_be_resent && !hud_wants_to_draw_) {
|
| + !hud_wants_to_draw_) {
|
| TRACE_EVENT0("cc",
|
| "LayerTreeHostImpl::CalculateRenderPasses::EmptyDamageRect");
|
| frame->has_no_damage = true;
|
|
|