From 88a04ac016f57c2d78e714682445dff2e7db4ade Mon Sep 17 00:00:00 2001 From: Simon Hausmann Date: Tue, 11 Sep 2012 19:54:20 +0200 Subject: Imported WebKit commit 42d95198c30c2d1a94a5081181aad0b2be7c316c (http://svn.webkit.org/repository/webkit/trunk@128206) This includes the rewrite of the configure part of the build system which should fix the QtQuick2 detection and allow for further simplifications in the future --- Source/WebKit2/WebProcess/Plugins/PDF/BuiltInPDFView.h | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'Source/WebKit2/WebProcess/Plugins/PDF/BuiltInPDFView.h') diff --git a/Source/WebKit2/WebProcess/Plugins/PDF/BuiltInPDFView.h b/Source/WebKit2/WebProcess/Plugins/PDF/BuiltInPDFView.h index 9ccd80400..d99d9436d 100644 --- a/Source/WebKit2/WebProcess/Plugins/PDF/BuiltInPDFView.h +++ b/Source/WebKit2/WebProcess/Plugins/PDF/BuiltInPDFView.h @@ -51,7 +51,6 @@ public: static WebCore::PluginInfo pluginInfo(); // In-process PDFViews don't support asynchronous initialization. - virtual void waitForAsynchronousInitialization() { } virtual bool isBeingAsynchronouslyInitialized() const { return false; } private: @@ -140,7 +139,7 @@ private: virtual WebCore::IntSize contentsSize() const OVERRIDE; virtual WebCore::Scrollbar* horizontalScrollbar() const OVERRIDE { return m_horizontalScrollbar.get(); } virtual WebCore::Scrollbar* verticalScrollbar() const OVERRIDE { return m_verticalScrollbar.get(); } - virtual bool isOnActivePage() const OVERRIDE; + virtual bool scrollbarsCanBeActive() const OVERRIDE; virtual bool shouldSuspendScrollAnimations() const OVERRIDE { return false; } // If we return true, ScrollAnimatorMac will keep cycling a timer forever, waiting for a good time to animate. virtual void scrollbarStyleChanged(int newStyle, bool forceUpdate) OVERRIDE; // FIXME: Implement the other conversion functions; this one is enough to get scrollbar hit testing working. -- cgit v1.2.1