Merge "Allow native to query selection region"

1 files changed, 15 insertions, 0 deletions

diff --git a/Source/WebKit/android/nav/WebView.cpp b/Source/WebKit/android/nav/WebView.cpp
index 945a785..5cf9953 100644
--- a/Source/WebKit/android/nav/WebView.cpp
+++ b/Source/WebKit/android/nav/WebView.cpp
@@ -1482,6 +1482,11 @@ void setBaseLayer(BaseLayerAndroid* layer, SkRegion& inval, bool showVisualIndic
     root->setRootLayer(compositeRoot());
 }
 
+void getTextSelectionRegion(SkRegion *region)
+{
+    m_selectText.getSelectionRegion(getVisibleRect(), region);
+}
+
 void replaceBaseContent(PictureSet* set)
 {
     if (!m_baseLayer)
@@ -1910,6 +1915,14 @@ static void nativeSetBaseLayer(JNIEnv *env, jobject obj, jint layer, jobject inv
                                             registerPageSwapCallback);
 }
 
+static void nativeGetTextSelectionRegion(JNIEnv *env, jobject obj, jobject region)
+{
+    if (!region)
+        return;
+    SkRegion* nregion = GraphicsJNI::getNativeRegion(env, region);
+    GET_NATIVE_VIEW(env, obj)->getTextSelectionRegion(nregion);
+}
+
 static BaseLayerAndroid* nativeGetBaseLayer(JNIEnv *env, jobject obj)
 {
     return GET_NATIVE_VIEW(env, obj)->getBaseLayer();
@@ -2794,6 +2807,8 @@ static JNINativeMethod gJavaWebViewMethods[] = {
         (void*) nativeSetHeightCanMeasure },
     { "nativeSetBaseLayer", "(ILandroid/graphics/Region;ZZZ)V",
         (void*) nativeSetBaseLayer },
+    { "nativeGetTextSelectionRegion", "(Landroid/graphics/Region;)V",
+        (void*) nativeGetTextSelectionRegion },
     { "nativeGetBaseLayer", "()I",
         (void*) nativeGetBaseLayer },
     { "nativeReplaceBaseContent", "(I)V",