| 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/frame_host/render_widget_host_view_child_frame.h" | 5 #include "content/browser/frame_host/render_widget_host_view_child_frame.h" |
| 6 | 6 |
| 7 #include <algorithm> | 7 #include <algorithm> |
| 8 #include <utility> | 8 #include <utility> |
| 9 #include <vector> | 9 #include <vector> |
| 10 | 10 |
| (...skipping 331 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 342 if (!frame_connector_) | 342 if (!frame_connector_) |
| 343 return; | 343 return; |
| 344 if ((event.GetType() == blink::WebInputEvent::kGestureScrollUpdate && | 344 if ((event.GetType() == blink::WebInputEvent::kGestureScrollUpdate && |
| 345 not_consumed) || | 345 not_consumed) || |
| 346 event.GetType() == blink::WebInputEvent::kGestureScrollEnd) | 346 event.GetType() == blink::WebInputEvent::kGestureScrollEnd) |
| 347 frame_connector_->BubbleScrollEvent(event); | 347 frame_connector_->BubbleScrollEvent(event); |
| 348 } | 348 } |
| 349 | 349 |
| 350 void RenderWidgetHostViewChildFrame::DidReceiveCompositorFrameAck( | 350 void RenderWidgetHostViewChildFrame::DidReceiveCompositorFrameAck( |
| 351 const cc::ReturnedResourceArray& resources) { | 351 const cc::ReturnedResourceArray& resources) { |
| 352 if (!host_) | 352 renderer_compositor_frame_sink_->DidReceiveCompositorFrameAck(resources); |
| 353 return; | |
| 354 host_->SendReclaimCompositorResources(true /* is_swap_ack */, resources); | |
| 355 } | 353 } |
| 356 | 354 |
| 357 void RenderWidgetHostViewChildFrame::DidCreateNewRendererCompositorFrameSink() { | 355 void RenderWidgetHostViewChildFrame::DidCreateNewRendererCompositorFrameSink( |
| 356 cc::mojom::MojoCompositorFrameSinkClient* renderer_compositor_frame_sink) { |
| 358 ResetCompositorFrameSinkSupport(); | 357 ResetCompositorFrameSinkSupport(); |
| 358 renderer_compositor_frame_sink_ = renderer_compositor_frame_sink; |
| 359 CreateCompositorFrameSinkSupport(); | 359 CreateCompositorFrameSinkSupport(); |
| 360 has_frame_ = false; | 360 has_frame_ = false; |
| 361 } | 361 } |
| 362 | 362 |
| 363 void RenderWidgetHostViewChildFrame::ProcessCompositorFrame( | 363 void RenderWidgetHostViewChildFrame::ProcessCompositorFrame( |
| 364 const cc::LocalSurfaceId& local_surface_id, | 364 const cc::LocalSurfaceId& local_surface_id, |
| 365 cc::CompositorFrame frame) { | 365 cc::CompositorFrame frame) { |
| 366 current_surface_size_ = frame.render_pass_list.back()->output_rect.size(); | 366 current_surface_size_ = frame.render_pass_list.back()->output_rect.size(); |
| 367 current_surface_scale_factor_ = frame.metadata.device_scale_factor; | 367 current_surface_scale_factor_ = frame.metadata.device_scale_factor; |
| 368 | 368 |
| (...skipping 248 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 617 support_->RequestCopyOfSurface(std::move(request)); | 617 support_->RequestCopyOfSurface(std::move(request)); |
| 618 } | 618 } |
| 619 | 619 |
| 620 bool RenderWidgetHostViewChildFrame::HasAcceleratedSurface( | 620 bool RenderWidgetHostViewChildFrame::HasAcceleratedSurface( |
| 621 const gfx::Size& desired_size) { | 621 const gfx::Size& desired_size) { |
| 622 return false; | 622 return false; |
| 623 } | 623 } |
| 624 | 624 |
| 625 void RenderWidgetHostViewChildFrame::ReclaimResources( | 625 void RenderWidgetHostViewChildFrame::ReclaimResources( |
| 626 const cc::ReturnedResourceArray& resources) { | 626 const cc::ReturnedResourceArray& resources) { |
| 627 if (!host_) | 627 renderer_compositor_frame_sink_->ReclaimResources(resources); |
| 628 return; | |
| 629 host_->SendReclaimCompositorResources(false /* is_swap_ack */, resources); | |
| 630 } | 628 } |
| 631 | 629 |
| 632 void RenderWidgetHostViewChildFrame::OnBeginFrame( | 630 void RenderWidgetHostViewChildFrame::OnBeginFrame( |
| 633 const cc::BeginFrameArgs& args) { | 631 const cc::BeginFrameArgs& args) { |
| 634 host_->Send(new ViewMsg_BeginFrame(host_->GetRoutingID(), args)); | 632 host_->Send(new ViewMsg_BeginFrame(host_->GetRoutingID(), args)); |
| 635 } | 633 } |
| 636 | 634 |
| 637 void RenderWidgetHostViewChildFrame::SetNeedsBeginFrames( | 635 void RenderWidgetHostViewChildFrame::SetNeedsBeginFrames( |
| 638 bool needs_begin_frames) { | 636 bool needs_begin_frames) { |
| 639 if (support_) | 637 if (support_) |
| (...skipping 69 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 709 frame_sink_id_); | 707 frame_sink_id_); |
| 710 } | 708 } |
| 711 support_.reset(); | 709 support_.reset(); |
| 712 } | 710 } |
| 713 | 711 |
| 714 bool RenderWidgetHostViewChildFrame::HasEmbedderChanged() { | 712 bool RenderWidgetHostViewChildFrame::HasEmbedderChanged() { |
| 715 return false; | 713 return false; |
| 716 } | 714 } |
| 717 | 715 |
| 718 } // namespace content | 716 } // namespace content |
| OLD | NEW |