diff options
| author | Simon Hausmann <simon.hausmann@nokia.com> | 2012-09-11 19:54:20 +0200 |
|---|---|---|
| committer | Simon Hausmann <simon.hausmann@nokia.com> | 2012-09-11 19:54:20 +0200 |
| commit | 88a04ac016f57c2d78e714682445dff2e7db4ade (patch) | |
| tree | a48ca81ee3b29953121308168db22532d5b57fe2 /Source/WebKit2/WebProcess/Plugins/PDF/BuiltInPDFView.h | |
| parent | 284837daa07b29d6a63a748544a90b1f5842ac5c (diff) | |
| download | qtwebkit-88a04ac016f57c2d78e714682445dff2e7db4ade.tar.gz | |
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
Diffstat (limited to 'Source/WebKit2/WebProcess/Plugins/PDF/BuiltInPDFView.h')
| -rw-r--r-- | Source/WebKit2/WebProcess/Plugins/PDF/BuiltInPDFView.h | 3 |
1 files changed, 1 insertions, 2 deletions
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. |