| 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 325 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 336 // always forwarded and handled according to current scroll state in the | 336 // always forwarded and handled according to current scroll state in the |
| 337 // RenderWidgetHostInputEventRouter. | 337 // RenderWidgetHostInputEventRouter. |
| 338 if (!frame_connector_) | 338 if (!frame_connector_) |
| 339 return; | 339 return; |
| 340 if ((event.type == blink::WebInputEvent::GestureScrollUpdate && | 340 if ((event.type == blink::WebInputEvent::GestureScrollUpdate && |
| 341 not_consumed) || | 341 not_consumed) || |
| 342 event.type == blink::WebInputEvent::GestureScrollEnd) | 342 event.type == blink::WebInputEvent::GestureScrollEnd) |
| 343 frame_connector_->BubbleScrollEvent(event); | 343 frame_connector_->BubbleScrollEvent(event); |
| 344 } | 344 } |
| 345 | 345 |
| 346 void RenderWidgetHostViewChildFrame::SurfaceDrawn(uint32_t output_surface_id, | 346 void RenderWidgetHostViewChildFrame::SurfaceDrawn(uint32_t output_surface_id) { |
| 347 cc::SurfaceDrawStatus drawn) { | |
| 348 DCHECK_GT(ack_pending_count_, 0U); | 347 DCHECK_GT(ack_pending_count_, 0U); |
| 349 if (host_) { | 348 if (host_) { |
| 350 host_->Send(new ViewMsg_ReclaimCompositorResources( | 349 host_->Send(new ViewMsg_ReclaimCompositorResources( |
| 351 host_->GetRoutingID(), output_surface_id, true /* is_swap_ack */, | 350 host_->GetRoutingID(), output_surface_id, true /* is_swap_ack */, |
| 352 surface_returned_resources_)); | 351 surface_returned_resources_)); |
| 353 surface_returned_resources_.clear(); | 352 surface_returned_resources_.clear(); |
| 354 } | 353 } |
| 355 ack_pending_count_--; | 354 ack_pending_count_--; |
| 356 } | 355 } |
| 357 | 356 |
| (...skipping 319 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 677 | 676 |
| 678 bool RenderWidgetHostViewChildFrame::IsChildFrameForTesting() const { | 677 bool RenderWidgetHostViewChildFrame::IsChildFrameForTesting() const { |
| 679 return true; | 678 return true; |
| 680 } | 679 } |
| 681 | 680 |
| 682 cc::SurfaceId RenderWidgetHostViewChildFrame::SurfaceIdForTesting() const { | 681 cc::SurfaceId RenderWidgetHostViewChildFrame::SurfaceIdForTesting() const { |
| 683 return surface_id_; | 682 return surface_id_; |
| 684 }; | 683 }; |
| 685 | 684 |
| 686 } // namespace content | 685 } // namespace content |
| OLD | NEW |