| Index: Source/core/page/EventHandler.cpp
|
| diff --git a/Source/core/page/EventHandler.cpp b/Source/core/page/EventHandler.cpp
|
| index 1facc2d8552f08bedca644344194cbc81df113df..0bd01b775ff6a4608454bf8dcceac09032dd320d 100644
|
| --- a/Source/core/page/EventHandler.cpp
|
| +++ b/Source/core/page/EventHandler.cpp
|
| @@ -3808,18 +3808,18 @@ bool EventHandler::dispatchSyntheticTouchEventIfEnabled(const PlatformMouseEvent
|
| bool EventHandler::handleMouseEventAsEmulatedGesture(const PlatformMouseEvent& event)
|
| {
|
| PlatformEvent::Type eventType = event.type();
|
| - Page* page = m_frame->page();
|
| - FrameView* view = m_frame->view();
|
| - if (event.button() != LeftButton || page->mainFrame() != m_frame)
|
| + if (event.button() != LeftButton || !m_frame->isMainFrame())
|
| return false;
|
|
|
| // Simulate pinch / scroll gesture.
|
| const IntPoint& position = event.position();
|
| bool swallowEvent = false;
|
|
|
| + FrameView* view = m_frame->view();
|
| if (event.shiftKey()) {
|
| // Shift pressed - consider it gesture.
|
| swallowEvent = true;
|
| + Page* page = m_frame->page();
|
| float pageScaleFactor = page->pageScaleFactor();
|
| switch (eventType) {
|
| case PlatformEvent::MousePressed:
|
|
|