Commit b53697ba authored by Sundoo Kim's avatar Sundoo Kim Committed by Commit Bot

Replace DISALLOW_COPY_AND_ASSIGN with =delete in blink/../scroll

Explicitly remove the copy constructor and assignment operator with
the delete keyword.

Bug: 1010217
Change-Id: I209ebbcb89a616c91284c170ef251bbb4fd3091e
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2371382Reviewed-by: default avatarKoji Ishii <kojii@chromium.org>
Commit-Queue: Koji Ishii <kojii@chromium.org>
Cr-Commit-Position: refs/heads/master@{#801293}
parent 23f35de4
...@@ -25,10 +25,11 @@ class CompositorScrollOffsetAnimationCurve; ...@@ -25,10 +25,11 @@ class CompositorScrollOffsetAnimationCurve;
// ScrollAnimatorMac. // ScrollAnimatorMac.
class ProgrammaticScrollAnimator : public ScrollAnimatorCompositorCoordinator { class ProgrammaticScrollAnimator : public ScrollAnimatorCompositorCoordinator {
DISALLOW_COPY_AND_ASSIGN(ProgrammaticScrollAnimator);
public: public:
explicit ProgrammaticScrollAnimator(ScrollableArea*); explicit ProgrammaticScrollAnimator(ScrollableArea*);
ProgrammaticScrollAnimator(const ProgrammaticScrollAnimator&) = delete;
ProgrammaticScrollAnimator& operator=(const ProgrammaticScrollAnimator&) =
delete;
~ProgrammaticScrollAnimator() override; ~ProgrammaticScrollAnimator() override;
void ScrollToOffsetWithoutAnimation(const ScrollOffset&, void ScrollToOffsetWithoutAnimation(const ScrollOffset&,
......
...@@ -34,7 +34,6 @@ class CORE_EXPORT ScrollAnimatorCompositorCoordinator ...@@ -34,7 +34,6 @@ class CORE_EXPORT ScrollAnimatorCompositorCoordinator
: public GarbageCollected<ScrollAnimatorCompositorCoordinator>, : public GarbageCollected<ScrollAnimatorCompositorCoordinator>,
private CompositorAnimationClient, private CompositorAnimationClient,
CompositorAnimationDelegate { CompositorAnimationDelegate {
DISALLOW_COPY_AND_ASSIGN(ScrollAnimatorCompositorCoordinator);
USING_PRE_FINALIZER(ScrollAnimatorCompositorCoordinator, Dispose); USING_PRE_FINALIZER(ScrollAnimatorCompositorCoordinator, Dispose);
public: public:
...@@ -82,6 +81,10 @@ class CORE_EXPORT ScrollAnimatorCompositorCoordinator ...@@ -82,6 +81,10 @@ class CORE_EXPORT ScrollAnimatorCompositorCoordinator
kRunningOnCompositorButNeedsAdjustment, kRunningOnCompositorButNeedsAdjustment,
}; };
ScrollAnimatorCompositorCoordinator(
const ScrollAnimatorCompositorCoordinator&) = delete;
ScrollAnimatorCompositorCoordinator& operator=(
const ScrollAnimatorCompositorCoordinator&) = delete;
~ScrollAnimatorCompositorCoordinator() override; ~ScrollAnimatorCompositorCoordinator() override;
bool HasAnimationThatRequiresService() const; bool HasAnimationThatRequiresService() const;
......
...@@ -74,12 +74,14 @@ enum IncludeScrollbarsInRect { ...@@ -74,12 +74,14 @@ enum IncludeScrollbarsInRect {
}; };
class CORE_EXPORT ScrollableArea : public GarbageCollectedMixin { class CORE_EXPORT ScrollableArea : public GarbageCollectedMixin {
DISALLOW_COPY_AND_ASSIGN(ScrollableArea);
USING_PRE_FINALIZER(ScrollableArea, Dispose); USING_PRE_FINALIZER(ScrollableArea, Dispose);
public: public:
using ScrollCallback = base::OnceClosure; using ScrollCallback = base::OnceClosure;
ScrollableArea(const ScrollableArea&) = delete;
ScrollableArea& operator=(const ScrollableArea&) = delete;
static int PixelsPerLineStep(LocalFrame*); static int PixelsPerLineStep(LocalFrame*);
static float MinFractionToStepWhenPaging(); static float MinFractionToStepWhenPaging();
int MaxOverlapBetweenPages() const; int MaxOverlapBetweenPages() const;
......
...@@ -5,7 +5,6 @@ ...@@ -5,7 +5,6 @@
#ifndef THIRD_PARTY_BLINK_RENDERER_CORE_SCROLL_SCROLLBAR_LAYER_DELEGATE_H_ #ifndef THIRD_PARTY_BLINK_RENDERER_CORE_SCROLL_SCROLLBAR_LAYER_DELEGATE_H_
#define THIRD_PARTY_BLINK_RENDERER_CORE_SCROLL_SCROLLBAR_LAYER_DELEGATE_H_ #define THIRD_PARTY_BLINK_RENDERER_CORE_SCROLL_SCROLLBAR_LAYER_DELEGATE_H_
#include "base/macros.h"
#include "cc/input/scrollbar.h" #include "cc/input/scrollbar.h"
#include "third_party/blink/renderer/core/core_export.h" #include "third_party/blink/renderer/core/core_export.h"
#include "third_party/blink/renderer/platform/heap/persistent.h" #include "third_party/blink/renderer/platform/heap/persistent.h"
...@@ -20,6 +19,8 @@ class CORE_EXPORT ScrollbarLayerDelegate : public cc::Scrollbar { ...@@ -20,6 +19,8 @@ class CORE_EXPORT ScrollbarLayerDelegate : public cc::Scrollbar {
public: public:
ScrollbarLayerDelegate(blink::Scrollbar& scrollbar, ScrollbarLayerDelegate(blink::Scrollbar& scrollbar,
float device_scale_factor); float device_scale_factor);
ScrollbarLayerDelegate(const ScrollbarLayerDelegate&) = delete;
ScrollbarLayerDelegate& operator=(const ScrollbarLayerDelegate&) = delete;
// cc::Scrollbar implementation. // cc::Scrollbar implementation.
bool IsSame(const cc::Scrollbar& other) const override; bool IsSame(const cc::Scrollbar& other) const override;
...@@ -55,8 +56,6 @@ class CORE_EXPORT ScrollbarLayerDelegate : public cc::Scrollbar { ...@@ -55,8 +56,6 @@ class CORE_EXPORT ScrollbarLayerDelegate : public cc::Scrollbar {
Persistent<blink::Scrollbar> scrollbar_; Persistent<blink::Scrollbar> scrollbar_;
float device_scale_factor_; float device_scale_factor_;
DISALLOW_COPY_AND_ASSIGN(ScrollbarLayerDelegate);
}; };
} // namespace blink } // namespace blink
......
...@@ -39,11 +39,12 @@ class GraphicsContext; ...@@ -39,11 +39,12 @@ class GraphicsContext;
class WebMouseEvent; class WebMouseEvent;
class CORE_EXPORT ScrollbarTheme { class CORE_EXPORT ScrollbarTheme {
DISALLOW_COPY_AND_ASSIGN(ScrollbarTheme);
USING_FAST_MALLOC(ScrollbarTheme); USING_FAST_MALLOC(ScrollbarTheme);
public: public:
ScrollbarTheme() = default; ScrollbarTheme() = default;
ScrollbarTheme(const ScrollbarTheme&) = delete;
ScrollbarTheme& operator=(const ScrollbarTheme&) = delete;
virtual ~ScrollbarTheme() = default; virtual ~ScrollbarTheme() = default;
// If true, then scrollbars with this theme will be painted every time // If true, then scrollbars with this theme will be painted every time
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment