Index: content/browser/renderer_host/render_widget_host_view_android.cc |
diff --git a/content/browser/renderer_host/render_widget_host_view_android.cc b/content/browser/renderer_host/render_widget_host_view_android.cc |
index 4c3471fde722dc6d7b8a3d9a89cf588eeb55c98c..82ea2d0c7319214c780d411e927896a646a465e2 100644 |
--- a/content/browser/renderer_host/render_widget_host_view_android.cc |
+++ b/content/browser/renderer_host/render_widget_host_view_android.cc |
@@ -1371,7 +1371,7 @@ void RenderWidgetHostViewAndroid::OnFrameMetadataUpdated( |
bool is_mobile_optimized = IsMobileOptimizedFrame(frame_metadata); |
gesture_provider_.SetDoubleTapSupportForPageEnabled(!is_mobile_optimized); |
- if (!content_view_core_) |
+ if (!content_view_core_ || !ime_adapter_android_) |
boliu
2017/04/25 17:18:24
these two should be independent..
if cvc is not t
Jinsuk Kim
2017/04/25 22:39:01
Done. It was not doing anything when cvc is null.
|
return; |
if (overscroll_controller_) |
@@ -1419,18 +1419,17 @@ void RenderWidgetHostViewAndroid::OnFrameMetadataUpdated( |
prev_bottom_shown_pix_ = bottom_shown_pix; |
} |
+ ime_adapter_android_->UpdateFrameInfo(frame_metadata.selection.start, |
+ dip_scale, top_shown_pix); |
+ |
// All offsets and sizes are in CSS pixels. |
content_view_core_->UpdateFrameInfo( |
- frame_metadata.root_scroll_offset, |
- frame_metadata.page_scale_factor, |
+ frame_metadata.root_scroll_offset, frame_metadata.page_scale_factor, |
gfx::Vector2dF(frame_metadata.min_page_scale_factor, |
frame_metadata.max_page_scale_factor), |
- frame_metadata.root_layer_size, |
- frame_metadata.scrollable_viewport_size, |
+ frame_metadata.root_layer_size, frame_metadata.scrollable_viewport_size, |
frame_metadata.top_controls_height, |
- frame_metadata.top_controls_shown_ratio, |
- is_mobile_optimized, |
- frame_metadata.selection.start); |
+ frame_metadata.top_controls_shown_ratio, is_mobile_optimized); |
} |
void RenderWidgetHostViewAndroid::ShowInternal() { |