Merge 135178

Source/WebKit/chromium/ChangeLog

+2012-11-19  Yusuke Sato  <yusukes@chromium.org>
+
+        [Chromium] Flash cannot receive scroll events when threaded compositing is in use
+        https://bugs.webkit.org/show_bug.cgi?id=101423
+
+        Reviewed by James Robinson.
+
+        Add setWantsWheelEvents() to Chromium's WebPluginContainer interface so that a plugin can tell the
+        container that the plugin always wants to handle wheel events even when a scroll bar is not shown.
+
+        * public/WebPluginContainer.h:
+        (WebPluginContainer):
+        * src/WebPluginContainerImpl.cpp:
+        (WebKit::WebPluginContainerImpl::setWantsWheelEvents):
+        (WebKit):
+        (WebKit::WebPluginContainerImpl::wantsWheelEvents):
+        (WebKit::WebPluginContainerImpl::WebPluginContainerImpl):
+        * src/WebPluginContainerImpl.h:
+        (WebPluginContainerImpl):
+
 2012-11-20  Tony Chang  <tony@chromium.org>
 
         When calling DocumentStyleSheetCollection::addUserSheet, pass in a user sheet
         https://bugs.webkit.org/show_bug.cgi?id=102835
 
         Reviewed by Ojan Vafai.
 
         After r135082, Chromium browser_tests were triggering the ASSERT in
         StyleResolver::collectRulesFromUserStyleSheets. Add an ASSERT that will
         trigger earlier and make it clear in the Chromium code that we're always
@@ skipping 2424 matching lines @@
 
         [Chromium-Win] Implement LocaleWin::dateFormat
         https://bugs.webkit.org/show_bug.cgi?id=98117
 
         Reviewed by Kentaro Hara.
 
         * tests/LocaleWinTest.cpp:
         (TEST_F): Add tests for LocaleWin::dateFormat.
 
 == Rolled over to ChangeLog-2012-10-02 ==