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

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

Issue 2479123003: WIP Add getCoalescedEvents API using vector of WebInputEvents (Closed)
Patch Set: Creating CoalescedWebInputEvent Created 4 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 30ac3e4ccea90b9c38cfe267aa447d851f526e5a..776aea36bb3fdb253e6769f64e7c6a4c4468c038 100644
--- a/third_party/WebKit/Source/web/WebPluginContainerImpl.cpp
+++ b/third_party/WebKit/Source/web/WebPluginContainerImpl.cpp
@@ -81,6 +81,7 @@
#include "platform/graphics/paint/ForeignLayerDisplayItem.h"
#include "platform/scroll/ScrollAnimatorBase.h"
#include "platform/scroll/ScrollbarTheme.h"
+#include "public/platform/CoalescedWebInputEvent.h"
#include "public/platform/Platform.h"
#include "public/platform/WebClipboard.h"
#include "public/platform/WebCompositorSupport.h"
@@ -718,7 +719,9 @@ void WebPluginContainerImpl::handleMouseEvent(MouseEvent* event) {
focusPlugin();
WebCursorInfo cursorInfo;
- if (m_webPlugin->handleInputEvent(webEvent, cursorInfo) !=
+ // TODO(nzolghadr): We need to plumb the coalesced event here.
+ if (m_webPlugin->handleInputEvent(CoalescedWebInputEvent(webEvent),
+ cursorInfo) !=
WebInputEventResult::NotHandled)
event->setDefaultHandled();
@@ -768,7 +771,8 @@ void WebPluginContainerImpl::handleWheelEvent(WheelEvent* event) {
return;
WebCursorInfo cursorInfo;
- if (m_webPlugin->handleInputEvent(webEvent, cursorInfo) !=
+ if (m_webPlugin->handleInputEvent(CoalescedWebInputEvent(webEvent),
+ cursorInfo) !=
WebInputEventResult::NotHandled)
event->setDefaultHandled();
}
@@ -816,7 +820,8 @@ void WebPluginContainerImpl::handleKeyboardEvent(KeyboardEvent* event) {
webFrame->client()->handleCurrentKeyboardEvent();
WebCursorInfo cursorInfo;
- if (m_webPlugin->handleInputEvent(webEvent, cursorInfo) !=
+ if (m_webPlugin->handleInputEvent(CoalescedWebInputEvent(webEvent),
+ cursorInfo) !=
WebInputEventResult::NotHandled)
event->setDefaultHandled();
}
@@ -835,7 +840,9 @@ void WebPluginContainerImpl::handleTouchEvent(TouchEvent* event) {
focusPlugin();
WebCursorInfo cursorInfo;
- if (m_webPlugin->handleInputEvent(webEvent, cursorInfo) !=
+ // TODO(nzolghadr): We need to plumb the coalesced event here.
+ if (m_webPlugin->handleInputEvent(CoalescedWebInputEvent(webEvent),
+ cursorInfo) !=
WebInputEventResult::NotHandled)
event->setDefaultHandled();
// FIXME: Can a plugin change the cursor from a touch-event callback?
@@ -855,7 +862,8 @@ void WebPluginContainerImpl::handleGestureEvent(GestureEvent* event) {
if (event->type() == EventTypeNames::gesturetapdown)
focusPlugin();
WebCursorInfo cursorInfo;
- if (m_webPlugin->handleInputEvent(webEvent, cursorInfo) !=
+ if (m_webPlugin->handleInputEvent(CoalescedWebInputEvent(webEvent),
+ cursorInfo) !=
WebInputEventResult::NotHandled) {
event->setDefaultHandled();
return;
@@ -871,7 +879,8 @@ void WebPluginContainerImpl::synthesizeMouseEventIfPossible(TouchEvent* event) {
return;
WebCursorInfo cursorInfo;
- if (m_webPlugin->handleInputEvent(webEvent, cursorInfo) !=
+ if (m_webPlugin->handleInputEvent(CoalescedWebInputEvent(webEvent),
+ cursorInfo) !=
WebInputEventResult::NotHandled)
event->setDefaultHandled();
}

Powered by Google App Engine
This is Rietveld 408576698