Move ScrollbarManager from core to platform and use as Scrollbar parent

third_party/WebKit/Source/core/frame/FrameView.h

 /*
    Copyright (C) 1997 Martin Jones (mjones@kde.org)
              (C) 1998 Waldo Bastian (bastian@kde.org)
              (C) 1998, 1999 Torben Weis (weis@kde.org)
              (C) 1999 Lars Knoll (knoll@kde.org)
              (C) 1999 Antti Koivisto (koivisto@kde.org)
    Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009 Apple Inc. All rights
    reserved.
 
    This library is free software; you can redistribute it and/or
@@ skipping 21 matching lines @@
 #include "core/frame/FrameOrPlugin.h"
 #include "core/frame/FrameViewAutoSizeInfo.h"
 #include "core/frame/LayoutSubtreeRootList.h"
 #include "core/frame/RootFrameViewport.h"
 #include "core/layout/MapCoordinatesFlags.h"
 #include "core/layout/ScrollAnchor.h"
 #include "core/paint/FirstMeaningfulPaintDetector.h"
 #include "core/paint/ObjectPaintProperties.h"
 #include "core/paint/PaintInvalidationCapableScrollableArea.h"
 #include "core/paint/PaintPhase.h"
-#include "core/paint/ScrollbarManager.h"
 #include "core/plugins/PluginView.h"
 #include "platform/FrameViewBase.h"
 #include "platform/RuntimeEnabledFeatures.h"
 #include "platform/animation/CompositorAnimationHost.h"
 #include "platform/animation/CompositorAnimationTimeline.h"
 #include "platform/geometry/IntRect.h"
 #include "platform/geometry/LayoutRect.h"
 #include "platform/graphics/Color.h"
 #include "platform/graphics/CompositorElementId.h"
 #include "platform/graphics/GraphicsLayerClient.h"
 #include "platform/scroll/ScrollTypes.h"
 #include "platform/scroll/Scrollbar.h"
+#include "platform/scroll/ScrollbarManager.h"
 #include "platform/wtf/Allocator.h"
 #include "platform/wtf/AutoReset.h"
 #include "platform/wtf/Forward.h"
 #include "platform/wtf/HashSet.h"
 #include "platform/wtf/ListHashSet.h"
 #include "platform/wtf/text/WTFString.h"
 #include "public/platform/ShapeProperties.h"
 #include "public/platform/WebDisplayMode.h"
 #include "public/platform/WebRect.h"
 
@@ skipping 31 matching lines @@
 class ScrollingCoordinator;
 class TracedValue;
 class TransformState;
 struct AnnotatedRegionValue;
 struct CompositedSelection;
 
 typedef unsigned long long DOMTimeStamp;
 
 class CORE_EXPORT FrameView final
     : public FrameViewBase,
+      public ScrollbarManager,
       public FrameOrPlugin,
       public PaintInvalidationCapableScrollableArea {
   USING_GARBAGE_COLLECTED_MIXIN(FrameView);
 
   friend class PaintControllerPaintTestBase;
   friend class Internals;
   friend class LayoutPart;  // for invalidateTreeIfNeeded
 
  public:
   static FrameView* Create(LocalFrame&);
@@ skipping 362 matching lines @@
   void RemoveChild(FrameViewBase*);
   void AddChild(FrameViewBase*);
   const ChildrenSet* Children() const { return &children_; }
   void RemovePlugin(PluginView*);
   void AddPlugin(PluginView*);
   const PluginsSet* Plugins() const { return &plugins_; }
   void RemoveScrollbar(Scrollbar*);
   void AddScrollbar(Scrollbar*);
   const ScrollbarsSet* Scrollbars() const { return &scrollbars_; }
 
-  // If the scroll view does not use a native widget, then it will have
-  // cross-platform Scrollbars. These functions can be used to obtain those
-  // scrollbars.
-  Scrollbar* HorizontalScrollbar() const override {
-    return scrollbar_manager_.HorizontalScrollbar();
-  }
-  Scrollbar* VerticalScrollbar() const override {
-    return scrollbar_manager_.VerticalScrollbar();
-  }
   LayoutScrollbarPart* ScrollCorner() const override { return scroll_corner_; }
 
   void PositionScrollbarLayers();
 
   // Functions for setting and retrieving the scrolling mode in each axis
   // (horizontal/vertical). The mode has values of AlwaysOff, AlwaysOn, and
   // Auto. AlwaysOff means never show a scrollbar, AlwaysOn means always show a
   // scrollbar.  Auto means show a scrollbar only when one is needed.
   // Note that for platforms with native widgets, these modes are considered
   // advisory. In other words the underlying native widget may choose not to
@@ skipping 28 matching lines @@
 
   void SetScrollingModesLock(bool lock = true) {
     horizontal_scrollbar_lock_ = vertical_scrollbar_lock_ = lock;
   }
 
   bool CanHaveScrollbars() const {
     return HorizontalScrollbarMode() != kScrollbarAlwaysOff ||
            VerticalScrollbarMode() != kScrollbarAlwaysOff;
   }
 
+  void SetHasHorizontalScrollbar(bool) override;
+  void SetHasVerticalScrollbar(bool) override;
+  void DestroyScrollbar(ScrollbarOrientation) override;
+
   // The visible content rect has a location that is the scrolled offset of
   // the document. The width and height are the layout viewport width and
   // height. By default the scrollbars themselves are excluded from this
   // rectangle, but an optional boolean argument allows them to be included.
   IntRect VisibleContentRect(
       IncludeScrollbarsInRect = kExcludeScrollbars) const override;
   IntSize VisibleContentSize(
       IncludeScrollbarsInRect = kExcludeScrollbars) const;
 
   // Clips the provided rect to the visible content area. For this purpose, we
@@ skipping 313 matching lines @@
         : scope_(&view->in_update_scrollbars_, true) {}
 
    private:
     AutoReset<bool> scope_;
   };
 
   // Only for LayoutPart to traverse into sub frames during paint invalidation.
   void InvalidateTreeIfNeeded(const PaintInvalidationState&);
 
  private:
-  explicit FrameView(LocalFrame&);
-  class ScrollbarManager : public blink::ScrollbarManager {
-    DISALLOW_NEW();
-
-    // Helper class to manage the life cycle of Scrollbar objects.
-   public:
-    ScrollbarManager(FrameView& scroller) : blink::ScrollbarManager(scroller) {}
-
-    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;
-  };
-
   void UpdateScrollOffset(const ScrollOffset&, ScrollType) override;
 
   void UpdateScrollbarEnabledState();
 
   void DispatchEventsForPrintingOnAllFrames();
 
   void SetupPrintContext();
   void ClearPrintContext();
 
   void UpdateLifecyclePhasesInternal(
@@ skipping 269 matching lines @@
 
   // This is set on the local root frame view only.
   DocumentLifecycle::LifecycleState
       current_update_lifecycle_phases_target_state_;
 
   ScrollAnchor scroll_anchor_;
   using AnchoringAdjustmentQueue =
       HeapLinkedHashSet<WeakMember<ScrollableArea>>;
   AnchoringAdjustmentQueue anchoring_adjustment_queue_;
 
-  // ScrollbarManager holds the Scrollbar instances.
-  ScrollbarManager scrollbar_manager_;
-
   bool needs_scrollbars_update_;
   bool suppress_adjust_view_size_;
   bool allows_layout_invalidation_after_layout_clean_;
 
   Member<ElementVisibilityObserver> visibility_observer_;
 
   IntRect remote_viewport_intersection_;
 
   // For testing.
   struct ObjectPaintInvalidation {
@@ skipping 50 matching lines @@
                   frameViewBase.IsFrameView());
 DEFINE_TYPE_CASTS(FrameView,
                   ScrollableArea,
                   scrollableArea,
                   scrollableArea->IsFrameView(),
                   scrollableArea.IsFrameView());
 
 }  // namespace blink
 
 #endif  // FrameView_h