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

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

Issue 1463823003: Return a enumeration of the state of handling of InputEvents. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Rebase Created 5 years 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
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 98c5aaf2f45a3f8c26ec9f019765d2f684258801..d41da16c71cf05b746ff2481e7d0224694b282a0 100644
--- a/third_party/WebKit/Source/web/WebPagePopupImpl.cpp
+++ b/third_party/WebKit/Source/web/WebPagePopupImpl.cpp
@@ -391,23 +391,23 @@ void WebPagePopupImpl::resize(const WebSize& newSize)
m_widgetClient->didInvalidateRect(WebRect(0, 0, newSize.width, newSize.height));
}
-bool WebPagePopupImpl::handleKeyEvent(const WebKeyboardEvent& event)
+WebInputEventResult WebPagePopupImpl::handleKeyEvent(const WebKeyboardEvent& event)
{
return handleKeyEvent(PlatformKeyboardEventBuilder(event));
}
-bool WebPagePopupImpl::handleCharEvent(const WebKeyboardEvent& event)
+WebInputEventResult WebPagePopupImpl::handleCharEvent(const WebKeyboardEvent& event)
{
return handleKeyEvent(PlatformKeyboardEventBuilder(event));
}
-bool WebPagePopupImpl::handleGestureEvent(const WebGestureEvent& event)
+WebInputEventResult WebPagePopupImpl::handleGestureEvent(const WebGestureEvent& event)
{
if (m_closing || !m_page || !m_page->mainFrame() || !toLocalFrame(m_page->mainFrame())->view())
- return false;
+ return WebInputEventResult::NotHandled;
if (event.type == WebInputEvent::GestureTap && !isGestureEventInWindow(event)) {
cancel();
- return false;
+ return WebInputEventResult::NotHandled;
}
LocalFrame& frame = *toLocalFrame(m_page->mainFrame());
return frame.eventHandler().handleGestureEvent(PlatformGestureEventBuilder(frame.view(), event));
@@ -421,12 +421,12 @@ void WebPagePopupImpl::handleMouseDown(LocalFrame& mainFrame, const WebMouseEven
cancel();
}
-bool WebPagePopupImpl::handleMouseWheel(LocalFrame& mainFrame, const WebMouseWheelEvent& event)
+WebInputEventResult WebPagePopupImpl::handleMouseWheel(LocalFrame& mainFrame, const WebMouseWheelEvent& event)
{
if (isMouseEventInWindow(event))
return PageWidgetEventHandler::handleMouseWheel(mainFrame, event);
cancel();
- return false;
+ return WebInputEventResult::NotHandled;
}
bool WebPagePopupImpl::isMouseEventInWindow(const WebMouseEvent& event)
@@ -439,17 +439,17 @@ bool WebPagePopupImpl::isGestureEventInWindow(const WebGestureEvent& event)
return IntRect(0, 0, m_windowRectInScreen.width, m_windowRectInScreen.height).contains(IntPoint(event.x, event.y));
}
-bool WebPagePopupImpl::handleInputEvent(const WebInputEvent& event)
+WebInputEventResult WebPagePopupImpl::handleInputEvent(const WebInputEvent& event)
{
if (m_closing)
- return false;
+ return WebInputEventResult::NotHandled;
return PageWidgetDelegate::handleInputEvent(*this, event, m_page->deprecatedLocalMainFrame());
}
-bool WebPagePopupImpl::handleKeyEvent(const PlatformKeyboardEvent& event)
+WebInputEventResult WebPagePopupImpl::handleKeyEvent(const PlatformKeyboardEvent& event)
{
if (m_closing || !m_page->mainFrame() || !toLocalFrame(m_page->mainFrame())->view())
- return false;
+ return WebInputEventResult::NotHandled;
return toLocalFrame(m_page->mainFrame())->eventHandler().keyEvent(event);
}

Powered by Google App Engine
This is Rietveld 408576698