| 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 1941 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1952 if (m_gestureAnimation) { | 1952 if (m_gestureAnimation) { |
| 1953 if (m_gestureAnimation->animate(lastFrameTimeMonotonic)) | 1953 if (m_gestureAnimation->animate(lastFrameTimeMonotonic)) |
| 1954 mainFrameImpl()->frameWidget()->scheduleAnimation(); | 1954 mainFrameImpl()->frameWidget()->scheduleAnimation(); |
| 1955 else { | 1955 else { |
| 1956 DCHECK_NE(m_flingSourceDevice, WebGestureDeviceUninitialized); | 1956 DCHECK_NE(m_flingSourceDevice, WebGestureDeviceUninitialized); |
| 1957 WebGestureDevice lastFlingSourceDevice = m_flingSourceDevice; | 1957 WebGestureDevice lastFlingSourceDevice = m_flingSourceDevice; |
| 1958 endActiveFlingAnimation(); | 1958 endActiveFlingAnimation(); |
| 1959 | 1959 |
| 1960 PlatformGestureEvent endScrollEvent( | 1960 PlatformGestureEvent endScrollEvent( |
| 1961 PlatformEvent::GestureScrollEnd, m_positionOnFlingStart, | 1961 PlatformEvent::GestureScrollEnd, m_positionOnFlingStart, |
| 1962 m_globalPositionOnFlingStart, IntSize(), 0, | 1962 m_globalPositionOnFlingStart, IntSize(), TimeTicks(), |
| 1963 PlatformEvent::NoModifiers, | 1963 PlatformEvent::NoModifiers, |
| 1964 lastFlingSourceDevice == WebGestureDeviceTouchpad | 1964 lastFlingSourceDevice == WebGestureDeviceTouchpad |
| 1965 ? PlatformGestureSourceTouchpad | 1965 ? PlatformGestureSourceTouchpad |
| 1966 : PlatformGestureSourceTouchscreen); | 1966 : PlatformGestureSourceTouchscreen); |
| 1967 endScrollEvent.setScrollGestureData(0, 0, ScrollByPrecisePixel, 0, 0, | 1967 endScrollEvent.setScrollGestureData(0, 0, ScrollByPrecisePixel, 0, 0, |
| 1968 ScrollInertialPhaseMomentum, false, | 1968 ScrollInertialPhaseMomentum, false, |
| 1969 -1 /* null plugin id */); | 1969 -1 /* null plugin id */); |
| 1970 | 1970 |
| 1971 mainFrameImpl()->frame()->eventHandler().handleGestureScrollEnd( | 1971 mainFrameImpl()->frame()->eventHandler().handleGestureScrollEnd( |
| 1972 endScrollEvent); | 1972 endScrollEvent); |
| (...skipping 2241 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 4214 if (focusedFrame->localFrameRoot() != mainFrameImpl()->frame()) | 4214 if (focusedFrame->localFrameRoot() != mainFrameImpl()->frame()) |
| 4215 return nullptr; | 4215 return nullptr; |
| 4216 return focusedFrame; | 4216 return focusedFrame; |
| 4217 } | 4217 } |
| 4218 | 4218 |
| 4219 LocalFrame* WebViewImpl::focusedLocalFrameAvailableForIme() const { | 4219 LocalFrame* WebViewImpl::focusedLocalFrameAvailableForIme() const { |
| 4220 return m_imeAcceptEvents ? focusedLocalFrameInWidget() : nullptr; | 4220 return m_imeAcceptEvents ? focusedLocalFrameInWidget() : nullptr; |
| 4221 } | 4221 } |
| 4222 | 4222 |
| 4223 } // namespace blink | 4223 } // namespace blink |
| OLD | NEW |