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 926 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
937 } | 937 } |
938 | 938 |
939 if (delegated_frame_host_) { | 939 if (delegated_frame_host_) { |
940 delegated_frame_host_->SubmitCompositorFrame(local_surface_id, | 940 delegated_frame_host_->SubmitCompositorFrame(local_surface_id, |
941 std::move(frame)); | 941 std::move(frame)); |
942 } | 942 } |
943 selection_controller_->OnSelectionBoundsChanged(selection.start, | 943 selection_controller_->OnSelectionBoundsChanged(selection.start, |
944 selection.end); | 944 selection.end); |
945 } | 945 } |
946 | 946 |
947 void RenderWidgetHostViewAura::OnBeginFrameDidNotSwap( | 947 void RenderWidgetHostViewAura::OnDidNotProduceFrame( |
948 const cc::BeginFrameAck& ack) { | 948 const cc::BeginFrameAck& ack) { |
949 delegated_frame_host_->BeginFrameDidNotSwap(ack); | 949 if (delegated_frame_host_) |
| 950 delegated_frame_host_->DidNotProduceFrame(ack); |
950 } | 951 } |
951 | 952 |
952 void RenderWidgetHostViewAura::ClearCompositorFrame() { | 953 void RenderWidgetHostViewAura::ClearCompositorFrame() { |
953 if (delegated_frame_host_) | 954 if (delegated_frame_host_) |
954 delegated_frame_host_->ClearDelegatedFrame(); | 955 delegated_frame_host_->ClearDelegatedFrame(); |
955 } | 956 } |
956 | 957 |
957 void RenderWidgetHostViewAura::DidStopFlinging() { | 958 void RenderWidgetHostViewAura::DidStopFlinging() { |
958 selection_controller_client_->OnScrollCompleted(); | 959 selection_controller_client_->OnScrollCompleted(); |
959 } | 960 } |
(...skipping 1446 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
2406 } | 2407 } |
2407 | 2408 |
2408 void RenderWidgetHostViewAura::UpdateNeedsBeginFramesInternal() { | 2409 void RenderWidgetHostViewAura::UpdateNeedsBeginFramesInternal() { |
2409 if (!delegated_frame_host_) | 2410 if (!delegated_frame_host_) |
2410 return; | 2411 return; |
2411 delegated_frame_host_->SetNeedsBeginFrames(needs_begin_frames_ || | 2412 delegated_frame_host_->SetNeedsBeginFrames(needs_begin_frames_ || |
2412 needs_flush_input_); | 2413 needs_flush_input_); |
2413 } | 2414 } |
2414 | 2415 |
2415 } // namespace content | 2416 } // namespace content |
OLD | NEW |