OLD | NEW |
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 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/renderer_host/render_widget_host_view_aura.h" | 5 #include "content/browser/renderer_host/render_widget_host_view_aura.h" |
6 | 6 |
7 #include <set> | 7 #include <set> |
8 #include <utility> | 8 #include <utility> |
9 | 9 |
10 #include "base/auto_reset.h" | 10 #include "base/auto_reset.h" |
(...skipping 919 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
930 | 930 |
931 start_edge_top.Scale(viewportToDIPScale); | 931 start_edge_top.Scale(viewportToDIPScale); |
932 start_edge_bottom.Scale(viewportToDIPScale); | 932 start_edge_bottom.Scale(viewportToDIPScale); |
933 end_edge_top.Scale(viewportToDIPScale); | 933 end_edge_top.Scale(viewportToDIPScale); |
934 end_edge_bottom.Scale(viewportToDIPScale); | 934 end_edge_bottom.Scale(viewportToDIPScale); |
935 | 935 |
936 selection.start.SetEdge(start_edge_top, start_edge_bottom); | 936 selection.start.SetEdge(start_edge_top, start_edge_bottom); |
937 selection.end.SetEdge(end_edge_top, end_edge_bottom); | 937 selection.end.SetEdge(end_edge_top, end_edge_bottom); |
938 } | 938 } |
939 | 939 |
| 940 cc::BeginFrameAck ack(frame.metadata.begin_frame_ack); |
| 941 |
940 if (delegated_frame_host_) { | 942 if (delegated_frame_host_) { |
941 delegated_frame_host_->SwapDelegatedFrame(compositor_frame_sink_id, | 943 delegated_frame_host_->SwapDelegatedFrame(compositor_frame_sink_id, |
942 std::move(frame)); | 944 std::move(frame)); |
943 } | 945 } |
944 selection_controller_->OnSelectionBoundsChanged(selection.start, | 946 selection_controller_->OnSelectionBoundsChanged(selection.start, |
945 selection.end); | 947 selection.end); |
| 948 |
| 949 if (begin_frame_source_) |
| 950 begin_frame_source_->DidFinishFrame(this, ack); |
| 951 } |
| 952 |
| 953 void RenderWidgetHostViewAura::OnBeginFrameDidNotSwap( |
| 954 const cc::BeginFrameAck& ack) { |
| 955 if (begin_frame_source_) |
| 956 begin_frame_source_->DidFinishFrame(this, ack); |
946 } | 957 } |
947 | 958 |
948 void RenderWidgetHostViewAura::ClearCompositorFrame() { | 959 void RenderWidgetHostViewAura::ClearCompositorFrame() { |
949 if (delegated_frame_host_) | 960 if (delegated_frame_host_) |
950 delegated_frame_host_->ClearDelegatedFrame(); | 961 delegated_frame_host_->ClearDelegatedFrame(); |
951 } | 962 } |
952 | 963 |
953 void RenderWidgetHostViewAura::DidStopFlinging() { | 964 void RenderWidgetHostViewAura::DidStopFlinging() { |
954 selection_controller_client_->OnScrollCompleted(); | 965 selection_controller_client_->OnScrollCompleted(); |
955 } | 966 } |
(...skipping 1412 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
2368 | 2379 |
2369 void RenderWidgetHostViewAura::SetPopupChild( | 2380 void RenderWidgetHostViewAura::SetPopupChild( |
2370 RenderWidgetHostViewAura* popup_child_host_view) { | 2381 RenderWidgetHostViewAura* popup_child_host_view) { |
2371 popup_child_host_view_ = popup_child_host_view; | 2382 popup_child_host_view_ = popup_child_host_view; |
2372 event_handler_->SetPopupChild( | 2383 event_handler_->SetPopupChild( |
2373 popup_child_host_view, | 2384 popup_child_host_view, |
2374 popup_child_host_view ? popup_child_host_view->event_handler() : nullptr); | 2385 popup_child_host_view ? popup_child_host_view->event_handler() : nullptr); |
2375 } | 2386 } |
2376 | 2387 |
2377 } // namespace content | 2388 } // namespace content |
OLD | NEW |