Title: [119047] branches/safari-536-branch/Source/WebKit2
- Revision
- 119047
- Author
- [email protected]
- Date
- 2012-05-30 21:12:00 -0700 (Wed, 30 May 2012)
Log Message
Merged r118615 -> <rdar://problem/11499408>
Modified Paths
Diff
Modified: branches/safari-536-branch/Source/WebKit2/ChangeLog (119046 => 119047)
--- branches/safari-536-branch/Source/WebKit2/ChangeLog 2012-05-31 03:59:39 UTC (rev 119046)
+++ branches/safari-536-branch/Source/WebKit2/ChangeLog 2012-05-31 04:12:00 UTC (rev 119047)
@@ -1,5 +1,25 @@
2012-05-30 Lucas Forschler <[email protected]>
+ Merge 118615
+
+ 2012-05-25 Maciej Stachowiak <[email protected]>
+
+ REGRESSION (r116720): Subframe PDF scrolls extremely slowly
+ https://bugs.webkit.org/show_bug.cgi?id=87557
+ <rdar://problem/11499408>
+
+ Reviewed by Anders Carlsson.
+
+ It's not possible to make an automated test for this.
+
+ * WebProcess/Plugins/PDF/BuiltInPDFView.mm:
+ (WebKit::BuiltInPDFView::wantsWheelEvents): Return true instead of false and delete
+ misleading comment. While the built-in PDF view would get added to the set of scrollable
+ areas anyway, there are some code paths that check wantsWheelEvents explicitly, so it seems
+ necessary to reutrn true.
+
+2012-05-30 Lucas Forschler <[email protected]>
+
Merge 118559
2012-05-25 Beth Dakin <[email protected]>
Modified: branches/safari-536-branch/Source/WebKit2/WebProcess/Plugins/PDF/BuiltInPDFView.mm (119046 => 119047)
--- branches/safari-536-branch/Source/WebKit2/WebProcess/Plugins/PDF/BuiltInPDFView.mm 2012-05-31 03:59:39 UTC (rev 119046)
+++ branches/safari-536-branch/Source/WebKit2/WebProcess/Plugins/PDF/BuiltInPDFView.mm 2012-05-31 04:12:00 UTC (rev 119047)
@@ -473,8 +473,7 @@
bool BuiltInPDFView::wantsWheelEvents()
{
- // We return false here even though we do want wheel events, because we add ourselves to the scrollable area set in updateScrollbars().
- return false;
+ return true;
}
void BuiltInPDFView::geometryDidChange(const IntSize& pluginSize, const IntRect& clipRect, const AffineTransform& pluginToRootViewTransform)
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
