| 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 1339 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1350 viewport_size.Scale(frame_metadata.page_scale_factor); | 1350 viewport_size.Scale(frame_metadata.page_scale_factor); |
| 1351 gfx::RectF viewport_rect(0.0f, frame_metadata.top_controls_height * | 1351 gfx::RectF viewport_rect(0.0f, frame_metadata.top_controls_height * |
| 1352 frame_metadata.top_controls_shown_ratio, | 1352 frame_metadata.top_controls_shown_ratio, |
| 1353 viewport_size.width(), viewport_size.height()); | 1353 viewport_size.width(), viewport_size.height()); |
| 1354 selection_controller_->OnViewportChanged(viewport_rect); | 1354 selection_controller_->OnViewportChanged(viewport_rect); |
| 1355 } | 1355 } |
| 1356 | 1356 |
| 1357 UpdateBackgroundColor(is_transparent ? SK_ColorTRANSPARENT | 1357 UpdateBackgroundColor(is_transparent ? SK_ColorTRANSPARENT |
| 1358 : frame_metadata.root_background_color); | 1358 : frame_metadata.root_background_color); |
| 1359 | 1359 |
| 1360 view_.set_content_offset(gfx::Vector2dF(0.0f, |
| 1361 frame_metadata.top_controls_height * |
| 1362 frame_metadata.top_controls_shown_ratio)); |
| 1363 |
| 1360 // All offsets and sizes are in CSS pixels. | 1364 // All offsets and sizes are in CSS pixels. |
| 1361 content_view_core_->UpdateFrameInfo( | 1365 content_view_core_->UpdateFrameInfo( |
| 1362 frame_metadata.root_scroll_offset, | 1366 frame_metadata.root_scroll_offset, |
| 1363 frame_metadata.page_scale_factor, | 1367 frame_metadata.page_scale_factor, |
| 1364 gfx::Vector2dF(frame_metadata.min_page_scale_factor, | 1368 gfx::Vector2dF(frame_metadata.min_page_scale_factor, |
| 1365 frame_metadata.max_page_scale_factor), | 1369 frame_metadata.max_page_scale_factor), |
| 1366 frame_metadata.root_layer_size, | 1370 frame_metadata.root_layer_size, |
| 1367 frame_metadata.scrollable_viewport_size, | 1371 frame_metadata.scrollable_viewport_size, |
| 1368 frame_metadata.top_controls_height, | 1372 frame_metadata.top_controls_height, |
| 1369 frame_metadata.top_controls_shown_ratio, | 1373 frame_metadata.top_controls_shown_ratio, |
| (...skipping 702 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 2072 if (!compositor) | 2076 if (!compositor) |
| 2073 return; | 2077 return; |
| 2074 | 2078 |
| 2075 overscroll_controller_ = base::MakeUnique<OverscrollControllerAndroid>( | 2079 overscroll_controller_ = base::MakeUnique<OverscrollControllerAndroid>( |
| 2076 overscroll_refresh_handler, compositor, | 2080 overscroll_refresh_handler, compositor, |
| 2077 ui::GetScaleFactorForNativeView(GetNativeView())); | 2081 ui::GetScaleFactorForNativeView(GetNativeView())); |
| 2078 is_showing_overscroll_glow_ = true; | 2082 is_showing_overscroll_glow_ = true; |
| 2079 } | 2083 } |
| 2080 | 2084 |
| 2081 } // namespace content | 2085 } // namespace content |
| OLD | NEW |