2 files changed, 28 insertions, 2 deletions
diff --git a/Source/WebKit/android/nav/SelectText.h b/Source/WebKit/android/nav/SelectText.h
index aaaf3bb..8f7592d 100644
--- a/Source/WebKit/android/nav/SelectText.h
+++ b/Source/WebKit/android/nav/SelectText.h
@@ -35,8 +35,13 @@ namespace android {
 class SelectText : public RegionLayerDrawExtra {
 public:
     enum HandleId {
+        BaseHandle = 0,
+        ExtentHandle = 1,
+    };
+    enum HandleType {
         LeftHandle = 0,
-        RightHandle = 1,
+        CenterHandle = 1,
+        RightHandle = 2,
     };
 
     IntRect& caretRect(HandleId id) { return m_caretRects[id]; }
@@ -48,11 +53,14 @@ public:
 
     void setText(const String& text) { m_text = text.threadsafeCopy(); }
     String& getText() { return m_text; }
+    HandleType getHandleType(HandleId id) { return m_handleType[id]; }
+    void setHandleType(HandleId id, HandleType type) { m_handleType[id] = type; }
 
 private:
     IntRect m_caretRects[2];
     IntRect m_textRects[2];
     int m_caretLayerId[2];
+    HandleType m_handleType[2];
     String m_text;
 };
 
diff --git a/Source/WebKit/android/nav/WebView.cpp b/Source/WebKit/android/nav/WebView.cpp
index a67b5fd..0e4bf32 100644
--- a/Source/WebKit/android/nav/WebView.cpp
+++ b/Source/WebKit/android/nav/WebView.cpp
@@ -716,7 +716,7 @@ void findMaxVisibleRect(int movingLayerId, SkIRect& visibleContentRect)
     if (findMaskedRectsForLayer(m_baseLayer, rects, movingLayerId)) {
         float maxSize = 0.0;
         const FloatRect* largest = 0;
-        for (int i = 0; i < rects.size(); i++) {
+        for (unsigned int i = 0; i < rects.size(); i++) {
             const FloatRect& rect = rects[i];
             float size = rect.width() * rect.height();
             if (size > maxSize) {
@@ -731,6 +731,15 @@ void findMaxVisibleRect(int movingLayerId, SkIRect& visibleContentRect)
     }
 }
 
+bool isHandleLeft(SelectText::HandleId handleId)
+{
+    SelectText* selectText = static_cast<SelectText*>(getDrawExtra(DrawExtrasSelection));
+    if (!selectText)
+        return (handleId == SelectText::BaseHandle);
+
+    return (selectText->getHandleType(handleId) == SelectText::LeftHandle);
+}
+
 private: // local state for WebView
     bool m_isDrawingPaused;
     // private to getFrameCache(); other functions operate in a different thread
@@ -1288,6 +1297,13 @@ static void nativeFindMaxVisibleRect(JNIEnv *env, jobject obj, jint nativeView,
     GraphicsJNI::irect_to_jrect(nativeRect, env, visibleContentRect);
 }
 
+static bool nativeIsHandleLeft(JNIEnv *env, jobject obj, jint nativeView,
+        jint handleId)
+{
+    WebView* webview = reinterpret_cast<WebView*>(nativeView);
+    return webview->isHandleLeft(static_cast<SelectText::HandleId>(handleId));
+}
+
 /*
  * JNI registration
  */
@@ -1366,6 +1382,8 @@ static JNINativeMethod gJavaWebViewMethods[] = {
         (void*) nativeSetHwAccelerated },
     { "nativeFindMaxVisibleRect", "(IILandroid/graphics/Rect;)V",
         (void*) nativeFindMaxVisibleRect },
+    { "nativeIsHandleLeft", "(II)Z",
+        (void*) nativeIsHandleLeft },
 };
 
 int registerWebView(JNIEnv* env)