Fix runtime setting forcing passive event listeners to scroll blocking events.

third_party/WebKit/Source/core/events/EventTarget.cpp

 /*
  * Copyright (C) 1999 Lars Knoll (knoll@kde.org)
  *           (C) 1999 Antti Koivisto (koivisto@kde.org)
  *           (C) 2001 Dirk Mueller (mueller@kde.org)
  * Copyright (C) 2004, 2005, 2006, 2007 Apple Inc. All rights reserved.
  * Copyright (C) 2006 Alexey Proskuryakov (ap@webkit.org)
  *           (C) 2007, 2008 Nikolas Zimmermann <zimmermann@kde.org>
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
@@ skipping 47 matching lines @@
 Settings* windowSettings(LocalDOMWindow* executingWindow)
 {
     if (executingWindow) {
         if (LocalFrame* frame = executingWindow->frame()) {
             return frame->settings();
         }
     }
     return nullptr;
 }
 
+bool isScrollBlockingEvent(const AtomicString& eventType)
+{
+    return eventType == EventTypeNames::touchstart
+        || eventType == EventTypeNames::touchmove
+        || eventType == EventTypeNames::mousewheel
+        || eventType == EventTypeNames::wheel;
+}
+
 double blockedEventsWarningThreshold(const ExecutionContext* context, const Event* event)
 {
     if (!event->cancelable())
         return 0.0;
-    const AtomicString& eventType = event->type();
-    if (eventType != EventTypeNames::touchstart
-        && eventType != EventTypeNames::touchmove
-        && eventType != EventTypeNames::touchend
-        && eventType != EventTypeNames::mousewheel
-        && eventType != EventTypeNames::wheel) {
+    if (!isScrollBlockingEvent(event->type()))
         return 0.0;
-    }
 
     if (!context->isDocument())
         return 0.0;
     FrameHost* frameHost = toDocument(context)->frameHost();
     if (!frameHost)
         return 0.0;
     return frameHost->settings().blockedMainThreadEventsWarningThreshold();
 }
 
 void reportBlockedEvent(ExecutionContext* context, const Event* event, RegisteredEventListener* registeredListener, double delayedSeconds)
@@ skipping 85 matching lines @@
     return nullptr;
 }
 
 inline LocalDOMWindow* EventTarget::executingWindow()
 {
     if (ExecutionContext* context = getExecutionContext())
         return context->executingWindow();
     return nullptr;
 }
 
-void EventTarget::setDefaultAddEventListenerOptions(AddEventListenerOptions& options)
+void EventTarget::setDefaultAddEventListenerOptions(const AtomicString& eventType, AddEventListenerOptions& options)
 {
+    if (!isScrollBlockingEvent(eventType)) {
+        if (!options.hasPassive())
+            options.setPassive(false);
+        return;
+    }
+
     if (Settings* settings = windowSettings(executingWindow())) {
         switch (settings->passiveListenerDefault()) {
         case PassiveListenerDefault::False:
             if (!options.hasPassive())
                 options.setPassive(false);
             break;
         case PassiveListenerDefault::True:
             if (!options.hasPassive())
                 options.setPassive(true);
             break;
@@ skipping 15 matching lines @@
     } else {
         if (!options.hasPassive())
             options.setPassive(false);
     }
 }
 
 bool EventTarget::addEventListener(const AtomicString& eventType, EventListener* listener, bool useCapture)
 {
     AddEventListenerOptions options;
     options.setCapture(useCapture);
-    setDefaultAddEventListenerOptions(options);
+    setDefaultAddEventListenerOptions(eventType, options);
     return addEventListenerInternal(eventType, listener, options);
 }
 
 bool EventTarget::addEventListener(const AtomicString& eventType, EventListener* listener, const AddEventListenerOptionsOrBoolean& optionsUnion)
 {
     if (optionsUnion.isBoolean())
         return addEventListener(eventType, listener, optionsUnion.getAsBoolean());
     if (optionsUnion.isAddEventListenerOptions()) {
         AddEventListenerOptions options = optionsUnion.getAsAddEventListenerOptions();
         return addEventListener(eventType, listener, options);
     }
     return addEventListener(eventType, listener);
 }
 
 bool EventTarget::addEventListener(const AtomicString& eventType, EventListener* listener, AddEventListenerOptions& options)
 {
-    setDefaultAddEventListenerOptions(options);
+    setDefaultAddEventListenerOptions(eventType, options);
     return addEventListenerInternal(eventType, listener, options);
 }
 
 bool EventTarget::addEventListenerInternal(const AtomicString& eventType, EventListener* listener, const AddEventListenerOptions& options)
 {
     if (!listener)
         return false;
 
     V8DOMActivityLogger* activityLogger = V8DOMActivityLogger::currentActivityLoggerIfIsolatedWorld();
     if (activityLogger) {
@@ skipping 383 matching lines @@
     // they have one less listener to invoke.
     if (d->firingEventIterators) {
         for (size_t i = 0; i < d->firingEventIterators->size(); ++i) {
             d->firingEventIterators->at(i).iterator = 0;
             d->firingEventIterators->at(i).end = 0;
         }
     }
 }
 
 } // namespace blink