Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(574)

Unified Diff: content/renderer/render_widget.cc

Issue 780343002: Remove always true guard (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 years ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: content/renderer/render_widget.cc
diff --git a/content/renderer/render_widget.cc b/content/renderer/render_widget.cc
index d69275126570b89de42f8df859b45decd2546707..45a329cd97399915097b4789afb53bb3ec3e9b12 100644
--- a/content/renderer/render_widget.cc
+++ b/content/renderer/render_widget.cc
@@ -1569,9 +1569,7 @@ void RenderWidget::OnImeSetComposition(
// sure we are in a consistent state.
Send(new InputHostMsg_ImeCancelComposition(routing_id()));
}
-#if defined(OS_MACOSX) || defined(USE_AURA) || defined(OS_ANDROID)
UpdateCompositionInfo(true);
-#endif
}
void RenderWidget::OnImeConfirmComposition(const base::string16& text,
@@ -1588,9 +1586,7 @@ void RenderWidget::OnImeConfirmComposition(const base::string16& text,
else
webwidget_->confirmComposition(WebWidget::DoNotKeepSelection);
handling_input_event_ = false;
-#if defined(OS_MACOSX) || defined(USE_AURA) || defined(OS_ANDROID)
UpdateCompositionInfo(true);
-#endif
}
void RenderWidget::OnRepaint(gfx::Size size_to_paint) {
@@ -1920,9 +1916,7 @@ void RenderWidget::UpdateSelectionBounds() {
}
}
-#if defined(OS_MACOSX) || defined(USE_AURA) || defined(OS_ANDROID)
UpdateCompositionInfo(false);
-#endif
}
// Check blink::WebTextInputType and ui::TextInputType is kept in sync.
@@ -1975,7 +1969,6 @@ ui::TextInputType RenderWidget::GetTextInputType() {
return ui::TEXT_INPUT_TYPE_NONE;
}
-#if defined(OS_MACOSX) || defined(USE_AURA) || defined(OS_ANDROID)
void RenderWidget::UpdateCompositionInfo(bool should_update_range) {
#if defined(OS_ANDROID)
// Sending composition info makes sense only in Lollipop (API level 21)
@@ -2033,7 +2026,6 @@ bool RenderWidget::ShouldUpdateCompositionInfo(
}
return false;
}
-#endif
#if defined(OS_ANDROID)
void RenderWidget::DidChangeBodyBackgroundColor(SkColor bg_color) {
@@ -2075,9 +2067,7 @@ void RenderWidget::resetInputMethod() {
Send(new InputHostMsg_ImeCancelComposition(routing_id()));
}
-#if defined(OS_MACOSX) || defined(USE_AURA) || defined(OS_ANDROID)
UpdateCompositionInfo(true);
-#endif
}
void RenderWidget::didHandleGestureEvent(

Powered by Google App Engine
This is Rietveld 408576698