Title: [117145] branches/safari-536-branch/Source
Diff
Modified: branches/safari-536-branch/Source/WebCore/ChangeLog (117144 => 117145)
--- branches/safari-536-branch/Source/WebCore/ChangeLog 2012-05-15 20:46:13 UTC (rev 117144)
+++ branches/safari-536-branch/Source/WebCore/ChangeLog 2012-05-15 20:47:51 UTC (rev 117145)
@@ -22,6 +22,28 @@
2012-05-15 Lucas Forschler <[email protected]>
+ Merge 116720
+
+ 2012-05-10 Anders Carlsson <[email protected]>
+
+ PDF files won't scroll in Safari when using Adobe plug-in
+ https://bugs.webkit.org/show_bug.cgi?id=86167
+ <rdar://problem/11389719>
+
+ Reviewed by Sam Weinig.
+
+ * page/scrolling/ScrollingCoordinator.cpp:
+ (WebCore::computeNonFastScrollableRegion):
+ Loop over the frame view children looking for plug-in views that want wheel events
+ and add them to the non-fast scrollable region. Ideally, the plug-ins should be added
+ to the set of scrollable areas, but PluginView in WebKit2 is not a ScrollableArea yet.
+
+ * plugins/PluginViewBase.h:
+ (PluginViewBase):
+ (WebCore::PluginViewBase::wantsWheelEvents):
+
+2012-05-15 Lucas Forschler <[email protected]>
+
Merge 116711
2012-05-10 Beth Dakin <[email protected]>
Modified: branches/safari-536-branch/Source/WebKit2/ChangeLog (117144 => 117145)
--- branches/safari-536-branch/Source/WebKit2/ChangeLog 2012-05-15 20:46:13 UTC (rev 117144)
+++ branches/safari-536-branch/Source/WebKit2/ChangeLog 2012-05-15 20:47:51 UTC (rev 117145)
@@ -55,6 +55,61 @@
2012-05-15 Lucas Forschler <[email protected]>
+ Merge 116720
+
+ 2012-05-10 Anders Carlsson <[email protected]>
+
+ PDF files won't scroll in Safari when using Adobe plug-in
+ https://bugs.webkit.org/show_bug.cgi?id=86167
+ <rdar://problem/11389719>
+
+ Reviewed by Sam Weinig.
+
+ Add a way to whitelist plug-ins that we know will process wheel events correctly. Add the new
+ Adobe Reader plug-in to this whitelist. Only send wheel events to plug-ins that are in the whitelist.
+
+ * PluginProcess/PluginControllerProxy.cpp:
+ (WebKit::PluginControllerProxy::wantsWheelEvents):
+ (WebKit):
+ * PluginProcess/PluginControllerProxy.h:
+ (PluginControllerProxy):
+ * PluginProcess/WebProcessConnection.cpp:
+ (WebKit::WebProcessConnection::createPlugin):
+ * PluginProcess/WebProcessConnection.h:
+ (WebProcessConnection):
+ * PluginProcess/WebProcessConnection.messages.in:
+ * Shared/Plugins/Netscape/mac/NetscapePluginModuleMac.mm:
+ (WebKit::NetscapePluginModule::determineQuirks):
+ * Shared/Plugins/PluginQuirks.h:
+ * WebProcess/Plugins/Netscape/NetscapePlugin.cpp:
+ (WebKit::NetscapePlugin::wantsWheelEvents):
+ (WebKit):
+ * WebProcess/Plugins/Netscape/NetscapePlugin.h:
+ (NetscapePlugin):
+ * WebProcess/Plugins/PDF/BuiltInPDFView.h:
+ (BuiltInPDFView):
+ * WebProcess/Plugins/PDF/BuiltInPDFView.mm:
+ (WebKit::BuiltInPDFView::wantsWheelEvents):
+ (WebKit):
+ * WebProcess/Plugins/Plugin.h:
+ (Plugin):
+ * WebProcess/Plugins/PluginProxy.cpp:
+ (WebKit::PluginProxy::PluginProxy):
+ (WebKit::PluginProxy::initialize):
+ (WebKit::PluginProxy::wantsWheelEvents):
+ (WebKit):
+ * WebProcess/Plugins/PluginProxy.h:
+ (PluginProxy):
+ * WebProcess/Plugins/PluginView.cpp:
+ (WebKit::PluginView::initializePlugin):
+ (WebKit::PluginView::wantsWheelEvents):
+ (WebKit):
+ (WebKit::PluginView::handleEvent):
+ * WebProcess/Plugins/PluginView.h:
+ (PluginView):
+
+2012-05-15 Lucas Forschler <[email protected]>
+
Merge 116716
2012-05-10 Anders Carlsson <[email protected]>
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
