| 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 <set> | 8 #include <set> |
| 9 #include <utility> | 9 #include <utility> |
| 10 | 10 |
| (...skipping 1537 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1548 } else if (frame->software_frame_data) { | 1548 } else if (frame->software_frame_data) { |
| 1549 ack.last_software_frame_id = frame->software_frame_data->id; | 1549 ack.last_software_frame_id = frame->software_frame_data->id; |
| 1550 } | 1550 } |
| 1551 SendSwapCompositorFrameAck(routing_id_, process_->GetID(), | 1551 SendSwapCompositorFrameAck(routing_id_, process_->GetID(), |
| 1552 output_surface_id, ack); | 1552 output_surface_id, ack); |
| 1553 } | 1553 } |
| 1554 return true; | 1554 return true; |
| 1555 } | 1555 } |
| 1556 | 1556 |
| 1557 void RenderWidgetHostImpl::OnOverscrolled( | 1557 void RenderWidgetHostImpl::OnOverscrolled( |
| 1558 gfx::Vector2dF accumulated_overscroll, | 1558 gfx::Vector2dF accumulated_overscroll) { |
| 1559 gfx::Vector2dF current_fling_velocity) { | |
| 1560 if (view_) | 1559 if (view_) |
| 1561 view_->OnOverscrolled(accumulated_overscroll, current_fling_velocity); | 1560 view_->OnOverscrolled(accumulated_overscroll, gfx::Vector2dF()); |
| 1562 } | 1561 } |
| 1563 | 1562 |
| 1564 void RenderWidgetHostImpl::OnUpdateRect( | 1563 void RenderWidgetHostImpl::OnUpdateRect( |
| 1565 const ViewHostMsg_UpdateRect_Params& params) { | 1564 const ViewHostMsg_UpdateRect_Params& params) { |
| 1566 TRACE_EVENT0("renderer_host", "RenderWidgetHostImpl::OnUpdateRect"); | 1565 TRACE_EVENT0("renderer_host", "RenderWidgetHostImpl::OnUpdateRect"); |
| 1567 TimeTicks paint_start = TimeTicks::Now(); | 1566 TimeTicks paint_start = TimeTicks::Now(); |
| 1568 | 1567 |
| 1569 // Update our knowledge of the RenderWidget's size. | 1568 // Update our knowledge of the RenderWidget's size. |
| 1570 current_size_ = params.view_size; | 1569 current_size_ = params.view_size; |
| 1571 // Update our knowledge of the RenderWidget's scroll offset. | 1570 // Update our knowledge of the RenderWidget's scroll offset. |
| (...skipping 912 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 2484 continue; | 2483 continue; |
| 2485 } | 2484 } |
| 2486 RenderWidgetHostImpl* rwhi = RenderWidgetHostImpl::From(rwh); | 2485 RenderWidgetHostImpl* rwhi = RenderWidgetHostImpl::From(rwh); |
| 2487 if (rwhi_set.insert(rwhi).second) | 2486 if (rwhi_set.insert(rwhi).second) |
| 2488 rwhi->FrameSwapped(latency_info); | 2487 rwhi->FrameSwapped(latency_info); |
| 2489 } | 2488 } |
| 2490 } | 2489 } |
| 2491 } | 2490 } |
| 2492 | 2491 |
| 2493 } // namespace content | 2492 } // namespace content |
| OLD | NEW |