| Index: third_party/WebKit/Source/core/editing/InputMethodController.cpp
|
| diff --git a/third_party/WebKit/Source/core/editing/InputMethodController.cpp b/third_party/WebKit/Source/core/editing/InputMethodController.cpp
|
| index 5b46a96cc3e4b46234b9885ed4e2c95a28259f69..36fd3845807c24fbba7acbbffced0ab42ebf1bbe 100644
|
| --- a/third_party/WebKit/Source/core/editing/InputMethodController.cpp
|
| +++ b/third_party/WebKit/Source/core/editing/InputMethodController.cpp
|
| @@ -45,6 +45,8 @@
|
| #include "core/layout/LayoutObject.h"
|
| #include "core/layout/LayoutTheme.h"
|
| #include "core/page/ChromeClient.h"
|
| +#include "core/page/Page.h"
|
| +#include "core/page/PageAnimator.h"
|
|
|
| namespace blink {
|
|
|
| @@ -1182,11 +1184,19 @@ WebTextInputType InputMethodController::textInputType() const {
|
| // It's important to preserve the equivalence of textInputInfo().type and
|
| // textInputType(), so perform the same rootEditableElement() existence check
|
| // here for consistency.
|
| - if (!frame()
|
| - .selection()
|
| - .computeVisibleSelectionInDOMTreeDeprecated()
|
| - .rootEditableElement())
|
| - return WebTextInputTypeNone;
|
| + {
|
| + // TODO(alancutter): Move this frame request supression logic up into
|
| + // BeginMainFrame.
|
| + PageAnimator::FrameRequestSuppressionScope suppressFrameRequests(
|
| + frame().page() ? &frame().page()->animator() : nullptr);
|
| +
|
| + if (!frame()
|
| + .selection()
|
| + .computeVisibleSelectionInDOMTreeDeprecated()
|
| + .rootEditableElement()) {
|
| + return WebTextInputTypeNone;
|
| + }
|
| + }
|
|
|
| if (!isAvailable())
|
| return WebTextInputTypeNone;
|
|
|