Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(311)

Unified Diff: third_party/WebKit/Source/web/ContextMenuClientImpl.cpp

Issue 2007213002: Fixing long press paste pop up bug (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fixed nit pick Created 4 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | third_party/WebKit/Source/web/tests/WebViewTest.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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..b4ed0a35f1b17d19a49fa166901eae24aadf63fa 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;
}
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,11 +366,15 @@ 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())
- selectedWebFrame->client()->showContextMenu(data);
+ if (!selectedWebFrame->client())
+ return false;
+ selectedWebFrame->client()->showContextMenu(data);
return true;
}
« no previous file with comments | « no previous file | third_party/WebKit/Source/web/tests/WebViewTest.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698