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

Unified Diff: content/browser/renderer_host/render_widget_host_view_android.h

Issue 643193003: Support InputMethodManager#updateCursorAnchorInfo for Android 5.0 (C++ version) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Send ImeCompositionRangeChanged only when necessary Created 5 years, 11 months 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/browser/renderer_host/render_widget_host_view_android.h
diff --git a/content/browser/renderer_host/render_widget_host_view_android.h b/content/browser/renderer_host/render_widget_host_view_android.h
index 11d2113aa953b31768fbe167c4faa13ec3543649..db62ef485c62e880b71c9ae62fb8b8be5288ada8 100644
--- a/content/browser/renderer_host/render_widget_host_view_android.h
+++ b/content/browser/renderer_host/render_widget_host_view_android.h
@@ -27,6 +27,7 @@
#include "third_party/skia/include/core/SkColor.h"
#include "third_party/WebKit/public/platform/WebGraphicsContext3D.h"
#include "ui/base/android/window_android_observer.h"
+#include "ui/base/ime/android/cursor_anchor_info_sender.h"
#include "ui/events/gesture_detection/filtered_gesture_provider.h"
#include "ui/gfx/geometry/size.h"
#include "ui/gfx/geometry/vector2d_f.h"
@@ -47,6 +48,11 @@ class WebTouchEvent;
class WebMouseEvent;
}
+namespace ui {
+class CursorAnchorInfoBuilder;
+class CursorAnchorInfoController;
+}
+
namespace content {
class ContentViewCoreImpl;
class OverscrollControllerAndroid;
@@ -81,6 +87,7 @@ class ReadbackRequest {
class CONTENT_EXPORT RenderWidgetHostViewAndroid
: public RenderWidgetHostViewBase,
public cc::DelegatedFrameResourceCollectionClient,
+ public ui::CursorAnchorInfoSender,
public ui::GestureProviderClient,
public ui::WindowAndroidObserver,
public DelegatedFrameEvictorClient,
@@ -183,6 +190,10 @@ class CONTENT_EXPORT RenderWidgetHostViewAndroid
// cc::DelegatedFrameResourceCollectionClient implementation.
virtual void UnusedResourcesAreAvailable() override;
+ // ui::CursorAnchorInfoControllerSender implementation.
+ virtual void SendCursorAnchorInfo(
+ ui::CursorAnchorInfoBuilder* builder) override;
+
// ui::GestureProviderClient implementation.
virtual void OnGestureEvent(const ui::GestureEventData& gesture) override;
@@ -224,6 +235,8 @@ class CONTENT_EXPORT RenderWidgetHostViewAndroid
void SendMouseWheelEvent(const blink::WebMouseWheelEvent& event);
void SendGestureEvent(const blink::WebGestureEvent& event);
+ bool RequestCursorUpdates(uint32 cursor_update_mode);
+
void OnTextInputStateChanged(const ViewHostMsg_TextInputState_Params& params);
void OnDidChangeBodyBackgroundColor(SkColor color);
void OnStartContentIntent(const GURL& content_url);
@@ -350,6 +363,8 @@ class CONTENT_EXPORT RenderWidgetHostViewAndroid
ImeAdapterAndroid ime_adapter_android_;
+ scoped_ptr<ui::CursorAnchorInfoController> cursor_anchor_info_controller_;
+
// Body background color of the underlying document.
SkColor cached_background_color_;

Powered by Google App Engine
This is Rietveld 408576698