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 1504 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1515 frame.metadata.root_scroll_offset, frame.metadata.page_scale_factor); | 1515 frame.metadata.root_scroll_offset, frame.metadata.page_scale_factor); |
1516 gfx::SizeF content_size = ScaleSize( | 1516 gfx::SizeF content_size = ScaleSize( |
1517 frame.metadata.root_layer_size, frame.metadata.page_scale_factor); | 1517 frame.metadata.root_layer_size, frame.metadata.page_scale_factor); |
1518 | 1518 |
1519 if (view_) { | 1519 if (view_) { |
1520 view_->UpdateFrameInfo( | 1520 view_->UpdateFrameInfo( |
1521 gfx::ToRoundedVector2d(scroll_offset), | 1521 gfx::ToRoundedVector2d(scroll_offset), |
1522 frame.metadata.page_scale_factor, | 1522 frame.metadata.page_scale_factor, |
1523 frame.metadata.min_page_scale_factor, | 1523 frame.metadata.min_page_scale_factor, |
1524 frame.metadata.max_page_scale_factor, | 1524 frame.metadata.max_page_scale_factor, |
1525 gfx::ToCeiledSize(content_size)); | 1525 gfx::ToCeiledSize(content_size), |
| 1526 frame.metadata.location_bar_offset, |
| 1527 frame.metadata.location_bar_content_translation); |
1526 } | 1528 } |
1527 #endif | 1529 #endif |
1528 } | 1530 } |
1529 | 1531 |
1530 void RenderWidgetHostImpl::OnUpdateRect( | 1532 void RenderWidgetHostImpl::OnUpdateRect( |
1531 const ViewHostMsg_UpdateRect_Params& params) { | 1533 const ViewHostMsg_UpdateRect_Params& params) { |
1532 TRACE_EVENT0("renderer_host", "RenderWidgetHostImpl::OnUpdateRect"); | 1534 TRACE_EVENT0("renderer_host", "RenderWidgetHostImpl::OnUpdateRect"); |
1533 TimeTicks paint_start = TimeTicks::Now(); | 1535 TimeTicks paint_start = TimeTicks::Now(); |
1534 | 1536 |
1535 // Update our knowledge of the RenderWidget's size. | 1537 // Update our knowledge of the RenderWidget's size. |
(...skipping 824 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
2360 return; | 2362 return; |
2361 | 2363 |
2362 OnRenderAutoResized(new_size); | 2364 OnRenderAutoResized(new_size); |
2363 } | 2365 } |
2364 | 2366 |
2365 void RenderWidgetHostImpl::DetachDelegate() { | 2367 void RenderWidgetHostImpl::DetachDelegate() { |
2366 delegate_ = NULL; | 2368 delegate_ = NULL; |
2367 } | 2369 } |
2368 | 2370 |
2369 } // namespace content | 2371 } // namespace content |
OLD | NEW |