| OLD | NEW |
| 1 /* | 1 /* |
| 2 * Copyright (C) 2006, 2007, 2008, 2009, 2010, 2011 Apple Inc. All rights | 2 * Copyright (C) 2006, 2007, 2008, 2009, 2010, 2011 Apple Inc. All rights |
| 3 * reserved. | 3 * reserved. |
| 4 * Copyright (C) 2006 Alexey Proskuryakov (ap@webkit.org) | 4 * Copyright (C) 2006 Alexey Proskuryakov (ap@webkit.org) |
| 5 * Copyright (C) 2012 Digia Plc. and/or its subsidiary(-ies) | 5 * Copyright (C) 2012 Digia Plc. and/or its subsidiary(-ies) |
| 6 * | 6 * |
| 7 * Redistribution and use in source and binary forms, with or without | 7 * Redistribution and use in source and binary forms, with or without |
| 8 * modification, are permitted provided that the following conditions | 8 * modification, are permitted provided that the following conditions |
| 9 * are met: | 9 * are met: |
| 10 * 1. Redistributions of source code must retain the above copyright | 10 * 1. Redistributions of source code must retain the above copyright |
| (...skipping 798 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 809 } else if (onlyUpdateScrollbars) { | 809 } else if (onlyUpdateScrollbars) { |
| 810 // Mouse events should be treated as "read-only" if we're updating only | 810 // Mouse events should be treated as "read-only" if we're updating only |
| 811 // scrollbars. This means that :hover and :active freeze in the state they | 811 // scrollbars. This means that :hover and :active freeze in the state they |
| 812 // were in, rather than updating for nodes the mouse moves while the window | 812 // were in, rather than updating for nodes the mouse moves while the window |
| 813 // is not key (which will be the case if onlyUpdateScrollbars is true). | 813 // is not key (which will be the case if onlyUpdateScrollbars is true). |
| 814 hitType |= HitTestRequest::ReadOnly; | 814 hitType |= HitTestRequest::ReadOnly; |
| 815 } | 815 } |
| 816 | 816 |
| 817 // Treat any mouse move events as readonly if the user is currently touching | 817 // Treat any mouse move events as readonly if the user is currently touching |
| 818 // the screen. | 818 // the screen. |
| 819 if (m_pointerEventManager->isAnyTouchActive()) | 819 if (m_pointerEventManager->isAnyTouchActive() && !forceLeave) |
| 820 hitType |= HitTestRequest::Active | HitTestRequest::ReadOnly; | 820 hitType |= HitTestRequest::Active | HitTestRequest::ReadOnly; |
| 821 HitTestRequest request(hitType); | 821 HitTestRequest request(hitType); |
| 822 MouseEventWithHitTestResults mev = MouseEventWithHitTestResults( | 822 MouseEventWithHitTestResults mev = MouseEventWithHitTestResults( |
| 823 mouseEvent, HitTestResult(request, LayoutPoint())); | 823 mouseEvent, HitTestResult(request, LayoutPoint())); |
| 824 | 824 |
| 825 // We don't want to do a hit-test in forceLeave scenarios because there might | 825 // We don't want to do a hit-test in forceLeave scenarios because there might |
| 826 // actually be some other frame above this one at the specified co-ordinate. | 826 // actually be some other frame above this one at the specified co-ordinate. |
| 827 // So we must force the hit-test to fail, while still clearing hover/active | 827 // So we must force the hit-test to fail, while still clearing hover/active |
| 828 // state. | 828 // state. |
| 829 if (forceLeave) { | 829 if (forceLeave) { |
| (...skipping 1264 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 2094 } | 2094 } |
| 2095 | 2095 |
| 2096 FrameHost* EventHandler::frameHost() const { | 2096 FrameHost* EventHandler::frameHost() const { |
| 2097 if (!m_frame->page()) | 2097 if (!m_frame->page()) |
| 2098 return nullptr; | 2098 return nullptr; |
| 2099 | 2099 |
| 2100 return &m_frame->page()->frameHost(); | 2100 return &m_frame->page()->frameHost(); |
| 2101 } | 2101 } |
| 2102 | 2102 |
| 2103 } // namespace blink | 2103 } // namespace blink |
| OLD | NEW |