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

Unified Diff: Source/WebKit/chromium/src/WebPluginContainerImpl.cpp

Issue 11635024: Merge 137939 (Closed) Base URL: http://svn.webkit.org/repository/webkit/branches/chromium/1364/
Patch Set: Created 8 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 | « Source/WebKit/chromium/features.gypi ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/WebKit/chromium/src/WebPluginContainerImpl.cpp
===================================================================
--- Source/WebKit/chromium/src/WebPluginContainerImpl.cpp (revision 138187)
+++ Source/WebKit/chromium/src/WebPluginContainerImpl.cpp (working copy)
@@ -527,9 +527,9 @@
return;
m_touchEventRequestType = requestType;
if (m_touchEventRequestType != TouchEventRequestTypeNone)
- m_element->document()->didAddTouchEventHandler();
+ m_element->document()->didAddTouchEventHandler(m_element);
else
- m_element->document()->didRemoveTouchEventHandler();
+ m_element->document()->didRemoveTouchEventHandler(m_element);
}
void WebPluginContainerImpl::setWantsWheelEvents(bool wantsWheelEvents)
@@ -672,7 +672,7 @@
WebPluginContainerImpl::~WebPluginContainerImpl()
{
if (m_touchEventRequestType != TouchEventRequestTypeNone)
- m_element->document()->didRemoveTouchEventHandler();
+ m_element->document()->didRemoveTouchEventHandler(m_element);
for (size_t i = 0; i < m_pluginLoadObservers.size(); ++i)
m_pluginLoadObservers[i]->clearPluginContainer();
« no previous file with comments | « Source/WebKit/chromium/features.gypi ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698