Cleanup and refactor RootScrollerController.

third_party/WebKit/Source/core/dom/Element.cpp

 /*
  * Copyright (C) 1999 Lars Knoll (knoll@kde.org)
  *           (C) 1999 Antti Koivisto (koivisto@kde.org)
  *           (C) 2001 Peter Kelly (pmk@post.com)
  *           (C) 2001 Dirk Mueller (mueller@kde.org)
  *           (C) 2007 David Smith (catfish.man@gmail.com)
  * Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2012, 2013 Apple Inc. All rights reserved.
  *           (C) 2007 Eric Seidel (eric@webkit.org)
  *
  * This library is free software; you can redistribute it and/or
@@ skipping 516 matching lines @@
 
 void Element::callDistributeScroll(ScrollState& scrollState)
 {
     ScrollStateCallback* callback = scrollCustomizationCallbacks().getDistributeScroll(this);
 
     // TODO(bokan): Need to add tests before we allow calling custom callbacks
     // for non-touch modalities. For now, just call into the native callback but
     // allow the viewport scroll callback so we don't disable overscroll.
     // crbug.com/623079.
     bool disableCustomCallbacks = !scrollState.isDirectManipulation()
-        && !document().isViewportScrollCallback(callback);
+        && !document().rootScrollerController()->isViewportScrollCallback(callback);
 
     if (!callback || disableCustomCallbacks) {
         nativeDistributeScroll(scrollState);
         return;
     }
     if (callback->nativeScrollBehavior() != WebNativeScrollBehavior::PerformAfterNativeScroll)
         callback->handleEvent(&scrollState);
     if (callback->nativeScrollBehavior() != WebNativeScrollBehavior::DisableNativeScroll)
         nativeDistributeScroll(scrollState);
     if (callback->nativeScrollBehavior() == WebNativeScrollBehavior::PerformAfterNativeScroll)
@@ skipping 57 matching lines @@
     // or CC. http://crbug.com/625676.
     DisableCompositingQueryAsserts disabler;
 
     ScrollStateCallback* callback = scrollCustomizationCallbacks().getApplyScroll(this);
 
     // TODO(bokan): Need to add tests before we allow calling custom callbacks
     // for non-touch modalities. For now, just call into the native callback but
     // allow the viewport scroll callback so we don't disable overscroll.
     // crbug.com/623079.
     bool disableCustomCallbacks = !scrollState.isDirectManipulation()
-        && !document().isViewportScrollCallback(callback);
+        && !document().rootScrollerController()->isViewportScrollCallback(callback);
 
     if (!callback || disableCustomCallbacks) {
         nativeApplyScroll(scrollState);
         return;
     }
     if (callback->nativeScrollBehavior() != WebNativeScrollBehavior::PerformAfterNativeScroll)
         callback->handleEvent(&scrollState);
     if (callback->nativeScrollBehavior() != WebNativeScrollBehavior::DisableNativeScroll)
         nativeApplyScroll(scrollState);
     if (callback->nativeScrollBehavior() == WebNativeScrollBehavior::PerformAfterNativeScroll)
@@ skipping 3215 matching lines @@
 
 DEFINE_TRACE_WRAPPERS(Element)
 {
     if (hasRareData()) {
         visitor->traceWrappers(elementRareData());
     }
     ContainerNode::traceWrappers(visitor);
 }
 
 } // namespace blink