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 1671 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1682 if (view_) { | 1682 if (view_) { |
1683 view_->OnSwapCompositorFrame(frame.Pass()); | 1683 view_->OnSwapCompositorFrame(frame.Pass()); |
1684 } else { | 1684 } else { |
1685 cc::CompositorFrameAck ack; | 1685 cc::CompositorFrameAck ack; |
1686 if (frame->gl_frame_data) { | 1686 if (frame->gl_frame_data) { |
1687 ack.gl_frame_data = frame->gl_frame_data.Pass(); | 1687 ack.gl_frame_data = frame->gl_frame_data.Pass(); |
1688 ack.gl_frame_data->sync_point = 0; | 1688 ack.gl_frame_data->sync_point = 0; |
1689 } else if (frame->delegated_frame_data) { | 1689 } else if (frame->delegated_frame_data) { |
1690 ack.resources.swap(frame->delegated_frame_data->resource_list); | 1690 ack.resources.swap(frame->delegated_frame_data->resource_list); |
1691 } else if (frame->software_frame_data) { | 1691 } else if (frame->software_frame_data) { |
1692 ack.last_dib_id = frame->software_frame_data->dib_id; | 1692 ack.last_frame_id = frame->software_frame_data->id; |
1693 } | 1693 } |
1694 SendSwapCompositorFrameAck(routing_id_, process_->GetID(), ack); | 1694 SendSwapCompositorFrameAck(routing_id_, process_->GetID(), ack); |
1695 } | 1695 } |
1696 return true; | 1696 return true; |
1697 } | 1697 } |
1698 | 1698 |
1699 void RenderWidgetHostImpl::OnOverscrolled( | 1699 void RenderWidgetHostImpl::OnOverscrolled( |
1700 gfx::Vector2dF accumulated_overscroll, | 1700 gfx::Vector2dF accumulated_overscroll, |
1701 gfx::Vector2dF current_fling_velocity) { | 1701 gfx::Vector2dF current_fling_velocity) { |
1702 if (view_) | 1702 if (view_) |
(...skipping 776 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
2479 } | 2479 } |
2480 | 2480 |
2481 void RenderWidgetHostImpl::DetachDelegate() { | 2481 void RenderWidgetHostImpl::DetachDelegate() { |
2482 delegate_ = NULL; | 2482 delegate_ = NULL; |
2483 } | 2483 } |
2484 | 2484 |
2485 void RenderWidgetHostImpl::FrameSwapped(const cc::LatencyInfo& latency_info) { | 2485 void RenderWidgetHostImpl::FrameSwapped(const cc::LatencyInfo& latency_info) { |
2486 } | 2486 } |
2487 | 2487 |
2488 } // namespace content | 2488 } // namespace content |
OLD | NEW |