| 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 921 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 932 end_edge_bottom.Scale(viewportToDIPScale); | 932 end_edge_bottom.Scale(viewportToDIPScale); |
| 933 | 933 |
| 934 selection.start.SetEdge(start_edge_top, start_edge_bottom); | 934 selection.start.SetEdge(start_edge_top, start_edge_bottom); |
| 935 selection.end.SetEdge(end_edge_top, end_edge_bottom); | 935 selection.end.SetEdge(end_edge_top, end_edge_bottom); |
| 936 } | 936 } |
| 937 | 937 |
| 938 delegated_frame_host_->SwapDelegatedFrame(compositor_frame_sink_id, | 938 delegated_frame_host_->SwapDelegatedFrame(compositor_frame_sink_id, |
| 939 std::move(frame)); | 939 std::move(frame)); |
| 940 SelectionUpdated(selection.is_editable, selection.is_empty_text_form_control, | 940 SelectionUpdated(selection.is_editable, selection.is_empty_text_form_control, |
| 941 selection.start, selection.end); | 941 selection.start, selection.end); |
| 942 |
| 943 if (begin_frame_source_) |
| 944 begin_frame_source_->DidFinishFrame(this, 0); |
| 942 } | 945 } |
| 943 | 946 |
| 944 void RenderWidgetHostViewAura::ClearCompositorFrame() { | 947 void RenderWidgetHostViewAura::ClearCompositorFrame() { |
| 945 delegated_frame_host_->ClearDelegatedFrame(); | 948 delegated_frame_host_->ClearDelegatedFrame(); |
| 946 } | 949 } |
| 947 | 950 |
| 948 void RenderWidgetHostViewAura::DidStopFlinging() { | 951 void RenderWidgetHostViewAura::DidStopFlinging() { |
| 949 selection_controller_client_->OnScrollCompleted(); | 952 selection_controller_client_->OnScrollCompleted(); |
| 950 } | 953 } |
| 951 | 954 |
| (...skipping 1435 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 2387 | 2390 |
| 2388 void RenderWidgetHostViewAura::SetPopupChild( | 2391 void RenderWidgetHostViewAura::SetPopupChild( |
| 2389 RenderWidgetHostViewAura* popup_child_host_view) { | 2392 RenderWidgetHostViewAura* popup_child_host_view) { |
| 2390 popup_child_host_view_ = popup_child_host_view; | 2393 popup_child_host_view_ = popup_child_host_view; |
| 2391 event_handler_->SetPopupChild( | 2394 event_handler_->SetPopupChild( |
| 2392 popup_child_host_view, | 2395 popup_child_host_view, |
| 2393 popup_child_host_view ? popup_child_host_view->event_handler() : nullptr); | 2396 popup_child_host_view ? popup_child_host_view->event_handler() : nullptr); |
| 2394 } | 2397 } |
| 2395 | 2398 |
| 2396 } // namespace content | 2399 } // namespace content |
| OLD | NEW |