Rename Document::ownerElement to localOwner and fix main frame checks.

third_party/WebKit/Source/core/input/EventHandler.cpp

 /*
  * Copyright (C) 2006, 2007, 2008, 2009, 2010, 2011 Apple Inc. All rights reserved.
  * Copyright (C) 2006 Alexey Proskuryakov (ap@webkit.org)
  * Copyright (C) 2012 Digia Plc. and/or its subsidiary(-ies)
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
@@ skipping 67 matching lines @@
 #include "core/page/AutoscrollController.h"
 #include "core/page/ChromeClient.h"
 #include "core/page/DragController.h"
 #include "core/page/DragState.h"
 #include "core/page/FocusController.h"
 #include "core/page/FrameTree.h"
 #include "core/page/Page.h"
 #include "core/page/SpatialNavigation.h"
 #include "core/page/TouchAdjustment.h"
 #include "core/page/scrolling/OverscrollController.h"
+#include "core/page/scrolling/RootScroller.h"
 #include "core/page/scrolling/ScrollState.h"
 #include "core/paint/PaintLayer.h"
 #include "core/style/ComputedStyle.h"
 #include "core/svg/SVGDocumentExtensions.h"
 #include "platform/Histogram.h"
 #include "platform/PlatformGestureEvent.h"
 #include "platform/PlatformKeyboardEvent.h"
 #include "platform/PlatformTouchEvent.h"
 #include "platform/PlatformWheelEvent.h"
 #include "platform/RuntimeEnabledFeatures.h"
@@ skipping 2413 matching lines @@
         if (m_frame->isMainFrame())
             m_frame->host()->topControls().scrollBegin();
     }
     return WebInputEventResult::HandledSystem;
 }
 
 bool EventHandler::isRootScroller(const Node& node) const
 {
     // The root scroller is the one Element on the page designated to perform
     // "viewport actions" like top controls movement and overscroll glow.
-
-    if (!node.isElementNode() || node.document().ownerElement())
+    if (!node.isElementNode() || !frameHost() || !frameHost()->rootScroller())
         return false;
 
-    return node.document().rootScroller() == toElement(&node);
+    return frameHost()->rootScroller()->get() == toElement(&node);
 }
 
 WebInputEventResult EventHandler::handleGestureScrollUpdate(const PlatformGestureEvent& gestureEvent)
 {
     ASSERT(gestureEvent.type() == PlatformEvent::GestureScrollUpdate);
 
     // Negate the deltas since the gesture event stores finger movement and
     // scrolling occurs in the direction opposite the finger's movement
     // direction. e.g. Finger moving up has negative event delta but causes the
     // page to scroll down causing positive scroll delta.
@@ skipping 1331 matching lines @@
             EventTarget* touchEventTarget = eventTarget;
             TouchEvent* touchEvent = TouchEvent::create(
                 touches, touchesByTarget.get(touchEventTarget), changedTouches[state].m_touches.get(),
                 eventName, touchEventTarget->toNode()->document().domWindow(),
                 event.getModifiers(), event.cancelable(), event.causesScrollingIfUncanceled(), event.timestamp());
 
             DispatchEventResult domDispatchResult = touchEventTarget->dispatchEvent(touchEvent);
 
             // Only report for top level documents with a single touch on
             // touch-start or the first touch-move.
-            if (touchStartOrFirstTouchMove && touchInfos.size() == 1 && event.cancelable() && !m_frame->document()->ownerElement()) {
+            if (touchStartOrFirstTouchMove && touchInfos.size() == 1 && event.cancelable() && m_frame->isMainFrame()) {
                 DEFINE_STATIC_LOCAL(EnumerationHistogram, rootDocumentListenerHistogram, ("Event.Touch.TargetAndDispatchResult", TouchTargetAndDispatchResultTypeMax));
                 rootDocumentListenerHistogram.count(toTouchTargetHistogramValue(eventTarget, domDispatchResult));
 
                 // Count the handled touch starts and first touch moves before and after the page is fully loaded respectively.
                 if (m_frame->document()->isLoadCompleted()) {
                     DEFINE_STATIC_LOCAL(EnumerationHistogram, touchDispositionsAfterPageLoadHistogram, ("Event.Touch.TouchDispositionsAfterPageLoad", TouchEventDispatchResultTypeMax));
                     touchDispositionsAfterPageLoadHistogram.count((domDispatchResult != DispatchEventResult::NotCanceled) ? HandledTouches : UnhandledTouches);
                 } else {
                     DEFINE_STATIC_LOCAL(EnumerationHistogram, touchDispositionsBeforePageLoadHistogram, ("Event.Touch.TouchDispositionsBeforePageLoad", TouchEventDispatchResultTypeMax));
                     touchDispositionsBeforePageLoadHistogram.count((domDispatchResult != DispatchEventResult::NotCanceled) ? HandledTouches : UnhandledTouches);
@@ skipping 281 matching lines @@
 }
 
 FrameHost* EventHandler::frameHost()
 {
     if (!m_frame->page())
         return nullptr;
 
     return &m_frame->page()->frameHost();
 }
 
+const FrameHost* EventHandler::frameHost() const
+{
+    if (!m_frame->page())
+        return nullptr;
+
+    return &m_frame->page()->frameHost();

[dcheng, 2016/05/03 18:47:40]

We don't really go for const-correctness elsewhere. I'm honestly ok with just
marking EventHandler::frameHost() const and just returning a non-const pointer.

[bokan, 2016/05/03 21:41:04]

IMO, that's something we should be working towards fixing. We'll likely never
get the big classes to total const-correctness but this makes reading and
writing new code easier. Unless you're strongly opposed I'd like to keep this. I
added a little casting magic to remove duplication in the latest patch.

[dcheng, 2016/05/07 06:09:07]

Do we have any instances of this pattern anywhere else in Blink? If there's some
classes trying to be const-correct, then I agree it makes sense. Otherwise, this
code will just look out of place and be inconsistent with everywhere else.

+}
+
 } // namespace blink