| Index: third_party/WebKit/Source/web/WebViewImpl.cpp
|
| diff --git a/third_party/WebKit/Source/web/WebViewImpl.cpp b/third_party/WebKit/Source/web/WebViewImpl.cpp
|
| index e9781cb15ee9c62a74c7473257a4ef736a52fb3f..143e66bada69b747da8ae257c6f6b20a1ee8b519 100644
|
| --- a/third_party/WebKit/Source/web/WebViewImpl.cpp
|
| +++ b/third_party/WebKit/Source/web/WebViewImpl.cpp
|
| @@ -63,6 +63,7 @@
|
| #include "core/html/HTMLMediaElement.h"
|
| #include "core/html/HTMLPlugInElement.h"
|
| #include "core/html/HTMLTextAreaElement.h"
|
| +#include "core/input/ContextMenuAllowedScope.h"
|
| #include "core/input/EventHandler.h"
|
| #include "core/input/TouchActionUtil.h"
|
| #include "core/layout/LayoutPart.h"
|
| @@ -156,7 +157,6 @@
|
| #include "web/CompositionUnderlineVectorBuilder.h"
|
| #include "web/CompositorMutatorImpl.h"
|
| #include "web/CompositorWorkerProxyClientImpl.h"
|
| -#include "web/ContextMenuAllowedScope.h"
|
| #include "web/DedicatedWorkerMessagingProxyProviderImpl.h"
|
| #include "web/DevToolsEmulator.h"
|
| #include "web/FullscreenController.h"
|
| @@ -845,9 +845,13 @@ WebInputEventResult WebViewImpl::HandleGestureEvent(
|
| }
|
| }
|
|
|
| - event_result =
|
| - MainFrameImpl()->GetFrame()->GetEventHandler().HandleGestureEvent(
|
| - targeted_event);
|
| + {
|
| + ContextMenuAllowedScope scope;
|
| + event_result =
|
| + MainFrameImpl()->GetFrame()->GetEventHandler().HandleGestureEvent(
|
| + targeted_event);
|
| + }
|
| +
|
| if (page_popup_ && last_hidden_page_popup_ &&
|
| page_popup_->HasSamePopupClient(last_hidden_page_popup_.Get())) {
|
| // The tap triggered a page popup that is the same as the one we just
|
|
|