| Index: third_party/WebKit/Source/core/dom/Document.h
|
| diff --git a/third_party/WebKit/Source/core/dom/Document.h b/third_party/WebKit/Source/core/dom/Document.h
|
| index 3c25dd573c587edbb4e252bb431b8c1e80a1e657..0c9e668dcaa368e8bd9b8cca20b33139beae76c9 100644
|
| --- a/third_party/WebKit/Source/core/dom/Document.h
|
| +++ b/third_party/WebKit/Source/core/dom/Document.h
|
| @@ -150,6 +150,7 @@ class ScriptRunner;
|
| class ScriptableDocumentParser;
|
| class ScriptedAnimationController;
|
| class ScriptedIdleTaskController;
|
| +class ScrollStateCallback;
|
| class SecurityOrigin;
|
| class SegmentedString;
|
| class SelectorQueryCache;
|
| @@ -1083,7 +1084,11 @@ public:
|
|
|
| Element* rootScroller() const;
|
| void setRootScroller(Element*, ExceptionState&);
|
| - bool isEffectiveRootScroller(const Element&) const;
|
| + const Element* effectiveRootScroller() const;
|
| +
|
| + // TODO(bokan): Temporarily added to allow ScrollCustomization to properly
|
| + // opt out for wheel scrolls. crbug.com/623079.
|
| + bool isViewportScrollCallback(const ScrollStateCallback*);
|
|
|
| bool isInMainFrame() const;
|
|
|
|
|