| 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 // GestureScrollBegin is consumed by the target frame and not forwarded, | 336 // GestureScrollBegin is consumed by the target frame and not forwarded, |
| 337 // because we don't know whether we will need to bubble scroll until we | 337 // because we don't know whether we will need to bubble scroll until we |
| 338 // receive a GestureScrollUpdate ACK. GestureScrollUpdate with unused | 338 // receive a GestureScrollUpdate ACK. GestureScrollUpdate with unused |
| 339 // scroll extent is forwarded for bubbling, while GestureScrollEnd is | 339 // scroll extent is forwarded for bubbling, while GestureScrollEnd is |
| 340 // always forwarded and handled according to current scroll state in the | 340 // always forwarded and handled according to current scroll state in the |
| 341 // RenderWidgetHostInputEventRouter. | 341 // RenderWidgetHostInputEventRouter. |
| 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 event.GetType() == blink::WebInputEvent::kGestureFlingStart) { |
| 347 frame_connector_->BubbleScrollEvent(event); | 348 frame_connector_->BubbleScrollEvent(event); |
| 349 } |
| 348 } | 350 } |
| 349 | 351 |
| 350 void RenderWidgetHostViewChildFrame::DidReceiveCompositorFrameAck( | 352 void RenderWidgetHostViewChildFrame::DidReceiveCompositorFrameAck( |
| 351 const cc::ReturnedResourceArray& resources) { | 353 const cc::ReturnedResourceArray& resources) { |
| 352 renderer_compositor_frame_sink_->DidReceiveCompositorFrameAck(resources); | 354 renderer_compositor_frame_sink_->DidReceiveCompositorFrameAck(resources); |
| 353 } | 355 } |
| 354 | 356 |
| 355 void RenderWidgetHostViewChildFrame::DidCreateNewRendererCompositorFrameSink( | 357 void RenderWidgetHostViewChildFrame::DidCreateNewRendererCompositorFrameSink( |
| 356 cc::mojom::MojoCompositorFrameSinkClient* renderer_compositor_frame_sink) { | 358 cc::mojom::MojoCompositorFrameSinkClient* renderer_compositor_frame_sink) { |
| 357 ResetCompositorFrameSinkSupport(); | 359 ResetCompositorFrameSinkSupport(); |
| (...skipping 355 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 713 frame_sink_id_); | 715 frame_sink_id_); |
| 714 } | 716 } |
| 715 support_.reset(); | 717 support_.reset(); |
| 716 } | 718 } |
| 717 | 719 |
| 718 bool RenderWidgetHostViewChildFrame::HasEmbedderChanged() { | 720 bool RenderWidgetHostViewChildFrame::HasEmbedderChanged() { |
| 719 return false; | 721 return false; |
| 720 } | 722 } |
| 721 | 723 |
| 722 } // namespace content | 724 } // namespace content |
| OLD | NEW |