Merge 141357

Source/WebKit/chromium/src/WebPluginContainerImpl.cpp

 /*
  * Copyright (C) 2009 Google Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are
  * met:
  *
  *     * Redistributions of source code must retain the above copyright
  * notice, this list of conditions and the following disclaimer.
  *     * Redistributions in binary form must reproduce the above
@@ skipping 507 matching lines @@
     const HitTestResult::NodeSet& nodes = result.rectBasedTestResult();
     if (nodes.size() != 1)
         return false;
     return (nodes.first().get() == m_element);
 }
 
 void WebPluginContainerImpl::requestTouchEventType(TouchEventRequestType requestType)
 {
     if (m_touchEventRequestType == requestType)
         return;
+    
+    if (requestType != TouchEventRequestTypeNone && m_touchEventRequestType == TouchEventRequestTypeNone)
+        m_element->document()->didAddTouchEventHandler(m_element);
+    else if (requestType == TouchEventRequestTypeNone && m_touchEventRequestType != TouchEventRequestTypeNone)
+        m_element->document()->didRemoveTouchEventHandler(m_element);
     m_touchEventRequestType = requestType;
-    if (m_touchEventRequestType != TouchEventRequestTypeNone)
-        m_element->document()->didAddTouchEventHandler(m_element);
-    else
-        m_element->document()->didRemoveTouchEventHandler(m_element);
 }
 
 void WebPluginContainerImpl::setWantsWheelEvents(bool wantsWheelEvents)
 {
     if (m_wantsWheelEvents == wantsWheelEvents)
         return;
     m_wantsWheelEvents = wantsWheelEvents;
     if (Page* page = m_element->document()->page()) {
         if (ScrollingCoordinator* scrollingCoordinator = page->scrollingCoordinator()) {
             if (parent() && parent()->isFrameView())
@@ skipping 340 matching lines @@
         // Take our element and get the clip rect from the enclosing layer and
         // frame view.
         clipRect.intersect(
             m_element->document()->view()->windowClipRectForFrameOwner(m_element, true));
     }
 
     return clipRect;
 }
 
 } // namespace WebKit