| 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 b4ed0a35f1b17d19a49fa166901eae24aadf63fa..d215b2978b9423d4751b6d647565b827baaca669 100644
|
| --- a/third_party/WebKit/Source/web/ContextMenuClientImpl.cpp
|
| +++ b/third_party/WebKit/Source/web/ContextMenuClientImpl.cpp
|
| @@ -131,9 +131,10 @@ static String selectMisspellingAsync(LocalFrame* selectedFrame, String& descript
|
| return markerRange->text();
|
| }
|
|
|
| -static bool shouldShowContextMenuFromTouch(const WebContextMenuData& data)
|
| +bool ContextMenuClientImpl::shouldShowContextMenuFromTouch(const WebContextMenuData& data)
|
| {
|
| - return !data.linkURL.isEmpty()
|
| + return m_webView->page()->settings().alwaysShowContextMenuOnTouch()
|
| + || !data.linkURL.isEmpty()
|
| || data.mediaType == WebContextMenuData::MediaTypeImage
|
| || data.mediaType == WebContextMenuData::MediaTypeVideo
|
| || data.isEditable;
|
|
|