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/compositor/layer_owner.cc | |
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/compositor/layer_owner.cc')
-rw-r--r-- | chromium/ui/compositor/layer_owner.cc | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/chromium/ui/compositor/layer_owner.cc b/chromium/ui/compositor/layer_owner.cc index c8adc411bcb..3eaf415111b 100644 --- a/chromium/ui/compositor/layer_owner.cc +++ b/chromium/ui/compositor/layer_owner.cc @@ -33,7 +33,7 @@ void LayerOwner::SetLayer(std::unique_ptr<Layer> layer) { std::unique_ptr<Layer> LayerOwner::AcquireLayer() { if (layer_owner_) - layer_owner_->owner_ = NULL; + layer_owner_->owner_ = nullptr; return std::move(layer_owner_); } @@ -53,7 +53,7 @@ std::unique_ptr<Layer> LayerOwner::RecreateLayer() { return old_layer; LayerDelegate* old_delegate = old_layer->delegate(); - old_layer->set_delegate(NULL); + old_layer->set_delegate(nullptr); SetLayer(old_layer->Clone()); @@ -88,7 +88,7 @@ std::unique_ptr<Layer> LayerOwner::RecreateLayer() { } void LayerOwner::DestroyLayer() { - layer_ = NULL; + layer_ = nullptr; layer_owner_.reset(); } |