Chromium Code Reviews| OLD | NEW |
|---|---|
| 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 | 4 |
| 5 #include "content/browser/renderer_host/overscroll_controller.h" | 5 #include "content/browser/renderer_host/overscroll_controller.h" |
| 6 | 6 |
| 7 #include "base/command_line.h" | 7 #include "base/command_line.h" |
| 8 #include "base/logging.h" | 8 #include "base/logging.h" |
| 9 #include "content/browser/renderer_host/overscroll_controller_delegate.h" | 9 #include "content/browser/renderer_host/overscroll_controller_delegate.h" |
| 10 #include "content/public/browser/overscroll_configuration.h" | 10 #include "content/public/browser/overscroll_configuration.h" |
| (...skipping 32 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 43 bool OverscrollController::ShouldProcessEvent( | 43 bool OverscrollController::ShouldProcessEvent( |
| 44 const blink::WebInputEvent& event) { | 44 const blink::WebInputEvent& event) { |
| 45 switch (event.type) { | 45 switch (event.type) { |
| 46 case blink::WebInputEvent::MouseWheel: | 46 case blink::WebInputEvent::MouseWheel: |
| 47 return false; | 47 return false; |
| 48 case blink::WebInputEvent::GestureScrollBegin: | 48 case blink::WebInputEvent::GestureScrollBegin: |
| 49 case blink::WebInputEvent::GestureScrollUpdate: | 49 case blink::WebInputEvent::GestureScrollUpdate: |
| 50 case blink::WebInputEvent::GestureScrollEnd: { | 50 case blink::WebInputEvent::GestureScrollEnd: { |
| 51 const blink::WebGestureEvent& gesture = | 51 const blink::WebGestureEvent& gesture = |
| 52 static_cast<const blink::WebGestureEvent&>(event); | 52 static_cast<const blink::WebGestureEvent&>(event); |
| 53 if (gesture.sourceDevice == blink::WebGestureDeviceTouchpad) | 53 if (gesture.sourceDevice == blink::WebGestureDeviceTouchscreen) |
| 54 return true; | 54 return true; |
|
sadrul
2016/09/21 03:33:17
Do you even need this special case here? Would the
| |
| 55 blink::WebGestureEvent::ScrollUnits scrollUnits; | 55 blink::WebGestureEvent::ScrollUnits scrollUnits; |
| 56 switch (event.type) { | 56 switch (event.type) { |
| 57 case blink::WebInputEvent::GestureScrollBegin: | 57 case blink::WebInputEvent::GestureScrollBegin: |
| 58 scrollUnits = gesture.data.scrollBegin.deltaHintUnits; | 58 scrollUnits = gesture.data.scrollBegin.deltaHintUnits; |
| 59 break; | 59 break; |
| 60 case blink::WebInputEvent::GestureScrollUpdate: | 60 case blink::WebInputEvent::GestureScrollUpdate: |
| 61 scrollUnits = gesture.data.scrollUpdate.deltaUnits; | 61 scrollUnits = gesture.data.scrollUpdate.deltaUnits; |
| 62 break; | 62 break; |
| 63 case blink::WebInputEvent::GestureScrollEnd: | 63 case blink::WebInputEvent::GestureScrollEnd: |
| 64 scrollUnits = gesture.data.scrollEnd.deltaUnits; | 64 scrollUnits = gesture.data.scrollEnd.deltaUnits; |
| (...skipping 355 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 420 overscroll_mode_ = mode; | 420 overscroll_mode_ = mode; |
| 421 if (overscroll_mode_ == OVERSCROLL_NONE) | 421 if (overscroll_mode_ == OVERSCROLL_NONE) |
| 422 overscroll_delta_x_ = overscroll_delta_y_ = 0.f; | 422 overscroll_delta_x_ = overscroll_delta_y_ = 0.f; |
| 423 else | 423 else |
| 424 scroll_state_ = STATE_OVERSCROLLING; | 424 scroll_state_ = STATE_OVERSCROLLING; |
| 425 if (delegate_) | 425 if (delegate_) |
| 426 delegate_->OnOverscrollModeChange(old_mode, overscroll_mode_); | 426 delegate_->OnOverscrollModeChange(old_mode, overscroll_mode_); |
| 427 } | 427 } |
| 428 | 428 |
| 429 } // namespace content | 429 } // namespace content |
| OLD | NEW |