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

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 Mac code, rebase to master@{#361742}. 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: 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 f3a87a250ed696b3dea192ecb00ae4f2c5b436e5..0080d1436ef5442379651923d4838027b782e413 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();
@@ -488,6 +490,8 @@ bool BrowserPlugin::handleInputEvent(const blink::WebInputEvent& event,
if (guest_crashed_ || !attached())
return false;
+ 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_)

Powered by Google App Engine
This is Rietveld 408576698