Fixing long press paste pop up bug

third_party/WebKit/Source/web/ContextMenuClientImpl.cpp

Index: third_party/WebKit/Source/web/ContextMenuClientImpl.cpp
diff --git a/third_party/WebKit/Source/web/ContextMenuClientImpl.cpp b/third_party/WebKit/Source/web/ContextMenuClientImpl.cpp
index 43517e24470429a41096b98c66e6d34a307e77e7..19a271738e1e20a5a61b2483d25f4a1b69102579 100644
--- a/third_party/WebKit/Source/web/ContextMenuClientImpl.cpp
+++ b/third_party/WebKit/Source/web/ContextMenuClientImpl.cpp
@@ -135,7 +135,8 @@ static bool shouldShowContextMenuFromTouch(const WebContextMenuData& data)
 {
     return !data.linkURL.isEmpty()
         || data.mediaType == WebContextMenuData::MediaTypeImage
-        || data.mediaType == WebContextMenuData::MediaTypeVideo;
+        || data.mediaType == WebContextMenuData::MediaTypeVideo
+        || (data.isEditable && data.selectedText.isEmpty());

[aelias_OOO_until_Jul13, 2016/05/24 23:53:16]

Could you remove the check for isEmpty()?  That seems like it usually wouldn't
changes the outcome, and if it does that's probably a bug (e.g. long-pressing a
<canvas> element within a ContentEditable block should still show the context
menu).

[amaralp, 2016/05/25 00:18:43]

I copied that check from chrome_web_contents_view_delegate_android.cc had done.
I'll remove the check and see if it changes anything.

 }
 
 bool ContextMenuClientImpl::showContextMenu(const ContextMenu* defaultMenu, bool fromTouch)
@@ -263,9 +264,6 @@ bool ContextMenuClientImpl::showContextMenu(const ContextMenu* defaultMenu, bool
         }
     }
 
-    if (fromTouch && !shouldShowContextMenuFromTouch(data))
-        return false;
-
     // If it's not a link, an image, a media element, or an image/media link,
     // show a selection menu or a more generic page menu.
     if (selectedFrame->document()->loader())
@@ -368,6 +366,9 @@ bool ContextMenuClientImpl::showContextMenu(const ContextMenu* defaultMenu, bool
         data.inputFieldType = WebContextMenuData::InputFieldTypeNone;
     }
 
+    if (fromTouch && !shouldShowContextMenuFromTouch(data))
+        return false;
+
     WebLocalFrameImpl* selectedWebFrame = WebLocalFrameImpl::fromFrame(selectedFrame);
     selectedWebFrame->setContextMenuNode(r.innerNodeOrImageMapImage());
     if (selectedWebFrame->client())

[aelias_OOO_until_Jul13, 2016/05/24 23:53:16]

Should've thought of this on the previous patch, but can you also change this
one to return false to follow the same pattern as the rest?

[amaralp, 2016/05/25 00:18:43]

Done.