Chromium Code Reviews| Index: content/browser/renderer_host/render_widget_host_view_android.cc |
| diff --git a/content/browser/renderer_host/render_widget_host_view_android.cc b/content/browser/renderer_host/render_widget_host_view_android.cc |
| index 3060c6e4657541450a7cb24e2cfde5a21b02de64..7189f166d15c379bb3a7f709f9295f908a9b47ab 100644 |
| --- a/content/browser/renderer_host/render_widget_host_view_android.cc |
| +++ b/content/browser/renderer_host/render_widget_host_view_android.cc |
| @@ -21,6 +21,22 @@ |
| namespace content { |
| +namespace { |
| + |
| +// TODO(pliard): http://crbug.com/142585. Remove this helper function and update |
| +// the clients to deal directly with WebKit::WebTextDirection. |
| +base::i18n::TextDirection ConvertTextDirection(WebKit::WebTextDirection dir) { |
| + switch (dir) { |
| + case WebKit::WebTextDirectionDefault: return base::i18n::UNKNOWN_DIRECTION; |
| + case WebKit::WebTextDirectionLeftToRight: return base::i18n::LEFT_TO_RIGHT; |
| + case WebKit::WebTextDirectionRightToLeft: return base::i18n::RIGHT_TO_LEFT; |
| + default: NOTREACHED() << "Unsupported text direction " << dir; |
|
sky
2012/10/09 00:09:30
Can you remove this and move outside the switch?
Iain Merrick
2012/10/10 15:01:40
Done.
|
| + } |
| + return base::i18n::UNKNOWN_DIRECTION; |
| +} |
| + |
| +} // namespace |
| + |
| RenderWidgetHostViewAndroid::RenderWidgetHostViewAndroid( |
| RenderWidgetHostImpl* widget_host, |
| ContentViewCoreImpl* content_view_core) |
| @@ -251,6 +267,20 @@ void RenderWidgetHostViewAndroid::SelectionChanged(const string16& text, |
| content_view_core_->OnSelectionChanged(utf8_selection); |
| } |
| +void RenderWidgetHostViewAndroid::SelectionBoundsChanged( |
| + const gfx::Rect& start_rect, |
| + WebKit::WebTextDirection start_direction, |
| + const gfx::Rect& end_rect, |
| + WebKit::WebTextDirection end_direction) { |
| + if (content_view_core_ && host_) { |
|
sky
2012/10/09 00:09:30
Can content_view_core_ ever be NULL? And why the h
Iain Merrick
2012/10/10 15:01:40
The host_ check seems pointless. I'll remove it.
|
| + content_view_core_->OnSelectionBoundsChanged( |
| + start_rect, |
| + ConvertTextDirection(start_direction), |
| + end_rect, |
| + ConvertTextDirection(end_direction)); |
| + } |
| +} |
| + |
| BackingStore* RenderWidgetHostViewAndroid::AllocBackingStore( |
| const gfx::Size& size) { |
| NOTIMPLEMENTED(); |