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

Issues Search
    My Issues | Starred     Open | Closed | All

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

Issue 12088115: Merge 141357 (Closed) Base URL: http://svn.webkit.org/repository/webkit/branches/chromium/1364/
Patch Set: Created 7 years, 11 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 | « LayoutTests/platform/chromium/plugins/re-request-touch-events-crash-expected.txt ('k') | Tools/DumpRenderTree/chromium/TestRunner/src/WebTestPlugin.cpp » ('j') | 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 141606)
+++ Source/WebKit/chromium/src/WebPluginContainerImpl.cpp (working copy)
@@ -525,11 +525,12 @@
{
if (m_touchEventRequestType == requestType)
return;
- m_touchEventRequestType = requestType;
- if (m_touchEventRequestType != TouchEventRequestTypeNone)
+
+ if (requestType != TouchEventRequestTypeNone && m_touchEventRequestType == TouchEventRequestTypeNone)
m_element->document()->didAddTouchEventHandler(m_element);
- else
+ else if (requestType == TouchEventRequestTypeNone && m_touchEventRequestType != TouchEventRequestTypeNone)
m_element->document()->didRemoveTouchEventHandler(m_element);
+ m_touchEventRequestType = requestType;
}
void WebPluginContainerImpl::setWantsWheelEvents(bool wantsWheelEvents)
« no previous file with comments | « LayoutTests/platform/chromium/plugins/re-request-touch-events-crash-expected.txt ('k') | Tools/DumpRenderTree/chromium/TestRunner/src/WebTestPlugin.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698