WebKit merge 41447:41498 [third_party/WebKit]

third_party/WebKit/WebCore/platform/qt/WheelEventQt.cpp

 /*
     Copyright (C) 2008 Nokia Corporation and/or its subsidiary(-ies)
 
     This library is free software; you can redistribute it and/or
     modify it under the terms of the GNU Library General Public
     License as published by the Free Software Foundation; either
     version 2 of the License, or (at your option) any later version.
 
     This library is distributed in the hope that it will be useful,
     but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ skipping 19 matching lines @@
 
 
 PlatformWheelEvent::PlatformWheelEvent(QWheelEvent* e)
 #ifdef QT_NO_WHEELEVENT
 {
     Q_UNUSED(e);
 }
 #else
     : m_position(e->pos())
     , m_globalPosition(e->globalPos())
-#ifdef QT_MAC_USE_COCOA
     , m_granularity(ScrollByPixelWheelEvent)
-#else
-    , m_granularity(ScrollByLineWheelEvent)
-#endif
     , m_isAccepted(false)
     , m_shiftKey(e->modifiers() & Qt::ShiftModifier)
     , m_ctrlKey(e->modifiers() & Qt::ControlModifier)
     , m_altKey(e->modifiers() & Qt::AltModifier)
     , m_metaKey(e->modifiers() & Qt::MetaModifier)
 {
     if (e->orientation() == Qt::Horizontal) {
         m_deltaX = (e->delta() / 120);
         m_deltaY = 0;
     } else {
         m_deltaX = 0;
         m_deltaY = (e->delta() / 120);
     }
 
-    m_deltaX *= QApplication::wheelScrollLines();
     // use the same single scroll step as QTextEdit (in
     // QTextEditPrivate::init [h,v]bar->setSingleStep )
-    // and divide by the default WebKit scroll step to
-    // get the Qt mouse wheel scroll behavior
     static const float cDefaultQtScrollStep = 20.f;
-    m_deltaY *= QApplication::wheelScrollLines() *
-                (cDefaultQtScrollStep / cMouseWheelPixelsPerLineStep);
+    m_deltaX *= QApplication::wheelScrollLines() * cDefaultQtScrollStep;
+    m_deltaY *= QApplication::wheelScrollLines() * cDefaultQtScrollStep;
 }
 #endif // QT_NO_WHEELEVENT
 
 } // namespace WebCore