Chromium Code Reviews| Index: content/browser/renderer_host/render_widget_host_view_aura.cc |
| diff --git a/content/browser/renderer_host/render_widget_host_view_aura.cc b/content/browser/renderer_host/render_widget_host_view_aura.cc |
| index e09bf33cdb434d959f8980dd36dd4a34b176020f..3d993b09db68c414d9269741ca2acc7808fbf22a 100644 |
| --- a/content/browser/renderer_host/render_widget_host_view_aura.cc |
| +++ b/content/browser/renderer_host/render_widget_host_view_aura.cc |
| @@ -182,6 +182,8 @@ class WinScreenKeyboardObserver : public ui::OnScreenKeyboardObserver { |
| gfx::Point origin(location_in_screen_); |
| screen_position_client->ConvertPointFromScreen(window_, &origin); |
| + // TODO(ekaramad): We should support the case where the focused node is |
| + // inside an OOPIF (https://crbug.com/676037). |
|
ncarter (slow)
2016/12/21 18:46:09
As we discussed over chat, we may actually never n
EhsanK
2016/12/21 18:49:58
Yes agreed. I believe we might need to fix the scr
|
| // We want to scroll the node into a rectangle which originates from |
| // the touch point and a small offset (10) in either direction. |
| gfx::Rect node_rect(origin.x(), origin.y(), 10, 10); |
| @@ -780,7 +782,7 @@ void RenderWidgetHostViewAura::FocusedNodeTouched( |
| ui::OnScreenKeyboardDisplayManager* osk_display_manager = |
| ui::OnScreenKeyboardDisplayManager::GetInstance(); |
| DCHECK(osk_display_manager); |
| - if (editable && host_ && host_->GetView()) { |
| + if (editable && host_ && host_->GetView() && host_->delegate()) { |
| keyboard_observer_.reset(new WinScreenKeyboardObserver( |
| host_, location_dips_screen, device_scale_factor_, window_)); |
| virtual_keyboard_requested_ = |