| Index: ui/keyboard/content/keyboard_ui_content.cc
|
| diff --git a/ui/keyboard/content/keyboard_ui_content.cc b/ui/keyboard/content/keyboard_ui_content.cc
|
| index cd6a2ab3a753c11ec8bfc8623193d8aea9913324..a466b6387d21502783953c4e48524f2f079b1073 100644
|
| --- a/ui/keyboard/content/keyboard_ui_content.cc
|
| +++ b/ui/keyboard/content/keyboard_ui_content.cc
|
| @@ -238,6 +238,12 @@ void KeyboardUIContent::InitInsets(const gfx::Rect& new_bounds) {
|
| // the render process crashed.
|
| if (view) {
|
| aura::Window* window = view->GetNativeView();
|
| + // Added while we determine if RenderWidgetHostViewChildFrame can be
|
| + // changed to always return a non-null value: https://crbug.com/644726 .
|
| + // If we cannot guarantee a non-null value, then this may need to stay.
|
| + if (!window)
|
| + continue;
|
| +
|
| if (ShouldWindowOverscroll(window)) {
|
| gfx::Rect window_bounds = window->GetBoundsInScreen();
|
| gfx::Rect intersect = gfx::IntersectRects(window_bounds,
|
|
|