Index: third_party/WebKit/Source/core/frame/EventHandlerRegistry.cpp |
diff --git a/third_party/WebKit/Source/core/frame/EventHandlerRegistry.cpp b/third_party/WebKit/Source/core/frame/EventHandlerRegistry.cpp |
index f8cc545bd5c628645289a8bffa163fbba5cbbea7..ce6dc461e0efd79036f6d654cfe7c9635aa48c41 100644 |
--- a/third_party/WebKit/Source/core/frame/EventHandlerRegistry.cpp |
+++ b/third_party/WebKit/Source/core/frame/EventHandlerRegistry.cpp |
@@ -119,18 +119,8 @@ |
bool targetSetChanged = updateEventHandlerTargets(op, handlerClass, target); |
bool hasHandlers = m_targets[handlerClass].size(); |
- if (hadHandlers != hasHandlers) { |
- LocalFrame* frame = nullptr; |
- if (Node* node = target->toNode()) { |
- frame = node->document().frame(); |
- } else if (LocalDOMWindow* domWindow = target->toLocalDOMWindow()) { |
- frame = domWindow->frame(); |
- } else { |
- NOTREACHED() << "Unexpected target type for event handler."; |
- } |
- |
- notifyHasHandlersChanged(frame, handlerClass, hasHandlers); |
- } |
+ if (hadHandlers != hasHandlers) |
+ notifyHasHandlersChanged(handlerClass, hasHandlers); |
if (targetSetChanged) |
notifyDidAddOrRemoveEventHandlerTarget(handlerClass); |
@@ -205,25 +195,23 @@ |
} |
void EventHandlerRegistry::notifyHasHandlersChanged( |
- LocalFrame* frame, |
EventHandlerClass handlerClass, |
bool hasActiveHandlers) { |
switch (handlerClass) { |
case ScrollEvent: |
- m_frameHost->chromeClient().setHasScrollEventHandlers(frame, |
- hasActiveHandlers); |
+ m_frameHost->chromeClient().setHasScrollEventHandlers(hasActiveHandlers); |
break; |
case WheelEventBlocking: |
case WheelEventPassive: |
m_frameHost->chromeClient().setEventListenerProperties( |
- frame, WebEventListenerClass::MouseWheel, |
+ WebEventListenerClass::MouseWheel, |
webEventListenerProperties(hasEventHandlers(WheelEventBlocking), |
hasEventHandlers(WheelEventPassive))); |
break; |
case TouchStartOrMoveEventBlocking: |
case TouchStartOrMoveEventPassive: |
m_frameHost->chromeClient().setEventListenerProperties( |
- frame, WebEventListenerClass::TouchStartOrMove, |
+ WebEventListenerClass::TouchStartOrMove, |
webEventListenerProperties( |
hasEventHandlers(TouchStartOrMoveEventBlocking), |
hasEventHandlers(TouchStartOrMoveEventPassive))); |
@@ -231,7 +219,7 @@ |
case TouchEndOrCancelEventBlocking: |
case TouchEndOrCancelEventPassive: |
m_frameHost->chromeClient().setEventListenerProperties( |
- frame, WebEventListenerClass::TouchEndOrCancel, |
+ WebEventListenerClass::TouchEndOrCancel, |
webEventListenerProperties( |
hasEventHandlers(TouchEndOrCancelEventBlocking), |
hasEventHandlers(TouchEndOrCancelEventPassive))); |