WebKit merge 41447:41498 [third_party/WebKit]

third_party/WebKit/WebCore/platform/ScrollView.cpp

 /*
  * Copyright (C) 2006, 2007, 2008 Apple Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
@@ skipping 595 matching lines @@
 
     // Determine how much we want to scroll.  If we can move at all, we will accept the event.
     IntSize maxScrollDelta = maximumScrollPosition() - scrollPosition();
     if ((e.deltaX() < 0 && maxScrollDelta.width() > 0) ||
         (e.deltaX() > 0 && scrollOffset().width() > 0) ||
         (e.deltaY() < 0 && maxScrollDelta.height() > 0) ||
         (e.deltaY() > 0 && scrollOffset().height() > 0)) {
         e.accept();
         float deltaX = e.deltaX();
         float deltaY = e.deltaY();
-        if (e.granularity() == ScrollByLineWheelEvent) {
-            deltaX *= cMouseWheelPixelsPerLineStep;
-            deltaY *= cMouseWheelPixelsPerLineStep;
-        } else if (e.granularity() == ScrollByPageWheelEvent) {
+        if (e.granularity() == ScrollByPageWheelEvent) {
             ASSERT(deltaX == 0);
             bool negative = deltaY < 0;
             deltaY = max(0, visibleHeight() - cAmountToKeepWhenPaging);
             if (negative)
                 deltaY = -deltaY;
         }
         scrollBy(IntSize(-deltaX, -deltaY));
     }
 }
 
@@ skipping 290 matching lines @@
 bool ScrollView::platformHasVerticalAdjustment() const
 {
     return false;
 }
 
 #endif
 
 }