| Index: third_party/WebKit/Source/core/frame/LocalFrameView.h
|
| diff --git a/third_party/WebKit/Source/core/frame/LocalFrameView.h b/third_party/WebKit/Source/core/frame/LocalFrameView.h
|
| index 494ecb2d67ab659f74fffd49f702599216d0e489..f7fe78e70102a381e0432a9f5617bccac516b999 100644
|
| --- a/third_party/WebKit/Source/core/frame/LocalFrameView.h
|
| +++ b/third_party/WebKit/Source/core/frame/LocalFrameView.h
|
| @@ -68,7 +68,6 @@ namespace blink {
|
| class AXObjectCache;
|
| class Cursor;
|
| class DocumentLifecycle;
|
| -class Element;
|
| class ElementVisibilityObserver;
|
| class Frame;
|
| class FloatSize;
|
| @@ -420,9 +419,6 @@ class CORE_EXPORT LocalFrameView final
|
|
|
| bool IsActive() const override;
|
|
|
| - // Override scrollbar notifications to update the AXObject cache.
|
| - void DidAddScrollbar(Scrollbar&, ScrollbarOrientation) override;
|
| -
|
| // FIXME: This should probably be renamed as the 'inSubtreeLayout' parameter
|
| // passed around the LocalFrameView layout methods can be true while this
|
| // returns false.
|
| @@ -897,13 +893,6 @@ class CORE_EXPORT LocalFrameView final
|
|
|
| void SetHasHorizontalScrollbar(bool has_scrollbar) override;
|
| void SetHasVerticalScrollbar(bool has_scrollbar) override;
|
| -
|
| - // TODO(ymalik): This should be hidden and all calls should go through
|
| - // setHas*Scrollbar functions above.
|
| - Scrollbar* CreateScrollbar(ScrollbarOrientation) override;
|
| -
|
| - protected:
|
| - void DestroyScrollbar(ScrollbarOrientation) override;
|
| };
|
|
|
| LocalFrameView* ParentFrameView() const;
|
| @@ -958,6 +947,8 @@ class CORE_EXPORT LocalFrameView final
|
| void ContentsResized() override;
|
| void ScrollbarExistenceMaybeChanged();
|
|
|
| + LayoutObject* LayoutObjectForScrollbarStyle() const override;
|
| +
|
| // Methods to do point conversion via layoutObjects, in order to take
|
| // transforms into account.
|
| IntRect ConvertToContainingEmbeddedContentView(const IntRect&) const;
|
| @@ -993,11 +984,6 @@ class CORE_EXPORT LocalFrameView final
|
| // when visible.
|
| bool HasOverlayScrollbars() const;
|
|
|
| - // Returns true if the frame should use custom scrollbars. If true, sets
|
| - // customScrollbarElement to the element that supplies the scrollbar's style
|
| - // information.
|
| - bool ShouldUseCustomScrollbars(Element*& custom_scrollbar_element) const;
|
| -
|
| // Returns true if a scrollbar needs to go from native -> custom or vice
|
| // versa, or if a custom scrollbar has a stale owner.
|
| bool NeedsScrollbarReconstruction() const;
|
|
|