| OLD | NEW |
| 1 // Copyright 2014 The Chromium Authors. All rights reserved. | 1 // Copyright 2014 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 | 4 |
| 5 #include "core/frame/EventHandlerRegistry.h" | 5 #include "core/frame/EventHandlerRegistry.h" |
| 6 | 6 |
| 7 #include "core/events/EventListenerOptions.h" | 7 #include "core/events/EventListenerOptions.h" |
| 8 #include "core/frame/LocalDOMWindow.h" | 8 #include "core/frame/LocalDOMWindow.h" |
| 9 #include "core/frame/LocalFrame.h" | 9 #include "core/frame/LocalFrame.h" |
| 10 #include "core/html/HTMLFrameOwnerElement.h" | 10 #include "core/html/HTMLFrameOwnerElement.h" |
| (...skipping 22 matching lines...) Expand all Loading... |
| 33 || eventType == EventTypeNames::pointerenter | 33 || eventType == EventTypeNames::pointerenter |
| 34 || eventType == EventTypeNames::pointerleave | 34 || eventType == EventTypeNames::pointerleave |
| 35 || eventType == EventTypeNames::pointermove | 35 || eventType == EventTypeNames::pointermove |
| 36 || eventType == EventTypeNames::pointerout | 36 || eventType == EventTypeNames::pointerout |
| 37 || eventType == EventTypeNames::pointerover | 37 || eventType == EventTypeNames::pointerover |
| 38 || eventType == EventTypeNames::pointerup; | 38 || eventType == EventTypeNames::pointerup; |
| 39 } | 39 } |
| 40 | 40 |
| 41 WebEventListenerProperties webEventListenerProperties(bool hasBlocking, bool has
Passive) | 41 WebEventListenerProperties webEventListenerProperties(bool hasBlocking, bool has
Passive) |
| 42 { | 42 { |
| 43 if (hasBlocking && hasPassive) |
| 44 return WebEventListenerProperties::BlockingAndPassive; |
| 43 if (hasBlocking) | 45 if (hasBlocking) |
| 44 return WebEventListenerProperties::Blocking; | 46 return WebEventListenerProperties::Blocking; |
| 45 if (hasPassive) | 47 if (hasPassive) |
| 46 return WebEventListenerProperties::Passive; | 48 return WebEventListenerProperties::Passive; |
| 47 return WebEventListenerProperties::Nothing; | 49 return WebEventListenerProperties::Nothing; |
| 48 } | 50 } |
| 49 | 51 |
| 50 } // namespace | 52 } // namespace |
| 51 | 53 |
| 52 EventHandlerRegistry::EventHandlerRegistry(FrameHost& frameHost) | 54 EventHandlerRegistry::EventHandlerRegistry(FrameHost& frameHost) |
| (...skipping 255 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 308 ASSERT(window->frame()); | 310 ASSERT(window->frame()); |
| 309 ASSERT(window->frame()->host()); | 311 ASSERT(window->frame()->host()); |
| 310 ASSERT(window->frame()->host() == m_frameHost); | 312 ASSERT(window->frame()->host() == m_frameHost); |
| 311 } | 313 } |
| 312 } | 314 } |
| 313 } | 315 } |
| 314 #endif // ENABLE(ASSERT) | 316 #endif // ENABLE(ASSERT) |
| 315 } | 317 } |
| 316 | 318 |
| 317 } // namespace blink | 319 } // namespace blink |
| OLD | NEW |