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 1590 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1601 #if defined(OS_ANDROID) | 1601 #if defined(OS_ANDROID) |
1602 view_->UpdateFrameInfo( | 1602 view_->UpdateFrameInfo( |
1603 frame->metadata.root_scroll_offset, | 1603 frame->metadata.root_scroll_offset, |
1604 frame->metadata.page_scale_factor, | 1604 frame->metadata.page_scale_factor, |
1605 gfx::Vector2dF( | 1605 gfx::Vector2dF( |
1606 frame->metadata.min_page_scale_factor, | 1606 frame->metadata.min_page_scale_factor, |
1607 frame->metadata.max_page_scale_factor), | 1607 frame->metadata.max_page_scale_factor), |
1608 frame->metadata.root_layer_size, | 1608 frame->metadata.root_layer_size, |
1609 frame->metadata.viewport_size, | 1609 frame->metadata.viewport_size, |
1610 frame->metadata.location_bar_offset, | 1610 frame->metadata.location_bar_offset, |
1611 frame->metadata.location_bar_content_translation); | 1611 frame->metadata.location_bar_content_translation, |
| 1612 frame->metadata.overdraw_bottom_height); |
1612 #endif | 1613 #endif |
1613 view_->OnSwapCompositorFrame(frame.Pass()); | 1614 view_->OnSwapCompositorFrame(frame.Pass()); |
1614 } else { | 1615 } else { |
1615 cc::CompositorFrameAck ack; | 1616 cc::CompositorFrameAck ack; |
1616 if (frame->gl_frame_data) { | 1617 if (frame->gl_frame_data) { |
1617 ack.gl_frame_data = frame->gl_frame_data.Pass(); | 1618 ack.gl_frame_data = frame->gl_frame_data.Pass(); |
1618 ack.gl_frame_data->sync_point = 0; | 1619 ack.gl_frame_data->sync_point = 0; |
1619 } else if (frame->delegated_frame_data) { | 1620 } else if (frame->delegated_frame_data) { |
1620 ack.resources.swap(frame->delegated_frame_data->resource_list); | 1621 ack.resources.swap(frame->delegated_frame_data->resource_list); |
1621 } | 1622 } |
(...skipping 842 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
2464 return; | 2465 return; |
2465 | 2466 |
2466 OnRenderAutoResized(new_size); | 2467 OnRenderAutoResized(new_size); |
2467 } | 2468 } |
2468 | 2469 |
2469 void RenderWidgetHostImpl::DetachDelegate() { | 2470 void RenderWidgetHostImpl::DetachDelegate() { |
2470 delegate_ = NULL; | 2471 delegate_ = NULL; |
2471 } | 2472 } |
2472 | 2473 |
2473 } // namespace content | 2474 } // namespace content |
OLD | NEW |