Merge 135178

Source/WebKit/chromium/public/WebPluginContainer.h

Index: Source/WebKit/chromium/public/WebPluginContainer.h
===================================================================
--- Source/WebKit/chromium/public/WebPluginContainer.h	(revision 136415)
+++ Source/WebKit/chromium/public/WebPluginContainer.h	(working copy)
@@ -111,6 +111,12 @@
     // Notifies when the plugin starts/stops accepting touch events.
     virtual void setIsAcceptingTouchEvents(bool) = 0;
 
+    // Notifies when the plugin starts/stops accepting wheel events. Without
+    // calling the function with true, the container might not always able to
+    // receive wheel events in some cases (such as when threaded compositing
+    // is in use but a scroll bar is not in use).
+    virtual void setWantsWheelEvents(bool) = 0;
+
     virtual WebPlugin* plugin() = 0;
     virtual void setPlugin(WebPlugin*) = 0;