| OLD | NEW |
| 1 // Copyright 2014 The Chromium Authors. All rights reserved. | 1 // Copyright 2014 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/browser/compositor/delegated_frame_host.h" | 5 #include "content/browser/compositor/delegated_frame_host.h" |
| 6 | 6 |
| 7 #include "base/callback_helpers.h" | 7 #include "base/callback_helpers.h" |
| 8 #include "base/command_line.h" | 8 #include "base/command_line.h" |
| 9 #include "base/time/default_tick_clock.h" | 9 #include "base/time/default_tick_clock.h" |
| 10 #include "cc/output/compositor_frame.h" | 10 #include "cc/output/compositor_frame.h" |
| (...skipping 462 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 473 } else { | 473 } else { |
| 474 AddOnCommitCallbackAndDisableLocks(base::Closure()); | 474 AddOnCommitCallbackAndDisableLocks(base::Closure()); |
| 475 } | 475 } |
| 476 DidReceiveFrameFromRenderer(damage_rect); | 476 DidReceiveFrameFromRenderer(damage_rect); |
| 477 if (frame_provider_.get() || !surface_id_.is_null()) | 477 if (frame_provider_.get() || !surface_id_.is_null()) |
| 478 delegated_frame_evictor_->SwappedFrame( | 478 delegated_frame_evictor_->SwappedFrame( |
| 479 client_->DelegatedFrameHostIsVisible()); | 479 client_->DelegatedFrameHostIsVisible()); |
| 480 // Note: the frame may have been evicted immediately. | 480 // Note: the frame may have been evicted immediately. |
| 481 } | 481 } |
| 482 | 482 |
| 483 void DelegatedFrameHost::ClearDelegatedFrame() { |
| 484 if (frame_provider_.get() || !surface_id_.is_null()) |
| 485 EvictDelegatedFrame(); |
| 486 } |
| 487 |
| 483 void DelegatedFrameHost::SendDelegatedFrameAck(uint32 output_surface_id) { | 488 void DelegatedFrameHost::SendDelegatedFrameAck(uint32 output_surface_id) { |
| 484 cc::CompositorFrameAck ack; | 489 cc::CompositorFrameAck ack; |
| 485 if (!surface_returned_resources_.empty()) | 490 if (!surface_returned_resources_.empty()) |
| 486 ack.resources.swap(surface_returned_resources_); | 491 ack.resources.swap(surface_returned_resources_); |
| 487 if (resource_collection_.get()) | 492 if (resource_collection_.get()) |
| 488 resource_collection_->TakeUnusedResourcesForChildCompositor(&ack.resources); | 493 resource_collection_->TakeUnusedResourcesForChildCompositor(&ack.resources); |
| 489 client_->DelegatedFrameHostSendCompositorSwapAck(output_surface_id, ack); | 494 client_->DelegatedFrameHostSendCompositorSwapAck(output_surface_id, ack); |
| 490 DCHECK_GT(pending_delegated_ack_count_, 0); | 495 DCHECK_GT(pending_delegated_ack_count_, 0); |
| 491 pending_delegated_ack_count_--; | 496 pending_delegated_ack_count_--; |
| 492 } | 497 } |
| (...skipping 538 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1031 cc::SurfaceManager* manager = factory->GetSurfaceManager(); | 1036 cc::SurfaceManager* manager = factory->GetSurfaceManager(); |
| 1032 new_layer->SetShowSurface( | 1037 new_layer->SetShowSurface( |
| 1033 surface_id_, base::Bind(&SatisfyCallback, base::Unretained(manager)), | 1038 surface_id_, base::Bind(&SatisfyCallback, base::Unretained(manager)), |
| 1034 base::Bind(&RequireCallback, base::Unretained(manager)), | 1039 base::Bind(&RequireCallback, base::Unretained(manager)), |
| 1035 current_surface_size_, current_scale_factor_, | 1040 current_surface_size_, current_scale_factor_, |
| 1036 current_frame_size_in_dip_); | 1041 current_frame_size_in_dip_); |
| 1037 } | 1042 } |
| 1038 } | 1043 } |
| 1039 | 1044 |
| 1040 } // namespace content | 1045 } // namespace content |
| OLD | NEW |