Fixing long press paste pop up bug

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 117 matching lines @@
     if (markerRange->text().stripWhiteSpace(&IsWhiteSpaceOrPunctuation) != selectionRange->text().stripWhiteSpace(&IsWhiteSpaceOrPunctuation))
         return String();
 
     return markerRange->text();
 }
 
 static bool shouldShowContextMenuFromTouch(const WebContextMenuData& data)
 {
     return !data.linkURL.isEmpty()
         || data.mediaType == WebContextMenuData::MediaTypeImage
-        || data.mediaType == WebContextMenuData::MediaTypeVideo;
+        || data.mediaType == WebContextMenuData::MediaTypeVideo
+        || data.isEditable;
 }
 
 bool ContextMenuClientImpl::showContextMenu(const ContextMenu* defaultMenu, bool fromTouch)
 {
     // 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())
@@ skipping 107 matching lines @@
                 data.srcURL = pluginElement->document().completeURL(pluginElement->url());
                 data.mediaFlags |= WebContextMenuData::MediaCanSave;
 
                 // Add context menu commands that are supported by the plugin.
                 if (plugin->plugin()->canRotateView())
                     data.mediaFlags |= WebContextMenuData::MediaCanRotate;
             }
         }
     }
 
-    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())
         data.frameEncoding = selectedFrame->document()->encodingName();
 
     // Send the frame and page URLs in any case.
     if (!m_webView->page()->mainFrame()->isLocalFrame()) {
         // TODO(kenrb): This works around the problem of URLs not being
         // available for top-level frames that are in a different process.
         // It mostly works to convert the security origin to a URL, but
@@ skipping 82 matching lines @@
         if (element->type() == InputTypeNames::password)
             data.inputFieldType = WebContextMenuData::InputFieldTypePassword;
         else if (element->isTextField())
             data.inputFieldType = WebContextMenuData::InputFieldTypePlainText;
         else
             data.inputFieldType = WebContextMenuData::InputFieldTypeOther;
     } else {
         data.inputFieldType = WebContextMenuData::InputFieldTypeNone;
     }
 
+    if (fromTouch && !shouldShowContextMenuFromTouch(data))
+        return false;
+
     WebLocalFrameImpl* selectedWebFrame = WebLocalFrameImpl::fromFrame(selectedFrame);
     selectedWebFrame->setContextMenuNode(r.innerNodeOrImageMapImage());
-    if (selectedWebFrame->client())
+    if (selectedWebFrame->client()) {
         selectedWebFrame->client()->showContextMenu(data);
+        return true;

[aelias_OOO_until_Jul13, 2016/05/25 01:08:32]

Nit: in Blink style, it's generally preferred for returns within conditionals to
be the only thing in the block.  Please rewrite this as:

if (!selectedWebFrame->client())
    return false;

selectedWebFrame->client()->showContextMenu(data);
return true;

+    }
 
-    return true;
+    return false;
 }
 
 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