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

Unified Diff: content/renderer/browser_plugin/browser_plugin.cc

Issue 1412923009: Route touch-events for WebViewGuest directly to guest renderer. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Update comments (saving first this time). 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
« no previous file with comments | « content/public/test/browser_test_utils.cc ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/renderer/browser_plugin/browser_plugin.cc
diff --git a/content/renderer/browser_plugin/browser_plugin.cc b/content/renderer/browser_plugin/browser_plugin.cc
index 0af3aa46a282f9d219d83b8061dcb4bcea81cc89..60451d6a9d6dbc53dbf241f339836922e2cf5496 100644
--- a/content/renderer/browser_plugin/browser_plugin.cc
+++ b/content/renderer/browser_plugin/browser_plugin.cc
@@ -84,6 +84,8 @@ BrowserPlugin::BrowserPlugin(
}
BrowserPlugin::~BrowserPlugin() {
+ Detach();
+
if (compositing_helper_.get())
compositing_helper_->OnContainerDestroy();
@@ -489,6 +491,8 @@ blink::WebInputEventResult BrowserPlugin::handleInputEvent(
if (guest_crashed_ || !attached())
return blink::WebInputEventResult::NotHandled;
+ DCHECK(!blink::WebInputEvent::isTouchEventType(event.type));
+
if (event.type == blink::WebInputEvent::MouseWheel) {
auto wheel_event = static_cast<const blink::WebMouseWheelEvent&>(event);
if (wheel_event.resendingPluginId == browser_plugin_instance_id_)
« no previous file with comments | « content/public/test/browser_test_utils.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698