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 1554 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1565 #if defined(OS_ANDROID) | 1565 #if defined(OS_ANDROID) |
1566 view_->UpdateFrameInfo( | 1566 view_->UpdateFrameInfo( |
1567 frame->metadata.root_scroll_offset, | 1567 frame->metadata.root_scroll_offset, |
1568 frame->metadata.page_scale_factor, | 1568 frame->metadata.page_scale_factor, |
1569 gfx::Vector2dF( | 1569 gfx::Vector2dF( |
1570 frame->metadata.min_page_scale_factor, | 1570 frame->metadata.min_page_scale_factor, |
1571 frame->metadata.max_page_scale_factor), | 1571 frame->metadata.max_page_scale_factor), |
1572 frame->metadata.root_layer_size, | 1572 frame->metadata.root_layer_size, |
1573 frame->metadata.viewport_size, | 1573 frame->metadata.viewport_size, |
1574 frame->metadata.location_bar_offset, | 1574 frame->metadata.location_bar_offset, |
1575 frame->metadata.location_bar_content_translation); | 1575 frame->metadata.location_bar_content_translation, |
| 1576 frame->metadata.overdraw_bottom_height); |
1576 #endif | 1577 #endif |
1577 view_->OnSwapCompositorFrame(frame.Pass()); | 1578 view_->OnSwapCompositorFrame(frame.Pass()); |
1578 } else { | 1579 } else { |
1579 cc::CompositorFrameAck ack; | 1580 cc::CompositorFrameAck ack; |
1580 if (frame->gl_frame_data) { | 1581 if (frame->gl_frame_data) { |
1581 ack.gl_frame_data = frame->gl_frame_data.Pass(); | 1582 ack.gl_frame_data = frame->gl_frame_data.Pass(); |
1582 ack.gl_frame_data->sync_point = 0; | 1583 ack.gl_frame_data->sync_point = 0; |
1583 } else if (frame->delegated_frame_data) { | 1584 } else if (frame->delegated_frame_data) { |
1584 ack.resources.swap(frame->delegated_frame_data->resource_list); | 1585 ack.resources.swap(frame->delegated_frame_data->resource_list); |
1585 } | 1586 } |
(...skipping 842 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
2428 return; | 2429 return; |
2429 | 2430 |
2430 OnRenderAutoResized(new_size); | 2431 OnRenderAutoResized(new_size); |
2431 } | 2432 } |
2432 | 2433 |
2433 void RenderWidgetHostImpl::DetachDelegate() { | 2434 void RenderWidgetHostImpl::DetachDelegate() { |
2434 delegate_ = NULL; | 2435 delegate_ = NULL; |
2435 } | 2436 } |
2436 | 2437 |
2437 } // namespace content | 2438 } // namespace content |
OLD | NEW |