Revert "Change event handling order in HTMLPlugInElement."

Source/web/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 695 matching lines @@
         m_scrollbarGroup->setLastMousePosition(IntPoint(event->x(), event->y()));
         if (event->type() == EventTypeNames::mousemove)
             m_scrollbarGroup->scrollAnimator()->mouseMovedInContentArea();
         else if (event->type() == EventTypeNames::mouseover)
             m_scrollbarGroup->scrollAnimator()->mouseEnteredContentArea();
         else if (event->type() == EventTypeNames::mouseout)
             m_scrollbarGroup->scrollAnimator()->mouseExitedContentArea();
     }
 
     WebCursorInfo cursorInfo;
-    if (m_webPlugin->handleInputEvent(webEvent, cursorInfo)) {
-        event->stopPropagation();
+    if (m_webPlugin->handleInputEvent(webEvent, cursorInfo))
         event->setDefaultHandled();
-    }
 
     // A windowless plugin can change the cursor in response to a mouse move
     // event.  We need to reflect the changed cursor in the frame view as the
     // mouse is moved in the boundaries of the windowless plugin.
     Page* page = parentView->frame().page();
     if (!page)
         return;
     toChromeClientImpl(page->chrome().client()).setCursorForPlugin(cursorInfo);
 }
 
@@ skipping 23 matching lines @@
     m_webPlugin->handleDragStatusUpdate(dragStatus, dragData, dragOperationMask, dragLocation, dragScreenLocation);
 }
 
 void WebPluginContainerImpl::handleWheelEvent(WheelEvent* event)
 {
     WebMouseWheelEventBuilder webEvent(this, m_element->renderer(), *event);
     if (webEvent.type == WebInputEvent::Undefined)
         return;
 
     WebCursorInfo cursorInfo;
-    if (m_webPlugin->handleInputEvent(webEvent, cursorInfo)) {
-        event->stopPropagation();
+    if (m_webPlugin->handleInputEvent(webEvent, cursorInfo))
         event->setDefaultHandled();
-    }
 }
 
 void WebPluginContainerImpl::handleKeyboardEvent(KeyboardEvent* event)
 {
     WebKeyboardEventBuilder webEvent(*event);
     if (webEvent.type == WebInputEvent::Undefined)
         return;
 
     if (webEvent.type == WebInputEvent::KeyDown) {
 #if OS(MACOSX)
@@ skipping 21 matching lines @@
         webEvent.modifiers |= currentInputEvent->modifiers &
             (WebInputEvent::CapsLockOn | WebInputEvent::NumLockOn);
     }
 
     // Give the client a chance to issue edit comamnds.
     WebViewImpl* view = WebViewImpl::fromPage(m_element->document().frame()->page());
     if (m_webPlugin->supportsEditCommands() && view->client())
         view->client()->handleCurrentKeyboardEvent();
 
     WebCursorInfo cursorInfo;
-    if (m_webPlugin->handleInputEvent(webEvent, cursorInfo)) {
-        event->stopPropagation();
+    if (m_webPlugin->handleInputEvent(webEvent, cursorInfo))
         event->setDefaultHandled();
-    }
 }
 
 void WebPluginContainerImpl::handleTouchEvent(TouchEvent* event)
 {
     switch (m_touchEventRequestType) {
     case TouchEventRequestTypeNone:
         return;
     case TouchEventRequestTypeRaw: {
         WebTouchEventBuilder webEvent(this, m_element->renderer(), *event);
         if (webEvent.type == WebInputEvent::Undefined)
             return;
 
         if (event->type() == EventTypeNames::touchstart)
             focusPlugin();
 
         WebCursorInfo cursorInfo;
-        if (m_webPlugin->handleInputEvent(webEvent, cursorInfo)) {
-            event->stopPropagation();
+        if (m_webPlugin->handleInputEvent(webEvent, cursorInfo))
             event->setDefaultHandled();
-        }
         // FIXME: Can a plugin change the cursor from a touch-event callback?
         return;
     }
     case TouchEventRequestTypeSynthesizedMouse:
         synthesizeMouseEventIfPossible(event);
         return;
     }
 }
 
 static inline bool gestureScrollHelper(ScrollbarGroup* scrollbarGroup, ScrollDirection positiveDirection, ScrollDirection negativeDirection, float delta)
 {
     if (!delta)
         return false;
     float absDelta = delta > 0 ? delta : -delta;
     return scrollbarGroup->scroll(delta < 0 ? negativeDirection : positiveDirection, ScrollByPrecisePixel, absDelta);
 }
 
 void WebPluginContainerImpl::handleGestureEvent(GestureEvent* event)
 {
     WebGestureEventBuilder webEvent(this, m_element->renderer(), *event);
     if (webEvent.type == WebInputEvent::Undefined)
         return;
     WebCursorInfo cursorInfo;
     if (m_webPlugin->handleInputEvent(webEvent, cursorInfo)) {
-        event->stopPropagation();
         event->setDefaultHandled();
         return;
     }
 
     if (webEvent.type == WebInputEvent::GestureScrollUpdate || webEvent.type == WebInputEvent::GestureScrollUpdateWithoutPropagation) {
         if (!m_scrollbarGroup)
             return;
         if (gestureScrollHelper(m_scrollbarGroup.get(), ScrollLeft, ScrollRight, webEvent.data.scrollUpdate.deltaX))
             event->setDefaultHandled();
         if (gestureScrollHelper(m_scrollbarGroup.get(), ScrollUp, ScrollDown, webEvent.data.scrollUpdate.deltaY))
             event->setDefaultHandled();
     }
     // FIXME: Can a plugin change the cursor from a touch-event callback?
 }
 
 void WebPluginContainerImpl::synthesizeMouseEventIfPossible(TouchEvent* event)
 {
     WebMouseEventBuilder webEvent(this, m_element->renderer(), *event);
     if (webEvent.type == WebInputEvent::Undefined)
         return;
 
     WebCursorInfo cursorInfo;
-    if (m_webPlugin->handleInputEvent(webEvent, cursorInfo)) {
-        event->stopPropagation();
+    if (m_webPlugin->handleInputEvent(webEvent, cursorInfo))
         event->setDefaultHandled();
-    }
 }
 
 void WebPluginContainerImpl::focusPlugin()
 {
     LocalFrame& containingFrame = toFrameView(parent())->frame();
     if (Page* currentPage = containingFrame.page())
         currentPage->focusController().setFocusedElement(m_element, &containingFrame);
     else
         containingFrame.document()->setFocusedElement(m_element);
 }
@@ skipping 28 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));
     }
 
     return clipRect;
 }
 
 } // namespace blink