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_view_android.h" | 5 #include "content/browser/renderer_host/render_widget_host_view_android.h" |
6 | 6 |
7 #include <android/bitmap.h> | 7 #include <android/bitmap.h> |
8 | 8 |
9 #include <utility> | 9 #include <utility> |
10 | 10 |
(...skipping 1410 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1421 view_.OnBottomControlsChanged(translate, bottom_shown_pix); | 1421 view_.OnBottomControlsChanged(translate, bottom_shown_pix); |
1422 prev_bottom_shown_pix_ = bottom_shown_pix; | 1422 prev_bottom_shown_pix_ = bottom_shown_pix; |
1423 } | 1423 } |
1424 | 1424 |
1425 // All offsets and sizes are in CSS pixels. | 1425 // All offsets and sizes are in CSS pixels. |
1426 content_view_core_->UpdateFrameInfo( | 1426 content_view_core_->UpdateFrameInfo( |
1427 frame_metadata.root_scroll_offset, frame_metadata.page_scale_factor, | 1427 frame_metadata.root_scroll_offset, frame_metadata.page_scale_factor, |
1428 gfx::Vector2dF(frame_metadata.min_page_scale_factor, | 1428 gfx::Vector2dF(frame_metadata.min_page_scale_factor, |
1429 frame_metadata.max_page_scale_factor), | 1429 frame_metadata.max_page_scale_factor), |
1430 frame_metadata.root_layer_size, frame_metadata.scrollable_viewport_size, | 1430 frame_metadata.root_layer_size, frame_metadata.scrollable_viewport_size, |
1431 frame_metadata.top_controls_height, | 1431 frame_metadata.top_controls_height * |
1432 frame_metadata.top_controls_shown_ratio, is_mobile_optimized); | 1432 frame_metadata.top_controls_shown_ratio, |
| 1433 top_shown_pix, top_changed, is_mobile_optimized); |
1433 } | 1434 } |
1434 | 1435 |
1435 void RenderWidgetHostViewAndroid::ShowInternal() { | 1436 void RenderWidgetHostViewAndroid::ShowInternal() { |
1436 bool show = is_showing_ && is_window_activity_started_ && is_window_visible_; | 1437 bool show = is_showing_ && is_window_activity_started_ && is_window_visible_; |
1437 if (!show) | 1438 if (!show) |
1438 return; | 1439 return; |
1439 | 1440 |
1440 if (!host_ || !host_->is_hidden()) | 1441 if (!host_ || !host_->is_hidden()) |
1441 return; | 1442 return; |
1442 | 1443 |
(...skipping 747 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
2190 | 2191 |
2191 ui::WindowAndroidCompositor* compositor = window_android->GetCompositor(); | 2192 ui::WindowAndroidCompositor* compositor = window_android->GetCompositor(); |
2192 if (!compositor) | 2193 if (!compositor) |
2193 return; | 2194 return; |
2194 | 2195 |
2195 overscroll_controller_ = base::MakeUnique<OverscrollControllerAndroid>( | 2196 overscroll_controller_ = base::MakeUnique<OverscrollControllerAndroid>( |
2196 overscroll_refresh_handler, compositor, view_.GetDipScale()); | 2197 overscroll_refresh_handler, compositor, view_.GetDipScale()); |
2197 } | 2198 } |
2198 | 2199 |
2199 } // namespace content | 2200 } // namespace content |
OLD | NEW |