Text selected with double-tap should not cause vibration

third_party/WebKit/Source/web/ContextMenuClientImpl.cpp

 /*
  * Copyright (C) 2009, 2012 Google Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are
  * met:
  *
  *     * Redistributions of source code must retain the above copyright
  * notice, this list of conditions and the following disclaimer.
  *     * Redistributions in binary form must reproduce the above
@@ skipping 113 matching lines @@
     Range* markerRange = selectionRange->cloneRange();
     markerRange->setStart(markerRange->startContainer(), markers[0]->startOffset());
     markerRange->setEnd(markerRange->endContainer(), markers[0]->endOffset());
 
     if (markerRange->text().stripWhiteSpace(&IsWhiteSpaceOrPunctuation) != selectionRange->text().stripWhiteSpace(&IsWhiteSpaceOrPunctuation))
         return String();
 
     return markerRange->text();
 }
 
-void ContextMenuClientImpl::showContextMenu(const ContextMenu* defaultMenu)
+bool ContextMenuClientImpl::showContextMenu(const ContextMenu* defaultMenu)
 {
     // Displaying the context menu in this function is a big hack as we don't
     // have context, i.e. whether this is being invoked via a script or in
     // response to user input (Mouse event WM_RBUTTONDOWN,
     // Keyboard events KeyVK_APPS, Shift+F10). Check if this is being invoked
     // in response to the above input events before popping up the context menu.
     if (!ContextMenuAllowedScope::isContextMenuAllowed())
-        return;
+        return true;

[aelias_OOO_until_Jul13, 2016/05/18 01:22:32]

As discussed offline, it should be fine for this to be false.

[amaralp, 2016/05/18 22:16:18]

Done.

 
     HitTestResult r = m_webView->page()->contextMenuController().hitTestResult();
 
     r.setToShadowHostIfInUserAgentShadowRoot();
 
     LocalFrame* selectedFrame = r.innerNodeFrame();
 
     WebContextMenuData data;
     data.mousePosition = selectedFrame->view()->contentsToViewport(r.roundedPointInInnerNodeFrame());
 
@@ skipping 202 matching lines @@
         else
             data.inputFieldType = WebContextMenuData::InputFieldTypeOther;
     } else {
         data.inputFieldType = WebContextMenuData::InputFieldTypeNone;
     }
 
     WebLocalFrameImpl* selectedWebFrame = WebLocalFrameImpl::fromFrame(selectedFrame);
     selectedWebFrame->setContextMenuNode(r.innerNodeOrImageMapImage());
     if (selectedWebFrame->client())
         selectedWebFrame->client()->showContextMenu(data);
+
+#if OS(ANDROID)

[aelias_OOO_until_Jul13, 2016/05/18 01:22:33]

Instead of #if OS(ANDROID), let's make this logic conditional on whether the
event type is a LongPress or a Click.  That event information isn't available in
this scope, so I'd suggest adding an additional argument to this method passing
it in (probably just the event type enum).

[amaralp, 2016/05/18 22:16:18]

Done.

+    if (!data.linkURL.isEmpty()
+        || data.mediaType == WebContextMenuData::MediaTypeImage
+        || data.mediaType == WebContextMenuData::MediaTypeVideo)
+        return true;

[aelias_OOO_until_Jul13, 2016/05/18 01:22:33]

I think this should be an early-return above the showContextMenu() call, to
substitute for the Java shouldShowContextMenu() logic you deleted.  How about
putting this early-return at the beginning next to
ContextMenuAllowedScope::isContextMenuAllowed()?

[amaralp, 2016/05/18 22:16:18]

I rely on the data variable being populated so I can't do this at the very top
like ContextMenuAllowedScope::isContextMenuAllowed(), but I moved it up a little
bit.

+    return false;
+#endif
+    return true;
 }
 
 void ContextMenuClientImpl::clearContextMenu()
 {
     HitTestResult r = m_webView->page()->contextMenuController().hitTestResult();
     LocalFrame* selectedFrame = r.innerNodeFrame();
     if (!selectedFrame)
         return;
 
     WebLocalFrameImpl* selectedWebFrame = WebLocalFrameImpl::fromFrame(selectedFrame);
@@ skipping 37 matching lines @@
         outputItems[i] = subItems[i];
     subMenuItems.swap(outputItems);
 }
 
 void ContextMenuClientImpl::populateCustomMenuItems(const ContextMenu* defaultMenu, WebContextMenuData* data)
 {
     populateSubMenuItems(defaultMenu->items(), data->customItems);
 }
 
 } // namespace blink