| OLD | NEW |
| 1 /* | 1 /* |
| 2 * Copyright (C) 2011, 2012 Google Inc. All rights reserved. | 2 * Copyright (C) 2011, 2012 Google Inc. All rights reserved. |
| 3 * | 3 * |
| 4 * Redistribution and use in source and binary forms, with or without | 4 * Redistribution and use in source and binary forms, with or without |
| 5 * modification, are permitted provided that the following conditions are | 5 * modification, are permitted provided that the following conditions are |
| 6 * met: | 6 * met: |
| 7 * | 7 * |
| 8 * * Redistributions of source code must retain the above copyright | 8 * * 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 * * Redistributions in binary form must reproduce the above | 10 * * Redistributions in binary form must reproduce the above |
| (...skipping 234 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 245 void WebViewImpl::handleMouseUp(LocalFrame& mainFrame, const WebMouseEvent& even
t) | 245 void WebViewImpl::handleMouseUp(LocalFrame& mainFrame, const WebMouseEvent& even
t) |
| 246 { | 246 { |
| 247 PageWidgetEventHandler::handleMouseUp(mainFrame, event); | 247 PageWidgetEventHandler::handleMouseUp(mainFrame, event); |
| 248 } | 248 } |
| 249 | 249 |
| 250 bool WebViewImpl::handleMouseWheel(LocalFrame& mainFrame, const WebMouseWheelEve
nt& event) | 250 bool WebViewImpl::handleMouseWheel(LocalFrame& mainFrame, const WebMouseWheelEve
nt& event) |
| 251 { | 251 { |
| 252 return PageWidgetEventHandler::handleMouseWheel(mainFrame, event); | 252 return PageWidgetEventHandler::handleMouseWheel(mainFrame, event); |
| 253 } | 253 } |
| 254 | 254 |
| 255 // FIXME(sky): This appears to be unused. |
| 255 bool WebViewImpl::scrollBy(const WebFloatSize& delta, const WebFloatSize& veloci
ty) | 256 bool WebViewImpl::scrollBy(const WebFloatSize& delta, const WebFloatSize& veloci
ty) |
| 256 { | 257 { |
| 257 if (m_flingSourceDevice == WebGestureDeviceTouchpad) { | 258 if (m_flingSourceDevice == WebGestureDeviceTouchpad) { |
| 258 WebMouseWheelEvent syntheticWheel; | 259 WebMouseWheelEvent syntheticWheel; |
| 259 const float tickDivisor = WheelEvent::TickMultiplier; | 260 const float tickDivisor = WheelEvent::TickMultiplier; |
| 260 | 261 |
| 261 syntheticWheel.deltaX = delta.width; | 262 syntheticWheel.deltaX = delta.width; |
| 262 syntheticWheel.deltaY = delta.height; | 263 syntheticWheel.deltaY = delta.height; |
| 263 syntheticWheel.wheelTicksX = delta.width / tickDivisor; | 264 syntheticWheel.wheelTicksX = delta.width / tickDivisor; |
| 264 syntheticWheel.wheelTicksY = delta.height / tickDivisor; | 265 syntheticWheel.wheelTicksY = delta.height / tickDivisor; |
| (...skipping 2275 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 2540 m_layerTreeView->setVisible(visible); | 2541 m_layerTreeView->setVisible(visible); |
| 2541 } | 2542 } |
| 2542 } | 2543 } |
| 2543 | 2544 |
| 2544 bool WebViewImpl::shouldDisableDesktopWorkarounds() | 2545 bool WebViewImpl::shouldDisableDesktopWorkarounds() |
| 2545 { | 2546 { |
| 2546 return true; | 2547 return true; |
| 2547 } | 2548 } |
| 2548 | 2549 |
| 2549 } // namespace blink | 2550 } // namespace blink |
| OLD | NEW |