[Master/Overview CL] Make PageScaleFactor work for oopif subframe.

third_party/WebKit/Source/core/frame/EventHandlerRegistry.cpp

 // Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "core/frame/EventHandlerRegistry.h"
 
 #include "core/events/EventListenerOptions.h"
 #include "core/events/EventUtil.h"
 #include "core/frame/LocalDOMWindow.h"
 #include "core/frame/LocalFrame.h"
@@ skipping 101 matching lines @@
 }
 
 void EventHandlerRegistry::updateEventHandlerInternal(
     ChangeOperation op,
     EventHandlerClass handlerClass,
     EventTarget* target) {
   bool hadHandlers = m_targets[handlerClass].size();
   bool targetSetChanged = updateEventHandlerTargets(op, handlerClass, target);
   bool hasHandlers = m_targets[handlerClass].size();
 
-  if (hadHandlers != hasHandlers)
-    notifyHasHandlersChanged(handlerClass, hasHandlers);
+  if (hadHandlers != hasHandlers) {
+    LocalFrame* frame = nullptr;
+    if (Node* node = target->toNode())
+      frame = node->document().frame();
+    notifyHasHandlersChanged(frame, handlerClass, hasHandlers);
+  }
 
   if (targetSetChanged)
     notifyDidAddOrRemoveEventHandlerTarget(handlerClass);
 }
 
 void EventHandlerRegistry::updateEventHandlerOfType(
     ChangeOperation op,
     const AtomicString& eventType,
     const AddEventListenerOptions& options,
     EventTarget* target) {
@@ skipping 69 matching lines @@
 }
 
 void EventHandlerRegistry::didRemoveAllEventHandlers(EventTarget& target) {
   for (size_t i = 0; i < EventHandlerClassCount; ++i) {
     EventHandlerClass handlerClass = static_cast<EventHandlerClass>(i);
     updateEventHandlerInternal(RemoveAll, handlerClass, &target);
   }
 }
 
 void EventHandlerRegistry::notifyHasHandlersChanged(
+    LocalFrame* frame,
     EventHandlerClass handlerClass,
     bool hasActiveHandlers) {
   switch (handlerClass) {
     case ScrollEvent:
       m_frameHost->chromeClient().setHasScrollEventHandlers(hasActiveHandlers);
       break;
     case WheelEventBlocking:
     case WheelEventPassive:
       m_frameHost->chromeClient().setEventListenerProperties(
-          WebEventListenerClass::MouseWheel,
+          frame, WebEventListenerClass::MouseWheel,
           webEventListenerProperties(hasEventHandlers(WheelEventBlocking),
                                      hasEventHandlers(WheelEventPassive)));
       break;
     case TouchStartOrMoveEventBlocking:
     case TouchStartOrMoveEventPassive:
       m_frameHost->chromeClient().setEventListenerProperties(
-          WebEventListenerClass::TouchStartOrMove,
+          frame, WebEventListenerClass::TouchStartOrMove,
           webEventListenerProperties(
               hasEventHandlers(TouchStartOrMoveEventBlocking),
               hasEventHandlers(TouchStartOrMoveEventPassive)));
       break;
     case TouchEndOrCancelEventBlocking:
     case TouchEndOrCancelEventPassive:
       m_frameHost->chromeClient().setEventListenerProperties(
-          WebEventListenerClass::TouchEndOrCancel,
+          frame, WebEventListenerClass::TouchEndOrCancel,
           webEventListenerProperties(
               hasEventHandlers(TouchEndOrCancelEventBlocking),
               hasEventHandlers(TouchEndOrCancelEventPassive)));
       break;
 #if ENABLE(ASSERT)
     case EventsForTesting:
       break;
 #endif
     default:
       ASSERT_NOT_REACHED();
@@ skipping 80 matching lines @@
         ASSERT(window->frame());
         ASSERT(window->frame()->host());
         ASSERT(window->frame()->host() == m_frameHost);
       }
     }
   }
 #endif  // ENABLE(ASSERT)
 }
 
 }  // namespace blink