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

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

Index: third_party/WebKit/Source/core/input/EventHandler.cpp
diff --git a/third_party/WebKit/Source/core/input/EventHandler.cpp b/third_party/WebKit/Source/core/input/EventHandler.cpp
index 5f643cf8b2ad4e8a6e7efcf500ca41fed94410ee..67b9ccae48a310e7a3332d5b21edd02531eb9ecf 100644
--- a/third_party/WebKit/Source/core/input/EventHandler.cpp
+++ b/third_party/WebKit/Source/core/input/EventHandler.cpp
@@ -85,6 +85,7 @@
 #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"
@@ -2518,11 +2519,10 @@ 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)
@@ -3874,7 +3874,7 @@ WebInputEventResult EventHandler::dispatchTouchEvents(const PlatformTouchEvent&
 
             // 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));
 
@@ -4176,4 +4176,12 @@ FrameHost* EventHandler::frameHost()
     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