Index: content/renderer/render_widget.cc |
diff --git a/content/renderer/render_widget.cc b/content/renderer/render_widget.cc |
index 7706d466cf853b7b650d6d1e8a7854f8cfe8fe16..da9a582f318b61c7caaba4662e9f6fadb23c6f7e 100644 |
--- a/content/renderer/render_widget.cc |
+++ b/content/renderer/render_widget.cc |
@@ -1842,7 +1842,17 @@ ui::TextInputType RenderWidget::GetTextInputType() { |
} |
void RenderWidget::UpdateCompositionInfo(bool immediate_request) { |
- if (!monitor_composition_info_ && !immediate_request) |
+#if defined(OS_MACOSX) |
+ // On Mac without OOPIF, IME malfunctions if we skip update. |
aelias_OOO_until_Jul13
2017/05/23 18:14:48
"On Mac without OOPIF, <webview> IME"
|
+ // TODO(crbug.com/714771): Remove this platform-specific guard once we have |
+ // a proper fix for crbug.com/714771 or we fully launch OOPIF. |
aelias_OOO_until_Jul13
2017/05/23 18:14:48
doesn't need "fully launch OOPIF", just "launch OO
|
+ const bool may_skip_update = |
+ base::FeatureList::IsEnabled(::features::kGuestViewCrossProcessFrames); |
aelias_OOO_until_Jul13
2017/05/23 18:19:25
Please check that the current renderer is a <webvi
EhsanK
2017/05/23 18:39:50
Yes this is the generic way.
|
+#else |
+ const bool may_skip_update = true; |
+#endif |
+ |
+ if (may_skip_update && !monitor_composition_info_ && !immediate_request) |
return; // Do not calculate composition info if not requested. |
TRACE_EVENT0("renderer", "RenderWidget::UpdateCompositionInfo"); |