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_impl.h" | 5 #include "content/browser/renderer_host/render_widget_host_impl.h" |
6 | 6 |
7 #include <math.h> | 7 #include <math.h> |
8 #include <utility> | 8 #include <utility> |
9 | 9 |
10 #include "base/auto_reset.h" | 10 #include "base/auto_reset.h" |
(...skipping 1668 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1679 if (view_) { | 1679 if (view_) { |
1680 view_->OnSwapCompositorFrame(frame.Pass()); | 1680 view_->OnSwapCompositorFrame(frame.Pass()); |
1681 } else { | 1681 } else { |
1682 cc::CompositorFrameAck ack; | 1682 cc::CompositorFrameAck ack; |
1683 if (frame->gl_frame_data) { | 1683 if (frame->gl_frame_data) { |
1684 ack.gl_frame_data = frame->gl_frame_data.Pass(); | 1684 ack.gl_frame_data = frame->gl_frame_data.Pass(); |
1685 ack.gl_frame_data->sync_point = 0; | 1685 ack.gl_frame_data->sync_point = 0; |
1686 } else if (frame->delegated_frame_data) { | 1686 } else if (frame->delegated_frame_data) { |
1687 ack.resources.swap(frame->delegated_frame_data->resource_list); | 1687 ack.resources.swap(frame->delegated_frame_data->resource_list); |
1688 } else if (frame->software_frame_data) { | 1688 } else if (frame->software_frame_data) { |
1689 ack.last_dib_id = frame->software_frame_data->dib_id; | 1689 ack.last_software_frame_id = frame->software_frame_data->id; |
1690 } | 1690 } |
1691 SendSwapCompositorFrameAck(routing_id_, process_->GetID(), ack); | 1691 SendSwapCompositorFrameAck(routing_id_, process_->GetID(), ack); |
1692 } | 1692 } |
1693 return true; | 1693 return true; |
1694 } | 1694 } |
1695 | 1695 |
1696 void RenderWidgetHostImpl::OnOverscrolled( | 1696 void RenderWidgetHostImpl::OnOverscrolled( |
1697 gfx::Vector2dF accumulated_overscroll, | 1697 gfx::Vector2dF accumulated_overscroll, |
1698 gfx::Vector2dF current_fling_velocity) { | 1698 gfx::Vector2dF current_fling_velocity) { |
1699 if (view_) | 1699 if (view_) |
(...skipping 782 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
2482 } | 2482 } |
2483 | 2483 |
2484 void RenderWidgetHostImpl::DetachDelegate() { | 2484 void RenderWidgetHostImpl::DetachDelegate() { |
2485 delegate_ = NULL; | 2485 delegate_ = NULL; |
2486 } | 2486 } |
2487 | 2487 |
2488 void RenderWidgetHostImpl::FrameSwapped(const cc::LatencyInfo& latency_info) { | 2488 void RenderWidgetHostImpl::FrameSwapped(const cc::LatencyInfo& latency_info) { |
2489 } | 2489 } |
2490 | 2490 |
2491 } // namespace content | 2491 } // namespace content |
OLD | NEW |