Title: [98756] trunk/Source/WebKit2
- Revision
- 98756
- Author
- [email protected]
- Date
- 2011-10-28 13:27:44 -0700 (Fri, 28 Oct 2011)
Log Message
Clean up BuiltInPDFView a little
https://bugs.webkit.org/show_bug.cgi?id=71133
Reviewed by Daniel Bates.
* WebProcess/Plugins/PDF/BuiltInPDFView.cpp: (WebKit::BuiltInPDFView::createScrollbar):
Removed an incorrect FIXME. Custom scrollbars specified in a document don't apply
to subframes, and thus shouldn't apply to PDFs.
* WebProcess/Plugins/PDF/BuiltInPDFView.h: (WebKit::BuiltInPDFView::zoomAnimatorTransformChanged):
Moved to a correct location. This is not a Plugin method, but a ScrollView one.
Modified Paths
Diff
Modified: trunk/Source/WebKit2/ChangeLog (98755 => 98756)
--- trunk/Source/WebKit2/ChangeLog 2011-10-28 20:20:50 UTC (rev 98755)
+++ trunk/Source/WebKit2/ChangeLog 2011-10-28 20:27:44 UTC (rev 98756)
@@ -1,3 +1,17 @@
+2011-10-28 Alexey Proskuryakov <[email protected]>
+
+ Clean up BuiltInPDFView a little
+ https://bugs.webkit.org/show_bug.cgi?id=71133
+
+ Reviewed by Daniel Bates.
+
+ * WebProcess/Plugins/PDF/BuiltInPDFView.cpp: (WebKit::BuiltInPDFView::createScrollbar):
+ Removed an incorrect FIXME. Custom scrollbars specified in a document don't apply
+ to subframes, and thus shouldn't apply to PDFs.
+
+ * WebProcess/Plugins/PDF/BuiltInPDFView.h: (WebKit::BuiltInPDFView::zoomAnimatorTransformChanged):
+ Moved to a correct location. This is not a Plugin method, but a ScrollView one.
+
2011-10-28 Jochen Eisinger <[email protected]>
Rename a number of methods mentioning _javascript_ to just Script instead
Modified: trunk/Source/WebKit2/WebProcess/Plugins/PDF/BuiltInPDFView.cpp (98755 => 98756)
--- trunk/Source/WebKit2/WebProcess/Plugins/PDF/BuiltInPDFView.cpp 2011-10-28 20:20:50 UTC (rev 98755)
+++ trunk/Source/WebKit2/WebProcess/Plugins/PDF/BuiltInPDFView.cpp 2011-10-28 20:27:44 UTC (rev 98756)
@@ -161,7 +161,6 @@
PassRefPtr<Scrollbar> BuiltInPDFView::createScrollbar(ScrollbarOrientation orientation)
{
- // FIXME: Support custom scrollbar styles.
RefPtr<Scrollbar> widget = Scrollbar::createNativeScrollbar(this, orientation, RegularScrollbar);
if (orientation == HorizontalScrollbar)
didAddHorizontalScrollbar(widget.get());
Modified: trunk/Source/WebKit2/WebProcess/Plugins/PDF/BuiltInPDFView.h (98755 => 98756)
--- trunk/Source/WebKit2/WebProcess/Plugins/PDF/BuiltInPDFView.h 2011-10-28 20:20:50 UTC (rev 98755)
+++ trunk/Source/WebKit2/WebProcess/Plugins/PDF/BuiltInPDFView.h 2011-10-28 20:27:44 UTC (rev 98756)
@@ -91,9 +91,6 @@
virtual void manualStreamDidReceiveData(const char* bytes, int length);
virtual void manualStreamDidFinishLoading();
virtual void manualStreamDidFail(bool wasCancelled);
-
- virtual void zoomAnimatorTransformChanged(float, float, float, ZoomAnimationState) { }
-
virtual bool handleMouseEvent(const WebMouseEvent&);
virtual bool handleWheelEvent(const WebWheelEvent&);
virtual bool handleMouseEnterEvent(const WebMouseEvent&);
@@ -140,6 +137,7 @@
virtual void disconnectFromPage() { m_page = 0; }
virtual bool shouldSuspendScrollAnimations() const { return false; } // If we return true, ScrollAnimatorMac will keep cycling a timer forever, waiting for a good time to animate.
virtual void scrollbarStyleChanged();
+ virtual void zoomAnimatorTransformChanged(float, float, float, ZoomAnimationState) { }
// FIXME: Implement the other conversion functions; this one is enough to get scrollbar hit testing working.
virtual WebCore::IntPoint convertFromContainingViewToScrollbar(const WebCore::Scrollbar*, const WebCore::IntPoint& parentPoint) const;
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
