| Index: content/browser/android/content_view_core_impl.h
|
| diff --git a/content/browser/android/content_view_core_impl.h b/content/browser/android/content_view_core_impl.h
|
| index bb429a5705c3f2c98f038228615473a22a7502a2..1ca5bce1b1d9bbf6315a53f892ba3e4a0dcb7b2a 100644
|
| --- a/content/browser/android/content_view_core_impl.h
|
| +++ b/content/browser/android/content_view_core_impl.h
|
| @@ -118,6 +118,7 @@ class ContentViewCoreImpl : public ContentViewCore,
|
| jint android_tool_type_0,
|
| jint android_tool_type_1,
|
| jint android_button_state);
|
| + jboolean OnTouchHandleEvent(JNIEnv* env, jobject obj, jobject motion_event);
|
| jboolean SendMouseMoveEvent(JNIEnv* env,
|
| jobject obj,
|
| jlong time_ms,
|
| @@ -151,6 +152,7 @@ class ContentViewCoreImpl : public ContentViewCore,
|
| jfloat x1, jfloat y1,
|
| jfloat x2, jfloat y2);
|
| void MoveCaret(JNIEnv* env, jobject obj, jfloat x, jfloat y);
|
| + void HideTextHandles(JNIEnv* env, jobject obj);
|
|
|
| void ResetGestureDetection(JNIEnv* env, jobject obj);
|
| void SetDoubleTapSupportEnabled(JNIEnv* env, jobject obj, jboolean enabled);
|
| @@ -289,12 +291,9 @@ class ContentViewCoreImpl : public ContentViewCore,
|
| InputEventAckState ack_result);
|
| bool FilterInputEvent(const blink::WebInputEvent& event);
|
| void OnSelectionChanged(const std::string& text);
|
| - void OnSelectionBoundsChanged(const gfx::PointF& anchor,
|
| - const gfx::PointF& focus,
|
| - int anchor_dir,
|
| - int focus_dir,
|
| - bool is_anchor_visible,
|
| - bool is_focus_visible);
|
| + void OnSelectionEvent(SelectionEventType event,
|
| + const gfx::PointF& anchor_position);
|
| + scoped_ptr<TouchHandleDrawable> CreatePopupTouchHandleDrawable();
|
|
|
| void StartContentIntent(const GURL& content_url);
|
|
|
| @@ -324,8 +323,6 @@ class ContentViewCoreImpl : public ContentViewCore,
|
|
|
| void SetAccessibilityEnabledInternal(bool enabled);
|
|
|
| - void ShowSelectionHandlesAutomatically() const;
|
| -
|
| bool IsFullscreenRequiredForOrientationLock() const;
|
|
|
| // --------------------------------------------------------------------------
|
| @@ -340,6 +337,9 @@ class ContentViewCoreImpl : public ContentViewCore,
|
| void AttachLayer(scoped_refptr<cc::Layer> layer);
|
| void RemoveLayer(scoped_refptr<cc::Layer> layer);
|
|
|
| + void SelectBetweenCoordinates(const gfx::PointF& start,
|
| + const gfx::PointF& end);
|
| +
|
| private:
|
| class ContentViewUserData;
|
|
|
|
|