summaryrefslogtreecommitdiff
path: root/chromium/ui/compositor/layer_owner.cc
diff options
context:
space:
mode:
Diffstat (limited to 'chromium/ui/compositor/layer_owner.cc')
-rw-r--r--chromium/ui/compositor/layer_owner.cc6
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();
}