| OLD | NEW |
| 1 /* | 1 /* |
| 2 * Copyright (C) 2006, 2007, 2008, 2009, 2010, 2011 Apple Inc. All rights reserv
ed. | 2 * Copyright (C) 2006, 2007, 2008, 2009, 2010, 2011 Apple Inc. All rights reserv
ed. |
| 3 * Copyright (C) 2006 Alexey Proskuryakov (ap@webkit.org) | 3 * Copyright (C) 2006 Alexey Proskuryakov (ap@webkit.org) |
| 4 * Copyright (C) 2012 Digia Plc. and/or its subsidiary(-ies) | 4 * Copyright (C) 2012 Digia Plc. and/or its subsidiary(-ies) |
| 5 * | 5 * |
| 6 * Redistribution and use in source and binary forms, with or without | 6 * Redistribution and use in source and binary forms, with or without |
| 7 * modification, are permitted provided that the following conditions | 7 * modification, are permitted provided that the following conditions |
| 8 * are met: | 8 * are met: |
| 9 * 1. Redistributions of source code must retain the above copyright | 9 * 1. Redistributions of source code must retain the above copyright |
| 10 * notice, this list of conditions and the following disclaimer. | 10 * notice, this list of conditions and the following disclaimer. |
| (...skipping 1888 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1899 delta.setHeight(delta.height() > 0 ? 1 : -1); | 1899 delta.setHeight(delta.height() > 0 ? 1 : -1); |
| 1900 } | 1900 } |
| 1901 | 1901 |
| 1902 // FIXME: enable scroll customization in this case. See crbug.com/410974. | 1902 // FIXME: enable scroll customization in this case. See crbug.com/410974. |
| 1903 bool consumed = false; | 1903 bool consumed = false; |
| 1904 ScrollResult result = physicalScroll(granularity, delta, startNode, &node, &
consumed); | 1904 ScrollResult result = physicalScroll(granularity, delta, startNode, &node, &
consumed); |
| 1905 | 1905 |
| 1906 if (consumed) | 1906 if (consumed) |
| 1907 wheelEvent->setDefaultHandled(); | 1907 wheelEvent->setDefaultHandled(); |
| 1908 | 1908 |
| 1909 if (m_frame->isMainFrame() && m_frame->settings() && m_frame->settings()->re
portWheelOverscroll()) | 1909 if (m_frame->isMainFrame()) |
| 1910 handleOverscroll(result); | 1910 handleOverscroll(result); |
| 1911 } | 1911 } |
| 1912 | 1912 |
| 1913 WebInputEventResult EventHandler::handleGestureShowPress() | 1913 WebInputEventResult EventHandler::handleGestureShowPress() |
| 1914 { | 1914 { |
| 1915 m_lastShowPressTimestamp = WTF::monotonicallyIncreasingTime(); | 1915 m_lastShowPressTimestamp = WTF::monotonicallyIncreasingTime(); |
| 1916 | 1916 |
| 1917 FrameView* view = m_frame->view(); | 1917 FrameView* view = m_frame->view(); |
| 1918 if (!view) | 1918 if (!view) |
| 1919 return WebInputEventResult::NotHandled; | 1919 return WebInputEventResult::NotHandled; |
| (...skipping 2086 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 4006 PlatformEvent::Modifiers EventHandler::accessKeyModifiers() | 4006 PlatformEvent::Modifiers EventHandler::accessKeyModifiers() |
| 4007 { | 4007 { |
| 4008 #if OS(MACOSX) | 4008 #if OS(MACOSX) |
| 4009 return static_cast<PlatformEvent::Modifiers>(PlatformEvent::CtrlKey | Platfo
rmEvent::AltKey); | 4009 return static_cast<PlatformEvent::Modifiers>(PlatformEvent::CtrlKey | Platfo
rmEvent::AltKey); |
| 4010 #else | 4010 #else |
| 4011 return PlatformEvent::AltKey; | 4011 return PlatformEvent::AltKey; |
| 4012 #endif | 4012 #endif |
| 4013 } | 4013 } |
| 4014 | 4014 |
| 4015 } // namespace blink | 4015 } // namespace blink |
| OLD | NEW |