diff options
| author | Konstantin Tokarev <annulen@yandex.ru> | 2017-04-24 22:40:03 +0300 |
|---|---|---|
| committer | Konstantin Tokarev <annulen@yandex.ru> | 2017-04-25 18:29:55 +0000 |
| commit | 4bd713d56aa9bb86bc96ea9cb0c64cbf94bf43d4 (patch) | |
| tree | 02bd448d49627f059df0d8036fbdb9d9ee883a50 /Source/WebCore/page/FrameView.cpp | |
| parent | bd3f57b00bee3088971209a0ebc513eb1ef4ba14 (diff) | |
| download | qtwebkit-4bd713d56aa9bb86bc96ea9cb0c64cbf94bf43d4.tar.gz | |
Import WebKit commit 3040e0455efecd271f1aeef53cf287e75486a70d
Change-Id: I7df106cef8ce93ce33e49ad6fb0d202cd066d87c
Reviewed-by: Konstantin Tokarev <annulen@yandex.ru>
Diffstat (limited to 'Source/WebCore/page/FrameView.cpp')
| -rw-r--r-- | Source/WebCore/page/FrameView.cpp | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/Source/WebCore/page/FrameView.cpp b/Source/WebCore/page/FrameView.cpp index 4bae77613..bf35cf8b2 100644 --- a/Source/WebCore/page/FrameView.cpp +++ b/Source/WebCore/page/FrameView.cpp @@ -4592,6 +4592,7 @@ void FrameView::removeChild(Widget& widget) bool FrameView::wheelEvent(const PlatformWheelEvent& wheelEvent) { +#if !PLATFORM(QT) // Note that to allow for rubber-band over-scroll behavior, even non-scrollable views // should handle wheel events. #if !ENABLE(RUBBER_BANDING) @@ -4609,6 +4610,7 @@ bool FrameView::wheelEvent(const PlatformWheelEvent& wheelEvent) } return true; } +#endif // We don't allow mouse wheeling to happen in a ScrollView that has had its scrollbars explicitly disabled. if (!canHaveScrollbars()) |