Merge 135178

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 49 matching lines @@
 #include "HTMLPlugInElement.h"
 #include "IFrameShimSupport.h"
 #include "KeyboardCodes.h"
 #include "KeyboardEvent.h"
 #include "MouseEvent.h"
 #include "Page.h"
 #include "RenderBox.h"
 #include "ScrollAnimator.h"
 #include "ScrollView.h"
 #include "ScrollbarTheme.h"
+#include "ScrollingCoordinator.h"
 #include "TouchEvent.h"
 #include "UserGestureIndicator.h"
 #include "WebPrintParams.h"
 #include "WheelEvent.h"
 #include <public/Platform.h>
 #include <public/WebClipboard.h>
 #include <public/WebCompositorSupport.h>
 #include <public/WebDragData.h>
 #include <public/WebExternalTextureLayer.h>
 #include <public/WebRect.h>
@@ skipping 445 matching lines @@
 {
     if (m_isAcceptingTouchEvents == acceptingTouchEvents)
         return;
     m_isAcceptingTouchEvents = acceptingTouchEvents;
     if (m_isAcceptingTouchEvents)
         m_element->document()->didAddTouchEventHandler();
     else
         m_element->document()->didRemoveTouchEventHandler();
 }
 
+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())
+                scrollingCoordinator->frameViewLayoutUpdated(static_cast<FrameView*>(parent()));
+        }
+    }
+}
+
 void WebPluginContainerImpl::didReceiveResponse(const ResourceResponse& response)
 {
     // Make sure that the plugin receives window geometry before data, or else
     // plugins misbehave.
     frameRectsChanged();
 
     WrappedResourceResponse urlResponse(response);
     m_webPlugin->didReceiveResponse(urlResponse);
 }
 
@@ skipping 30 matching lines @@
 bool WebPluginContainerImpl::supportsKeyboardFocus() const
 {
     return m_webPlugin->supportsKeyboardFocus();
 }
 
 bool WebPluginContainerImpl::canProcessDrag() const
 {
     return m_webPlugin->canProcessDrag();
 }
 
+bool WebPluginContainerImpl::wantsWheelEvents()
+{
+    return m_wantsWheelEvents;
+}
+
 void WebPluginContainerImpl::willDestroyPluginLoadObserver(WebPluginLoadObserver* observer)
 {
     size_t pos = m_pluginLoadObservers.find(observer);
     if (pos == notFound)
         return;
     m_pluginLoadObservers.remove(pos);
 }
 
 #if USE(ACCELERATED_COMPOSITING)
 WebLayer* WebPluginContainerImpl::platformLayer() const
@@ skipping 39 matching lines @@
 
 WebPluginContainerImpl::WebPluginContainerImpl(WebCore::HTMLPlugInElement* element, WebPlugin* webPlugin)
     : WebCore::PluginViewBase(0)
     , m_element(element)
     , m_webPlugin(webPlugin)
 #if USE(ACCELERATED_COMPOSITING)
     , m_textureId(0)
     , m_ioSurfaceId(0)
 #endif
     , m_isAcceptingTouchEvents(false)
+    , m_wantsWheelEvents(false)
 {
 }
 
 WebPluginContainerImpl::~WebPluginContainerImpl()
 {
 #if USE(ACCELERATED_COMPOSITING)
     if (m_textureLayer)
         GraphicsLayerChromium::unregisterContentsLayer(m_textureLayer->layer());
     if (m_ioSurfaceLayer)
         GraphicsLayerChromium::unregisterContentsLayer(m_ioSurfaceLayer->layer());
@@ skipping 189 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