| OLD | NEW |
| 1 /* | 1 /* |
| 2 * Copyright (C) 2006, 2008, 2010 Apple Inc. All rights reserved. | 2 * Copyright (C) 2006, 2008, 2010 Apple Inc. All rights reserved. |
| 3 * Copyright (C) 2010 Google Inc. All rights reserved. | 3 * Copyright (C) 2010 Google Inc. All rights reserved. |
| 4 * | 4 * |
| 5 * Redistribution and use in source and binary forms, with or without | 5 * Redistribution and use in source and binary forms, with or without |
| 6 * modification, are permitted provided that the following conditions | 6 * modification, are permitted provided that the following conditions |
| 7 * are met: | 7 * are met: |
| 8 * 1. Redistributions of source code must retain the above copyright | 8 * 1. Redistributions of source code must retain the above copyright |
| 9 * notice, this list of conditions and the following disclaimer. | 9 * notice, this list of conditions and the following disclaimer. |
| 10 * 2. Redistributions in binary form must reproduce the above copyright | 10 * 2. Redistributions in binary form must reproduce the above copyright |
| (...skipping 139 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 150 | 150 |
| 151 if (!event->hasInterface(eventNames().interfaceForWheelEvent)) | 151 if (!event->hasInterface(eventNames().interfaceForWheelEvent)) |
| 152 return; | 152 return; |
| 153 | 153 |
| 154 if (!m_spinButtonOwner) | 154 if (!m_spinButtonOwner) |
| 155 return; | 155 return; |
| 156 | 156 |
| 157 if (!m_spinButtonOwner->shouldSpinButtonRespondToWheelEvents()) | 157 if (!m_spinButtonOwner->shouldSpinButtonRespondToWheelEvents()) |
| 158 return; | 158 return; |
| 159 | 159 |
| 160 doStepAction(static_cast<WheelEvent*>(event)->deltaY()); | 160 doStepAction(static_cast<WheelEvent*>(event)->wheelDeltaY()); |
| 161 event->setDefaultHandled(); | 161 event->setDefaultHandled(); |
| 162 } | 162 } |
| 163 | 163 |
| 164 bool SpinButtonElement::willRespondToMouseMoveEvents() | 164 bool SpinButtonElement::willRespondToMouseMoveEvents() |
| 165 { | 165 { |
| 166 if (renderBox() && shouldRespondToMouseEvents()) | 166 if (renderBox() && shouldRespondToMouseEvents()) |
| 167 return true; | 167 return true; |
| 168 | 168 |
| 169 return HTMLDivElement::willRespondToMouseMoveEvents(); | 169 return HTMLDivElement::willRespondToMouseMoveEvents(); |
| 170 } | 170 } |
| (...skipping 78 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 249 m_upDownState = Indeterminate; | 249 m_upDownState = Indeterminate; |
| 250 HTMLDivElement::setHovered(flag); | 250 HTMLDivElement::setHovered(flag); |
| 251 } | 251 } |
| 252 | 252 |
| 253 bool SpinButtonElement::shouldRespondToMouseEvents() | 253 bool SpinButtonElement::shouldRespondToMouseEvents() |
| 254 { | 254 { |
| 255 return !m_spinButtonOwner || m_spinButtonOwner->shouldSpinButtonRespondToMou
seEvents(); | 255 return !m_spinButtonOwner || m_spinButtonOwner->shouldSpinButtonRespondToMou
seEvents(); |
| 256 } | 256 } |
| 257 | 257 |
| 258 } | 258 } |
| OLD | NEW |