Pass TouchMajor to HitTestResult

android_webview/native/aw_contents.cc

 // Copyright 2012 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.
 
 #include "android_webview/native/aw_contents.h"
 
 #include <limits>
 
 #include "android_webview/browser/aw_browser_context.h"
 #include "android_webview/browser/aw_browser_main_parts.h"
@@ skipping 46 matching lines @@
 #include "content/public/browser/render_process_host.h"
 #include "content/public/browser/render_view_host.h"
 #include "content/public/browser/web_contents.h"
 #include "content/public/common/renderer_preferences.h"
 #include "content/public/common/ssl_status.h"
 #include "jni/AwContents_jni.h"
 #include "net/base/auth.h"
 #include "net/cert/x509_certificate.h"
 #include "third_party/skia/include/core/SkPicture.h"
 #include "ui/gfx/android/java_bitmap.h"
+#include "ui/gfx/geometry/rect_f.h"
 #include "ui/gfx/image/image.h"
 #include "ui/gfx/size.h"
 
 struct AwDrawSWFunctionTable;
 struct AwDrawGLFunctionTable;
 
 using autofill::ContentAutofillDriver;
 using autofill::AutofillManager;
 using base::android::AttachCurrentThread;
 using base::android::ConvertJavaStringToUTF16;
@@ skipping 724 matching lines @@
   if (!ok)
     return ScopedJavaLocalRef<jbyteArray>();
 
   // Convert the certificate and return it
   std::string der_string;
   net::X509Certificate::GetDEREncoded(cert->os_cert_handle(), &der_string);
   return base::android::ToJavaByteArray(env,
       reinterpret_cast<const uint8*>(der_string.data()), der_string.length());
 }
 
-void AwContents::RequestNewHitTestDataAt(JNIEnv* env, jobject obj,
-                                         jint x, jint y) {
+void AwContents::RequestNewHitTestDataAt(JNIEnv* env,
+                                         jobject obj,
+                                         jint x,
+                                         jint y,
+                                         jfloat touch_major,
+                                         jfloat touch_minor) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
-  render_view_host_ext_->RequestNewHitTestDataAt(x, y);
+  gfx::RectF touch_area(x, y, touch_major / 2, touch_minor / 2);

[jdduke (slow), 2014/10/30 19:54:58]

x/y here correspond to the *center* of the rect, but you supply them as the rect
origin. Also, touch_major *is* the size of the area, so I'm still unsure why
you're dividing it in half...

[hush (inactive), 2014/11/04 01:55:57]

I agree this is weird. (you mentioned this in a comment in AwRenderViewExt as
well). I will pass the center point and the padding separately in the next
patch.
The "padding" parameter of the function EventHandler::hitTestResultAtPoint is
not the width and height of the touch area, it is half of that.
I sort of guessed it by looking at these 2 places:
https://code.google.com/p/chromium/codesearch#chromium/src/third_party/WebKit...
and:
https://code.google.com/p/chromium/codesearch#chromium/src/third_party/WebKit...

So padding.width() and padding.height() is how far the center point is from the
left/right and top/bottom.

Rick, please correct me if I said it wrong.

[hush (inactive), 2014/11/04 02:50:47]

Sorry. Scratch that.
Blink does the half resize for us in this case.
https://codereview.chromium.org/470833002/diff/40001/Source/core/page/EventHa...

+  render_view_host_ext_->RequestNewHitTestDataAt(touch_area);
 }
 
 void AwContents::UpdateLastHitTestData(JNIEnv* env, jobject obj) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
   if (!render_view_host_ext_->HasNewHitTestData()) return;
 
   const AwHitTestData& data = render_view_host_ext_->GetLastHitTestData();
   render_view_host_ext_->MarkHitTestDataRead();
 
   // Make sure to null the Java object if data is empty/invalid.
@@ skipping 344 matching lines @@
   }
 
   browser_view_renderer_.TrimMemory(level, visible);
 }
 
 void SetShouldDownloadFavicons(JNIEnv* env, jclass jclazz) {
   g_should_download_favicons = true;
 }
 
 }  // namespace android_webview