Index: content/browser/android/content_view_core_impl.cc |
diff --git a/content/browser/android/content_view_core_impl.cc b/content/browser/android/content_view_core_impl.cc |
index 4cb6da8994f4dd65a52654b0104c558c83adf513..b2a339765b1302d25ad2762ea5cde1779818d11e 100644 |
--- a/content/browser/android/content_view_core_impl.cc |
+++ b/content/browser/android/content_view_core_impl.cc |
@@ -393,14 +393,7 @@ void ContentViewCoreImpl::OnTabCrashed() { |
// Note that viewport_width/height is a best effort based. |
// ContentViewCore has the actual information about the physical viewport size. |
void ContentViewCoreImpl::UpdateFrameInfo( |
- const gfx::Vector2dF& scroll_offset, |
- float page_scale_factor, |
- const gfx::Vector2dF& page_scale_factor_limits, |
- const gfx::SizeF& content_size, |
- const gfx::SizeF& viewport_size, |
- const gfx::Vector2dF& controls_offset, |
- const gfx::Vector2dF& content_offset, |
- float overdraw_bottom_height) { |
+ const cc::CompositorFrameMetadata& frame_metadata) { |
JNIEnv* env = AttachCurrentThread(); |
ScopedJavaLocalRef<jobject> obj = java_ref_.get(env); |
if (obj.is_null()) |
@@ -411,23 +404,26 @@ void ContentViewCoreImpl::UpdateFrameInfo( |
Java_ContentViewCore_getLocationInWindowX(env, obj.obj()), |
Java_ContentViewCore_getLocationInWindowY(env, obj.obj())); |
window_android_->set_content_offset( |
- gfx::ScaleVector2d(content_offset, dpi_scale_) + window_offset); |
+ gfx::ScaleVector2d(frame_metadata.location_bar_content_translation, |
+ dpi_scale_) + |
+ window_offset); |
} |
Java_ContentViewCore_updateFrameInfo( |
env, obj.obj(), |
- scroll_offset.x(), |
- scroll_offset.y(), |
- page_scale_factor, |
- page_scale_factor_limits.x(), |
- page_scale_factor_limits.y(), |
- content_size.width(), |
- content_size.height(), |
- viewport_size.width(), |
- viewport_size.height(), |
- controls_offset.y(), |
- content_offset.y(), |
- overdraw_bottom_height); |
+ frame_metadata.root_scroll_offset.x(), |
+ frame_metadata.root_scroll_offset.y(), |
+ frame_metadata.page_scale_factor, |
+ frame_metadata.min_page_scale_factor, |
+ frame_metadata.max_page_scale_factor, |
+ frame_metadata.root_layer_size.width(), |
+ frame_metadata.root_layer_size.height(), |
+ frame_metadata.viewport_size.width(), |
+ frame_metadata.viewport_size.height(), |
+ frame_metadata.location_bar_offset.y(), |
+ frame_metadata.location_bar_content_translation.y(), |
+ frame_metadata.overdraw_bottom_height, |
+ frame_metadata.allow_delayed_resize); |
} |
void ContentViewCoreImpl::SetTitle(const base::string16& title) { |