Index: content/renderer/render_view_impl.cc |
diff --git a/content/renderer/render_view_impl.cc b/content/renderer/render_view_impl.cc |
index dfb948d2ba5def0ba0f33140964d5ab449aefab8..2451921882ace953df04bafb6633f6ce633d7e63 100644 |
--- a/content/renderer/render_view_impl.cc |
+++ b/content/renderer/render_view_impl.cc |
@@ -1423,7 +1423,7 @@ void RenderViewImpl::OnScrollFocusedEditableNodeIntoRect( |
const gfx::Rect& rect) { |
if (has_scrolled_focused_editable_node_into_rect_ && |
rect == rect_for_scrolled_focused_editable_node_) { |
- FocusChangeComplete(); |
+ ImeShownAnimationsComplete(); |
return; |
} |
@@ -1436,7 +1436,7 @@ void RenderViewImpl::OnScrollFocusedEditableNodeIntoRect( |
} |
if (!will_animate) |
- FocusChangeComplete(); |
+ ImeShownAnimationsComplete(); |
} |
void RenderViewImpl::OnSetEditCommandsForNextKeyEvent( |
@@ -3620,9 +3620,9 @@ void RenderViewImpl::GetSelectionBounds(gfx::Rect* start, gfx::Rect* end) { |
RenderWidget::GetSelectionBounds(start, end); |
} |
-void RenderViewImpl::FocusChangeComplete() { |
- RenderWidget::FocusChangeComplete(); |
- FOR_EACH_OBSERVER(RenderViewObserver, observers_, FocusChangeComplete()); |
+void RenderViewImpl::ImeShownAnimationsComplete() { |
+ RenderWidget::ImeShownAnimationsComplete(); |
+ FOR_EACH_OBSERVER(RenderViewObserver, observers_, ImeShownAnimationsComplete()); |
} |
void RenderViewImpl::GetCompositionCharacterBounds( |
@@ -3712,7 +3712,7 @@ void RenderViewImpl::InstrumentWillComposite() { |
} |
void RenderViewImpl::DidCompletePageScaleAnimation() { |
- FocusChangeComplete(); |
+ ImeShownAnimationsComplete(); |
no sievers
2015/01/29 22:01:56
Also here: this is for example for double-tap zoom
please use gerrit instead
2015/01/29 22:24:24
DidCompletePageScaleAnimation is not four double-t
|
} |
void RenderViewImpl::SetScreenMetricsEmulationParameters( |