diff options
| author | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2020-10-12 14:27:29 +0200 |
|---|---|---|
| committer | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2020-10-13 09:35:20 +0000 |
| commit | c30a6232df03e1efbd9f3b226777b07e087a1122 (patch) | |
| tree | e992f45784689f373bcc38d1b79a239ebe17ee23 /chromium/ui/gfx/animation | |
| parent | 7b5b123ac58f58ffde0f4f6e488bcd09aa4decd3 (diff) | |
| download | qtwebengine-chromium-85-based.tar.gz | |
BASELINE: Update Chromium to 85.0.4183.14085-based
Change-Id: Iaa42f4680837c57725b1344f108c0196741f6057
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
Diffstat (limited to 'chromium/ui/gfx/animation')
| -rw-r--r-- | chromium/ui/gfx/animation/animation.cc | 3 | ||||
| -rw-r--r-- | chromium/ui/gfx/animation/animation_delegate_notifier.h | 2 |
2 files changed, 2 insertions, 3 deletions
diff --git a/chromium/ui/gfx/animation/animation.cc b/chromium/ui/gfx/animation/animation.cc index b216afb5cf2..0b1d4f22cc5 100644 --- a/chromium/ui/gfx/animation/animation.cc +++ b/chromium/ui/gfx/animation/animation.cc @@ -26,8 +26,7 @@ base::Optional<bool> Animation::prefers_reduced_motion_; Animation::Animation(base::TimeDelta timer_interval) : timer_interval_(timer_interval), is_animating_(false), - delegate_(NULL) { -} + delegate_(nullptr) {} Animation::~Animation() { // Don't send out notification from the destructor. Chances are the delegate diff --git a/chromium/ui/gfx/animation/animation_delegate_notifier.h b/chromium/ui/gfx/animation/animation_delegate_notifier.h index 6121c7c8d58..7983a70fc39 100644 --- a/chromium/ui/gfx/animation/animation_delegate_notifier.h +++ b/chromium/ui/gfx/animation/animation_delegate_notifier.h @@ -5,7 +5,7 @@ #ifndef UI_GFX_ANIMATION_ANIMATION_DELEGATE_NOTIFIER_H_ #define UI_GFX_ANIMATION_ANIMATION_DELEGATE_NOTIFIER_H_ -#include "base/logging.h" +#include "base/check.h" #include "ui/gfx/animation/animation_delegate.h" namespace gfx { |