Show selection handles around selected text.

content/browser/renderer_host/render_widget_host_view_android.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "content/browser/renderer_host/render_widget_host_view_android.h"
 
 #include "base/bind.h"
 #include "base/logging.h"
 #include "base/message_loop.h"
 #include "base/utf_string_conversions.h"
 #include "content/browser/android/content_view_core_impl.h"
 #include "content/browser/android/draw_delegate_impl.h"
 #include "content/browser/gpu/gpu_surface_tracker.h"
 #include "content/browser/renderer_host/compositor_impl_android.h"
 #include "content/browser/renderer_host/image_transport_factory_android.h"
 #include "content/browser/renderer_host/render_widget_host_impl.h"
 #include "content/common/android/device_info.h"
 #include "content/common/gpu/gpu_messages.h"
 #include "content/common/view_messages.h"
 #include "third_party/WebKit/Source/Platform/chromium/public/WebSize.h"
 
 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)
     : host_(widget_host),
       // ContentViewCoreImpl represents the native side of the Java
       // ContentViewCore.  It being NULL means that it is not attached to the
       // View system yet, so we treat it as hidden.
       is_hidden_(!content_view_core),
       content_view_core_(content_view_core),
       ime_adapter_android_(ALLOW_THIS_IN_INITIALIZER_LIST(this)),
@@ skipping 210 matching lines @@
   if (pos >= text.length()) {
     NOTREACHED() << "The text can not cover range.";
     return;
   }
 
   std::string utf8_selection = UTF16ToUTF8(text.substr(pos, n));
 
   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 host_ check?

[Iain Merrick, 2012/10/10 15:01:40]

The host_ check seems pointless. I'll remove it.

I'm not sure about content_view_core_, but I do see a bunch of other methods
that check it for NULL, so I'll leave that in.

We generally seem to be a bit inconsistent about NULL checks in this class --
there are some methods that use host_ without checking it, for example. Maybe a
general cleanup is needed.

+    content_view_core_->OnSelectionBoundsChanged(
+        start_rect,
+        ConvertTextDirection(start_direction),
+        end_rect,
+        ConvertTextDirection(end_direction));
+  }
+}
+
 BackingStore* RenderWidgetHostViewAndroid::AllocBackingStore(
     const gfx::Size& size) {
   NOTIMPLEMENTED();
   return NULL;
 }
 
 void RenderWidgetHostViewAndroid::SetBackground(const SkBitmap& background) {
   RenderWidgetHostViewBase::SetBackground(background);
   host_->Send(new ViewMsg_SetBackground(host_->GetRoutingID(), background));
 }
@@ skipping 208 matching lines @@
 // RenderWidgetHostView, public:
 
 // static
 RenderWidgetHostView*
 RenderWidgetHostView::CreateViewForWidget(RenderWidgetHost* widget) {
   RenderWidgetHostImpl* rwhi = RenderWidgetHostImpl::From(widget);
   return new RenderWidgetHostViewAndroid(rwhi, NULL);
 }
 
 } // namespace content