webkit/ppapi: Notify the container when a plugin is accepting wheel events just like r143871.

webkit/plugins/ppapi/ppapi_plugin_instance.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "webkit/plugins/ppapi/ppapi_plugin_instance.h"
 
 #include "base/bind.h"
 #include "base/callback_helpers.h"
 #include "base/debug/trace_event.h"
 #include "base/logging.h"
@@ skipping 545 matching lines @@
 bool PluginInstance::Initialize(WebPluginContainer* container,
                                 const std::vector<std::string>& arg_names,
                                 const std::vector<std::string>& arg_values,
                                 const GURL& plugin_url,
                                 bool full_frame) {
   container_ = container;
   plugin_url_ = plugin_url;
   full_frame_ = full_frame;
 
   container_->setIsAcceptingTouchEvents(IsAcceptingTouchEvents());
+  container_->setWantsWheelEvents(IsAcceptingWheelEvents());
 
   SetGPUHistogram(delegate_->GetPreferences(), arg_names, arg_values);
 
   argn_ = arg_names;
   argv_ = arg_values;
   scoped_array<const char*> argn_array(StringVectorToArgArray(argn_));
   scoped_array<const char*> argv_array(StringVectorToArgArray(argv_));
   return PP_ToBool(instance_interface_->DidCreate(pp_instance(),
                                                   argn_.size(),
                                                   argn_array.get(),
@@ skipping 593 matching lines @@
   bool has_focus = PluginHasFocus();
   delegate()->PluginFocusChanged(this, has_focus);
   instance_interface_->DidChangeFocus(pp_instance(), PP_FromBool(has_focus));
 }
 
 bool PluginInstance::IsAcceptingTouchEvents() const {
   return (filtered_input_event_mask_ & PP_INPUTEVENT_CLASS_TOUCH) ||
       (input_event_mask_ & PP_INPUTEVENT_CLASS_TOUCH);
 }
 
+bool PluginInstance::IsAcceptingWheelEvents() const {
+  return (filtered_input_event_mask_ & PP_INPUTEVENT_CLASS_WHEEL) ||
+      (input_event_mask_ & PP_INPUTEVENT_CLASS_WHEEL);
+}
+
 void PluginInstance::ScheduleAsyncDidChangeView() {
   if (view_change_weak_ptr_factory_.HasWeakPtrs())
     return;  // Already scheduled.
   MessageLoop::current()->PostTask(
       FROM_HERE, base::Bind(&PluginInstance::SendAsyncDidChangeView,
                             view_change_weak_ptr_factory_.GetWeakPtr()));
 }
 
 void PluginInstance::SendAsyncDidChangeView() {
   // The bound callback that owns the weak pointer is still valid until after
@@ skipping 944 matching lines @@
     PP_Instance /* instance */) {
   return &gamepad_impl_;
 }
 
 int32_t PluginInstance::RequestInputEvents(PP_Instance instance,
                                            uint32_t event_classes) {
   input_event_mask_ |= event_classes;
   filtered_input_event_mask_ &= ~(event_classes);
   if (event_classes & PP_INPUTEVENT_CLASS_TOUCH)
     container_->setIsAcceptingTouchEvents(IsAcceptingTouchEvents());
+  if (event_classes & PP_INPUTEVENT_CLASS_WHEEL)
+    container_->setWantsWheelEvents(IsAcceptingWheelEvents());

[jamesr, 2012/11/26 06:23:07]

this little 4-line block of checking for PP_INPUTEVENT_CLASS_... is repeated 3
times now. Could you fold these into a helper function?

[Yusuke Sato, 2012/11/26 23:22:18]

Done.

   return ValidateRequestInputEvents(false, event_classes);
 }
 
 int32_t PluginInstance::RequestFilteringInputEvents(PP_Instance instance,
                                                     uint32_t event_classes) {
   filtered_input_event_mask_ |= event_classes;
   input_event_mask_ &= ~(event_classes);
   if (event_classes & PP_INPUTEVENT_CLASS_TOUCH)
     container_->setIsAcceptingTouchEvents(IsAcceptingTouchEvents());
+  if (event_classes & PP_INPUTEVENT_CLASS_WHEEL)
+    container_->setWantsWheelEvents(IsAcceptingWheelEvents());
   return ValidateRequestInputEvents(true, event_classes);
 }
 
 void PluginInstance::ClearInputEventRequest(PP_Instance instance,
                                             uint32_t event_classes) {
   input_event_mask_ &= ~(event_classes);
   filtered_input_event_mask_ &= ~(event_classes);
   if (event_classes & PP_INPUTEVENT_CLASS_TOUCH)
     container_->setIsAcceptingTouchEvents(IsAcceptingTouchEvents());
+  if (event_classes & PP_INPUTEVENT_CLASS_WHEEL)
+    container_->setWantsWheelEvents(IsAcceptingWheelEvents());
 }
 
 void PluginInstance::ZoomChanged(PP_Instance instance, double factor) {
   // We only want to tell the page to change its zoom if the whole page is the
   // plugin.  If we're in an iframe, then don't do anything.
   if (!IsFullPagePlugin())
     return;
   container()->zoomLevelChanged(WebView::zoomFactorToZoomLevel(factor));
 }
 
@@ skipping 299 matching lines @@
   screen_size_for_fullscreen_ = gfx::Size();
   WebElement element = container_->element();
   element.setAttribute(WebString::fromUTF8(kWidth), width_before_fullscreen_);
   element.setAttribute(WebString::fromUTF8(kHeight), height_before_fullscreen_);
   element.setAttribute(WebString::fromUTF8(kBorder), border_before_fullscreen_);
   element.setAttribute(WebString::fromUTF8(kStyle), style_before_fullscreen_);
 }
 
 }  // namespace ppapi
 }  // namespace webkit