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

Unified Diff: Source/web/WebPluginContainerImpl.cpp

Issue 212893005: Revert "Change event handling order in HTMLPlugInElement." (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Created 6 years, 9 months 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
« no previous file with comments | « Source/core/html/HTMLPlugInElement.cpp ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/web/WebPluginContainerImpl.cpp
diff --git a/Source/web/WebPluginContainerImpl.cpp b/Source/web/WebPluginContainerImpl.cpp
index 6558f1a60c778cee7e886c9cfcbf930954c20a85..74d93b9bf1b2dcae5693838f541730148c7154c6 100644
--- a/Source/web/WebPluginContainerImpl.cpp
+++ b/Source/web/WebPluginContainerImpl.cpp
@@ -713,10 +713,8 @@ void WebPluginContainerImpl::handleMouseEvent(MouseEvent* event)
}
WebCursorInfo cursorInfo;
- if (m_webPlugin->handleInputEvent(webEvent, cursorInfo)) {
- event->stopPropagation();
+ if (m_webPlugin->handleInputEvent(webEvent, cursorInfo))
event->setDefaultHandled();
- }
// A windowless plugin can change the cursor in response to a mouse move
// event. We need to reflect the changed cursor in the frame view as the
@@ -760,10 +758,8 @@ void WebPluginContainerImpl::handleWheelEvent(WheelEvent* event)
return;
WebCursorInfo cursorInfo;
- if (m_webPlugin->handleInputEvent(webEvent, cursorInfo)) {
- event->stopPropagation();
+ if (m_webPlugin->handleInputEvent(webEvent, cursorInfo))
event->setDefaultHandled();
- }
}
void WebPluginContainerImpl::handleKeyboardEvent(KeyboardEvent* event)
@@ -805,10 +801,8 @@ void WebPluginContainerImpl::handleKeyboardEvent(KeyboardEvent* event)
view->client()->handleCurrentKeyboardEvent();
WebCursorInfo cursorInfo;
- if (m_webPlugin->handleInputEvent(webEvent, cursorInfo)) {
- event->stopPropagation();
+ if (m_webPlugin->handleInputEvent(webEvent, cursorInfo))
event->setDefaultHandled();
- }
}
void WebPluginContainerImpl::handleTouchEvent(TouchEvent* event)
@@ -825,10 +819,8 @@ void WebPluginContainerImpl::handleTouchEvent(TouchEvent* event)
focusPlugin();
WebCursorInfo cursorInfo;
- if (m_webPlugin->handleInputEvent(webEvent, cursorInfo)) {
- event->stopPropagation();
+ if (m_webPlugin->handleInputEvent(webEvent, cursorInfo))
event->setDefaultHandled();
- }
// FIXME: Can a plugin change the cursor from a touch-event callback?
return;
}
@@ -853,7 +845,6 @@ void WebPluginContainerImpl::handleGestureEvent(GestureEvent* event)
return;
WebCursorInfo cursorInfo;
if (m_webPlugin->handleInputEvent(webEvent, cursorInfo)) {
- event->stopPropagation();
event->setDefaultHandled();
return;
}
@@ -876,10 +867,8 @@ void WebPluginContainerImpl::synthesizeMouseEventIfPossible(TouchEvent* event)
return;
WebCursorInfo cursorInfo;
- if (m_webPlugin->handleInputEvent(webEvent, cursorInfo)) {
- event->stopPropagation();
+ if (m_webPlugin->handleInputEvent(webEvent, cursorInfo))
event->setDefaultHandled();
- }
}
void WebPluginContainerImpl::focusPlugin()
« no previous file with comments | « Source/core/html/HTMLPlugInElement.cpp ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698