Add back Rect parcelable to onSmartClipDataExtracted.

content/public/android/java/src/org/chromium/content/browser/webcontents/WebContentsImpl.java

 // Copyright 2013 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.
 
 package org.chromium.content.browser.webcontents;
 
 import android.annotation.SuppressLint;
 import android.graphics.Bitmap;
 import android.graphics.Rect;
 import android.os.Bundle;
 import android.os.Handler;
 import android.os.Message;
 import android.os.Parcel;
 import android.os.ParcelUuid;
 import android.os.Parcelable;
 
 import org.chromium.base.ThreadUtils;
 import org.chromium.base.VisibleForTesting;
 import org.chromium.base.annotations.CalledByNative;
 import org.chromium.base.annotations.JNINamespace;
 import org.chromium.content.browser.AppWebMessagePort;
 import org.chromium.content.browser.MediaSessionImpl;
+import org.chromium.content.browser.RenderCoordinates;
 import org.chromium.content.browser.framehost.RenderFrameHostDelegate;
 import org.chromium.content_public.browser.AccessibilitySnapshotCallback;
 import org.chromium.content_public.browser.AccessibilitySnapshotNode;
 import org.chromium.content_public.browser.ContentBitmapCallback;
 import org.chromium.content_public.browser.ImageDownloadCallback;
 import org.chromium.content_public.browser.JavaScriptCallback;
 import org.chromium.content_public.browser.MessagePort;
 import org.chromium.content_public.browser.NavigationController;
 import org.chromium.content_public.browser.RenderFrameHost;
 import org.chromium.content_public.browser.SmartClipCallback;
@@ skipping 66 matching lines @@
     private NavigationController mNavigationController;
     private RenderFrameHost mMainFrame;
 
     // Lazily created proxy observer for handling all Java-based WebContentsObservers.
     private WebContentsObserverProxy mObserverProxy;
 
     // The media session for this WebContents. It is constructed by the native MediaSession and has
     // the same life time as native MediaSession.
     private MediaSessionImpl mMediaSession;
 
-    private SmartClipCallback mSmartClipCallback;
+    class SmartClipCallbackImpl implements SmartClipCallback {
+        public SmartClipCallbackImpl(final Handler smartClipHandler) {
+            mHandler = smartClipHandler;
+        }
+        public void storeRequestRect(Rect rect) {
+            mRect = rect;
+        }
+
+        @Override
+        public void onSmartClipDataExtracted(String text, String html) {
+            Bundle bundle = new Bundle();
+            bundle.putString("url", getVisibleUrl());
+            bundle.putString("title", getTitle());
+            bundle.putString("text", text);
+            bundle.putString("html", html);
+            bundle.putParcelable("rect", mRect);
+
+            Message msg = Message.obtain(mHandler, 0);
+            msg.setData(bundle);
+            msg.sendToTarget();
+        }
+
+        Rect mRect;
+        final Handler mHandler;
+    }
+    private SmartClipCallbackImpl mSmartClipCallback;
 
     private EventForwarder mEventForwarder;
 
     private WebContentsImpl(
             long nativeWebContentsAndroid, NavigationController navigationController) {
         mNativeWebContentsAndroid = nativeWebContentsAndroid;
         mNavigationController = navigationController;
     }
 
     @CalledByNative
@@ skipping 273 matching lines @@
             String jsonResult, JavaScriptCallback callback) {
         callback.handleJavaScriptResult(jsonResult);
     }
 
     @Override
     public int getThemeColor() {
         return nativeGetThemeColor(mNativeWebContentsAndroid);
     }
 
     @Override
-    public void requestSmartClipExtract(int x, int y, int width, int height) {
+    public void requestSmartClipExtract(
+            int x, int y, int width, int height, RenderCoordinates coordinateSpace) {
         if (mSmartClipCallback == null) return;
-        nativeRequestSmartClipExtract(
-                mNativeWebContentsAndroid, mSmartClipCallback, x, y, width, height);
+        mSmartClipCallback.storeRequestRect(new Rect(x, y, x + width, y + height));
+        float dpi = coordinateSpace.getDeviceScaleFactor();
+        y -= coordinateSpace.getContentOffsetYPix();
+        nativeRequestSmartClipExtract(mNativeWebContentsAndroid, mSmartClipCallback,
+                (int) (x / dpi), (int) (y / dpi), (int) (width / dpi), (int) (height / dpi));
     }
 
     @Override
     public void setSmartClipResultHandler(final Handler smartClipHandler) {
         if (smartClipHandler == null) {
             mSmartClipCallback = null;
             return;
         }
-        mSmartClipCallback = new SmartClipCallback() {
-            @Override
-            public void onSmartClipDataExtracted(String text, String html) {
-                Bundle bundle = new Bundle();
-                bundle.putString("url", getVisibleUrl());
-                bundle.putString("title", getTitle());
-                bundle.putString("text", text);
-                bundle.putString("html", html);
-
-                Message msg = Message.obtain(smartClipHandler, 0);
-                msg.setData(bundle);
-                msg.sendToTarget();
-            }
-        };
+        mSmartClipCallback = new SmartClipCallbackImpl(smartClipHandler);
     }
 
     @CalledByNative
     private static void onSmartClipDataExtracted(
             String text, String html, SmartClipCallback callback) {
         callback.onSmartClipDataExtracted(text, html);
     }
 
     @Override
     public void requestAccessibilitySnapshot(AccessibilitySnapshotCallback callback) {
@@ skipping 207 matching lines @@
     private native void nativeReloadLoFiImages(long nativeWebContentsAndroid);
     private native int nativeDownloadImage(long nativeWebContentsAndroid,
             String url, boolean isFavicon, int maxBitmapSize,
             boolean bypassCache, ImageDownloadCallback callback);
     private native void nativeDismissTextHandles(long nativeWebContentsAndroid);
     private native void nativeShowContextMenuAtPoint(long nativeWebContentsAndroid, int x, int y);
     private native void nativeSetHasPersistentVideo(long nativeWebContentsAndroid, boolean value);
     private native boolean nativeHasActiveEffectivelyFullscreenVideo(long nativeWebContentsAndroid);
     private native EventForwarder nativeGetOrCreateEventForwarder(long nativeWebContentsAndroid);
 }