| Index: third_party/WebKit/Source/web/WebPagePopupImpl.cpp
|
| diff --git a/third_party/WebKit/Source/web/WebPagePopupImpl.cpp b/third_party/WebKit/Source/web/WebPagePopupImpl.cpp
|
| index c8f36c89ef9e0692629cc21ecf3196408a3a8325..255a9a76a77cf45c4c260a648cec179249b62aca 100644
|
| --- a/third_party/WebKit/Source/web/WebPagePopupImpl.cpp
|
| +++ b/third_party/WebKit/Source/web/WebPagePopupImpl.cpp
|
| @@ -435,12 +435,14 @@ void WebPagePopupImpl::resize(const WebSize& newSizeInViewport)
|
|
|
| WebInputEventResult WebPagePopupImpl::handleKeyEvent(const WebKeyboardEvent& event)
|
| {
|
| - return handleKeyEvent(PlatformKeyboardEventBuilder(event));
|
| + if (m_closing || !m_page->mainFrame() || !toLocalFrame(m_page->mainFrame())->view())
|
| + return WebInputEventResult::NotHandled;
|
| + return toLocalFrame(m_page->mainFrame())->eventHandler().keyEvent(event);
|
| }
|
|
|
| WebInputEventResult WebPagePopupImpl::handleCharEvent(const WebKeyboardEvent& event)
|
| {
|
| - return handleKeyEvent(PlatformKeyboardEventBuilder(event));
|
| + return handleKeyEvent(event);
|
| }
|
|
|
| WebInputEventResult WebPagePopupImpl::handleGestureEvent(const WebGestureEvent& event)
|
| @@ -486,13 +488,6 @@ WebInputEventResult WebPagePopupImpl::handleInputEvent(const WebInputEvent& even
|
| return PageWidgetDelegate::handleInputEvent(*this, event, m_page->deprecatedLocalMainFrame());
|
| }
|
|
|
| -WebInputEventResult WebPagePopupImpl::handleKeyEvent(const PlatformKeyboardEvent& event)
|
| -{
|
| - if (m_closing || !m_page->mainFrame() || !toLocalFrame(m_page->mainFrame())->view())
|
| - return WebInputEventResult::NotHandled;
|
| - return toLocalFrame(m_page->mainFrame())->eventHandler().keyEvent(event);
|
| -}
|
| -
|
| void WebPagePopupImpl::setFocus(bool enable)
|
| {
|
| if (!m_page)
|
|
|