Merge 135178

Tools/DumpRenderTree/chromium/TestWebPlugin.cpp

 /*
  * Copyright (C) 2011 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:
  *
  * 1.  Redistributions of source code must retain the above copyright
  *     notice, this list of conditions and the following disclaimer.
  * 2.  Redistributions in binary form must reproduce the above copyright
@@ skipping 166 matching lines @@
 
     if (!m_context->makeContextCurrent())
         return false;
 
     if (!initScene())
         return false;
 
     m_container = container;
     m_container->setBackingTextureId(m_colorTexture);
     m_container->setIsAcceptingTouchEvents(m_acceptsTouchEvent);
+    m_container->setWantsWheelEvents(true);
     return true;
 }
 
 void TestWebPlugin::destroy()
 {
     destroyScene();
 
     delete m_context;
     m_context = 0;
 
@@ skipping 294 matching lines @@
     case WebKit::WebDragStatusDrop:
         dragStatusName = "DragDrop";
         break;
     case WebKit::WebDragStatusUnknown:
         ASSERT_NOT_REACHED();
     }
     printf("Plugin received event: %s\n", dragStatusName);
     return false;
 }