Chromium Code Reviews| 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 2103 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 2114 swallowClickEvent = !dispatchMouseEvent(EventTypeNames::click, click TargetNode, gestureEvent.tapCount(), fakeMouseUp); | 2114 swallowClickEvent = !dispatchMouseEvent(EventTypeNames::click, click TargetNode, gestureEvent.tapCount(), fakeMouseUp); |
| 2115 } | 2115 } |
| 2116 m_clickNode = nullptr; | 2116 m_clickNode = nullptr; |
| 2117 } | 2117 } |
| 2118 | 2118 |
| 2119 if (!swallowMouseUpEvent) | 2119 if (!swallowMouseUpEvent) |
| 2120 swallowMouseUpEvent = handleMouseReleaseEvent(MouseEventWithHitTestResul ts(fakeMouseUp, currentHitTest)); | 2120 swallowMouseUpEvent = handleMouseReleaseEvent(MouseEventWithHitTestResul ts(fakeMouseUp, currentHitTest)); |
| 2121 | 2121 |
| 2122 bool swallowed = swallowMouseDownEvent | swallowMouseUpEvent | swallowClickE vent; | 2122 bool swallowed = swallowMouseDownEvent | swallowMouseUpEvent | swallowClickE vent; |
| 2123 if (!swallowed && tappedNode && m_frame->page()) { | 2123 if (!swallowed && tappedNode && m_frame->page()) { |
| 2124 bool domTreeChanged = preDispatchDomTreeVersion != m_frame->document()-> domTreeVersion(); | 2124 Document* document = m_frame->document(); |
| 2125 bool styleChanged = preDispatchStyleVersion != m_frame->document()->styl eVersion(); | 2125 bool domTreeChanged = preDispatchDomTreeVersion != document->domTreeVers ion(); |
| 2126 bool styleChanged = preDispatchStyleVersion != document->styleVersion(); | |
| 2127 if (!styleChanged) { | |
| 2128 if (Element* documentElement = document->documentElement()) | |
| 2129 styleChanged = documentElement->childNeedsStyleInvalidation(); | |
|
rune
2015/09/14 23:06:51
The test which started failing has a sibling selec
| |
| 2130 } | |
| 2126 | 2131 |
| 2127 IntPoint tappedPositionInViewport = m_frame->page()->frameHost().visualV iewport().rootFrameToViewport(tappedPosition); | 2132 IntPoint tappedPositionInViewport = m_frame->page()->frameHost().visualV iewport().rootFrameToViewport(tappedPosition); |
| 2128 m_frame->chromeClient().showUnhandledTapUIIfNeeded(tappedPositionInViewp ort, tappedNode.get(), domTreeChanged || styleChanged); | 2133 m_frame->chromeClient().showUnhandledTapUIIfNeeded(tappedPositionInViewp ort, tappedNode.get(), domTreeChanged || styleChanged); |
| 2129 } | 2134 } |
| 2130 return swallowed; | 2135 return swallowed; |
| 2131 } | 2136 } |
| 2132 | 2137 |
| 2133 bool EventHandler::handleGestureLongPress(const GestureEventWithHitTestResults& targetedEvent) | 2138 bool EventHandler::handleGestureLongPress(const GestureEventWithHitTestResults& targetedEvent) |
| 2134 { | 2139 { |
| 2135 const PlatformGestureEvent& gestureEvent = targetedEvent.event(); | 2140 const PlatformGestureEvent& gestureEvent = targetedEvent.event(); |
| (...skipping 1900 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 4036 unsigned EventHandler::accessKeyModifiers() | 4041 unsigned EventHandler::accessKeyModifiers() |
| 4037 { | 4042 { |
| 4038 #if OS(MACOSX) | 4043 #if OS(MACOSX) |
| 4039 return PlatformEvent::CtrlKey | PlatformEvent::AltKey; | 4044 return PlatformEvent::CtrlKey | PlatformEvent::AltKey; |
| 4040 #else | 4045 #else |
| 4041 return PlatformEvent::AltKey; | 4046 return PlatformEvent::AltKey; |
| 4042 #endif | 4047 #endif |
| 4043 } | 4048 } |
| 4044 | 4049 |
| 4045 } // namespace blink | 4050 } // namespace blink |
| OLD | NEW |