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 1507 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1518 frame.metadata.root_scroll_offset, frame.metadata.page_scale_factor); | 1518 frame.metadata.root_scroll_offset, frame.metadata.page_scale_factor); |
1519 gfx::SizeF content_size = ScaleSize( | 1519 gfx::SizeF content_size = ScaleSize( |
1520 frame.metadata.root_layer_size, frame.metadata.page_scale_factor); | 1520 frame.metadata.root_layer_size, frame.metadata.page_scale_factor); |
1521 | 1521 |
1522 if (view_) { | 1522 if (view_) { |
1523 view_->UpdateFrameInfo( | 1523 view_->UpdateFrameInfo( |
1524 gfx::ToRoundedVector2d(scroll_offset), | 1524 gfx::ToRoundedVector2d(scroll_offset), |
1525 frame.metadata.page_scale_factor, | 1525 frame.metadata.page_scale_factor, |
1526 frame.metadata.min_page_scale_factor, | 1526 frame.metadata.min_page_scale_factor, |
1527 frame.metadata.max_page_scale_factor, | 1527 frame.metadata.max_page_scale_factor, |
1528 gfx::ToCeiledSize(content_size)); | 1528 gfx::ToCeiledSize(content_size), |
| 1529 frame.metadata.location_bar_offset, |
| 1530 frame.metadata.content_offset); |
1529 } | 1531 } |
1530 #endif | 1532 #endif |
1531 } | 1533 } |
1532 | 1534 |
1533 void RenderWidgetHostImpl::OnUpdateRect( | 1535 void RenderWidgetHostImpl::OnUpdateRect( |
1534 const ViewHostMsg_UpdateRect_Params& params) { | 1536 const ViewHostMsg_UpdateRect_Params& params) { |
1535 TRACE_EVENT0("renderer_host", "RenderWidgetHostImpl::OnUpdateRect"); | 1537 TRACE_EVENT0("renderer_host", "RenderWidgetHostImpl::OnUpdateRect"); |
1536 TimeTicks paint_start = TimeTicks::Now(); | 1538 TimeTicks paint_start = TimeTicks::Now(); |
1537 | 1539 |
1538 // Update our knowledge of the RenderWidget's size. | 1540 // Update our knowledge of the RenderWidget's size. |
(...skipping 792 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
2331 return; | 2333 return; |
2332 | 2334 |
2333 OnRenderAutoResized(new_size); | 2335 OnRenderAutoResized(new_size); |
2334 } | 2336 } |
2335 | 2337 |
2336 void RenderWidgetHostImpl::DetachDelegate() { | 2338 void RenderWidgetHostImpl::DetachDelegate() { |
2337 delegate_ = NULL; | 2339 delegate_ = NULL; |
2338 } | 2340 } |
2339 | 2341 |
2340 } // namespace content | 2342 } // namespace content |
OLD | NEW |