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

Unified Diff: third_party/WebKit/Source/web/WebPluginContainerImpl.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: Fix build failures and disabled click test Created 5 years, 1 month 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/WebPluginContainerImpl.cpp
diff --git a/third_party/WebKit/Source/web/WebPluginContainerImpl.cpp b/third_party/WebKit/Source/web/WebPluginContainerImpl.cpp
index fa4799780e2898ce6737a1710f97cb167b5da924..64903ddf208883146ff73aceb2a4d14228396f5e 100644
--- a/third_party/WebKit/Source/web/WebPluginContainerImpl.cpp
+++ b/third_party/WebKit/Source/web/WebPluginContainerImpl.cpp
@@ -798,7 +798,7 @@ void WebPluginContainerImpl::handleMouseEvent(MouseEvent* event)
focusPlugin();
WebCursorInfo cursorInfo;
- if (m_webPlugin->handleInputEvent(webEvent, cursorInfo))
+ if (m_webPlugin->handleInputEvent(webEvent, cursorInfo) != WebInputEventResult::NotHandled)
event->setDefaultHandled();
// A windowless plugin can change the cursor in response to a mouse move
@@ -843,7 +843,7 @@ void WebPluginContainerImpl::handleWheelEvent(WheelEvent* event)
return;
WebCursorInfo cursorInfo;
- if (m_webPlugin->handleInputEvent(webEvent, cursorInfo))
+ if (m_webPlugin->handleInputEvent(webEvent, cursorInfo) != WebInputEventResult::NotHandled)
event->setDefaultHandled();
}
@@ -886,7 +886,7 @@ void WebPluginContainerImpl::handleKeyboardEvent(KeyboardEvent* event)
view->client()->handleCurrentKeyboardEvent();
WebCursorInfo cursorInfo;
- if (m_webPlugin->handleInputEvent(webEvent, cursorInfo))
+ if (m_webPlugin->handleInputEvent(webEvent, cursorInfo) != WebInputEventResult::NotHandled)
event->setDefaultHandled();
}
@@ -904,7 +904,7 @@ void WebPluginContainerImpl::handleTouchEvent(TouchEvent* event)
focusPlugin();
WebCursorInfo cursorInfo;
- if (m_webPlugin->handleInputEvent(webEvent, cursorInfo))
+ if (m_webPlugin->handleInputEvent(webEvent, cursorInfo) != WebInputEventResult::NotHandled)
event->setDefaultHandled();
// FIXME: Can a plugin change the cursor from a touch-event callback?
return;
@@ -923,7 +923,7 @@ void WebPluginContainerImpl::handleGestureEvent(GestureEvent* event)
if (event->type() == EventTypeNames::gesturetapdown)
focusPlugin();
WebCursorInfo cursorInfo;
- if (m_webPlugin->handleInputEvent(webEvent, cursorInfo)) {
+ if (m_webPlugin->handleInputEvent(webEvent, cursorInfo) != WebInputEventResult::NotHandled) {
event->setDefaultHandled();
return;
}
@@ -938,7 +938,7 @@ void WebPluginContainerImpl::synthesizeMouseEventIfPossible(TouchEvent* event)
return;
WebCursorInfo cursorInfo;
- if (m_webPlugin->handleInputEvent(webEvent, cursorInfo))
+ if (m_webPlugin->handleInputEvent(webEvent, cursorInfo) != WebInputEventResult::NotHandled)
event->setDefaultHandled();
}

Powered by Google App Engine
This is Rietveld 408576698